From 6fcd4678f9b9b473a36617ee0cc5f9f4359a1d6b Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 20 Apr 2013 19:28:34 +0900 Subject: [PATCH 001/530] Refactor #9863 Convert to utf-8 all core files http://tracker.modx.com/issues/9863 --- .../ajaxSearch/ajaxSearch_version_192.txt | 2 +- install/instprocessor.php | 2 +- .../media/ImageEditor/assets/EditorContent.js | 2 +- manager/media/ImageEditor/assets/editor.js | 6 +-- .../mcpuk/connectors/php/connector.php | 41 ++++++++++--------- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/assets/snippets/ajaxSearch/ajaxSearch_version_192.txt b/assets/snippets/ajaxSearch/ajaxSearch_version_192.txt index 75d1d43a2e..0dfca34c16 100644 --- a/assets/snippets/ajaxSearch/ajaxSearch_version_192.txt +++ b/assets/snippets/ajaxSearch/ajaxSearch_version_192.txt @@ -104,7 +104,7 @@ Previous versions : ==== Accented characters - search html entities too The html entity version of the search terms are also searched. - e.g: "ph&eactute;nomène" and "phnomne" are searched when "phnomne" is searched. + e.g: "ph&eactute;nomène" and "phénomène" are searched when "phénomène" is searched. ==== advSearch - exactphrase diff --git a/install/instprocessor.php b/install/instprocessor.php index 87b9752956..9088b29426 100755 --- a/install/instprocessor.php +++ b/install/instprocessor.php @@ -246,7 +246,7 @@ function parseProperties($propertyString) { $site_url= ((isset ($_SERVER[\'HTTPS\']) && strtolower($_SERVER[\'HTTPS\']) == \'on\') || $_SERVER[\'SERVER_PORT\'] == $https_port) ? \'https://\' : \'http://\'; $site_url .= $_SERVER[\'HTTP_HOST\']; if ($_SERVER[\'SERVER_PORT\'] != 80) - $site_url= str_replace(\':\' . $_SERVER[\'SERVER_PORT\'], \'\', $site_url); // remove port from HTTP_HOST   + $site_url= str_replace(\':\' . $_SERVER[\'SERVER_PORT\'], \'\', $site_url); // remove port from HTTP_HOST $site_url .= ($_SERVER[\'SERVER_PORT\'] == 80 || (isset ($_SERVER[\'HTTPS\']) && strtolower($_SERVER[\'HTTPS\']) == \'on\') || $_SERVER[\'SERVER_PORT\'] == $https_port) ? \'\' : \':\' . $_SERVER[\'SERVER_PORT\']; $site_url .= $base_url; diff --git a/manager/media/ImageEditor/assets/EditorContent.js b/manager/media/ImageEditor/assets/EditorContent.js index 97788adf0c..3e2357bfa2 100644 --- a/manager/media/ImageEditor/assets/EditorContent.js +++ b/manager/media/ImageEditor/assets/EditorContent.js @@ -237,7 +237,7 @@ function moveContent(e) } } -//Code add for constraints by Frdric Klee +//Code add for constraints by Frédéric Klee function moveHandle(e) { if (dragapproved) diff --git a/manager/media/ImageEditor/assets/editor.js b/manager/media/ImageEditor/assets/editor.js index 99f514ad9e..d247f07ca0 100644 --- a/manager/media/ImageEditor/assets/editor.js +++ b/manager/media/ImageEditor/assets/editor.js @@ -37,7 +37,7 @@ editor.setMode(current_action); //constraints on the scale, - //code by Frdric Klee + //code by Frédéric Klee if(action == 'scale') { var theImage = editor.window.document.getElementById('theImage'); @@ -67,7 +67,7 @@ } } - //Togggle constraints, by Frdric Klee + //Togggle constraints, by Frédéric Klee function toggleConstraints() { var lock = document.getElementById("scaleConstImg"); @@ -89,7 +89,7 @@ } } - //check the constraints, by Frdric Klee + //check the constraints, by Frédéric Klee function checkConstrains(changed) { var constrained = document.getElementById('constProp'); diff --git a/manager/media/browser/mcpuk/connectors/php/connector.php b/manager/media/browser/mcpuk/connectors/php/connector.php index c8e893610a..3c9dd0696c 100644 --- a/manager/media/browser/mcpuk/connectors/php/connector.php +++ b/manager/media/browser/mcpuk/connectors/php/connector.php @@ -1,27 +1,28 @@ - Date: Sat, 20 Apr 2013 19:30:40 +0900 Subject: [PATCH 002/530] Refactor #9861 Should be core files line feed code is "lf" (part 1) http://tracker.modx.com/issues/9861 --- assets/docs/index.html | 2 +- assets/docs/license.txt | 560 +++++++++++++++++++------------------- assets/export/index.html | 2 +- assets/flash/index.html | 2 +- assets/images/index.html | 2 +- assets/js/csshover3.htc | 26 +- assets/js/index.html | 2 +- assets/modules/index.html | 2 +- assets/plugins/index.html | 2 +- 9 files changed, 300 insertions(+), 300 deletions(-) diff --git a/assets/docs/index.html b/assets/docs/index.html index fdd3791786..cfb7d0fe18 100755 --- a/assets/docs/index.html +++ b/assets/docs/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file diff --git a/assets/docs/license.txt b/assets/docs/license.txt index 2128a66ea7..960fe7469f 100755 --- a/assets/docs/license.txt +++ b/assets/docs/license.txt @@ -1,280 +1,280 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 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/assets/export/index.html b/assets/export/index.html index fdd3791786..cfb7d0fe18 100644 --- a/assets/export/index.html +++ b/assets/export/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file diff --git a/assets/flash/index.html b/assets/flash/index.html index fdd3791786..cfb7d0fe18 100755 --- a/assets/flash/index.html +++ b/assets/flash/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file diff --git a/assets/images/index.html b/assets/images/index.html index fdd3791786..cfb7d0fe18 100644 --- a/assets/images/index.html +++ b/assets/images/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file diff --git a/assets/js/csshover3.htc b/assets/js/csshover3.htc index 7ce43fa71c..6b160b01aa 100644 --- a/assets/js/csshover3.htc +++ b/assets/js/csshover3.htc @@ -1,14 +1,14 @@ - - \ No newline at end of file diff --git a/assets/js/index.html b/assets/js/index.html index fdd3791786..cfb7d0fe18 100644 --- a/assets/js/index.html +++ b/assets/js/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file diff --git a/assets/modules/index.html b/assets/modules/index.html index fdd3791786..cfb7d0fe18 100755 --- a/assets/modules/index.html +++ b/assets/modules/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file diff --git a/assets/plugins/index.html b/assets/plugins/index.html index fdd3791786..cfb7d0fe18 100755 --- a/assets/plugins/index.html +++ b/assets/plugins/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file From d8611dcdaa5ab9f963cb17029ba41c0fe116ffd1 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 20 Apr 2013 19:31:06 +0900 Subject: [PATCH 003/530] Refactor #9861 Should be core files line feed code is "lf" (part 2) http://tracker.modx.com/issues/9861 --- assets/media/index.html | 2 +- assets/plugins/qm/css/colorbox.css | 114 +- assets/plugins/qm/css/ie.css | 6 +- assets/plugins/qm/readme.html | 1748 ++++++++--------- .../plugins/fullpage/css/fullpage.css | 284 +-- .../tiny_mce/plugins/fullpage/fullpage.htm | 518 ++--- .../tiny_mce/plugins/fullpage/js/fullpage.js | 464 ++--- 7 files changed, 1568 insertions(+), 1568 deletions(-) diff --git a/assets/media/index.html b/assets/media/index.html index fdd3791786..cfb7d0fe18 100755 --- a/assets/media/index.html +++ b/assets/media/index.html @@ -1,2 +1,2 @@ -

Unauthorized access

+

Unauthorized access

You're not allowed to access file folder \ No newline at end of file diff --git a/assets/plugins/qm/css/colorbox.css b/assets/plugins/qm/css/colorbox.css index 7acb45ab52..518e8d8773 100755 --- a/assets/plugins/qm/css/colorbox.css +++ b/assets/plugins/qm/css/colorbox.css @@ -1,57 +1,57 @@ -/* - ColorBox Core Style - The following rules are the styles that are consistant between themes. - Avoid changing this area to maintain compatability with future versions of ColorBox. -*/ -#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} -#cboxOverlay{position:fixed; width:100%; height:100%;} -#cboxMiddleLeft, #cboxBottomLeft{clear:left;} -#cboxContent{position:relative; overflow:hidden;} -#cboxLoadedContent{overflow:auto;} -#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;} -#cboxTitle{margin:0;} -#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;} -#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} - -/* - Example user style - The following rules are ordered and tabbed in a way that represents the - order/nesting of the generated HTML, so that the structure easier to understand. -*/ -#cboxOverlay{background:#000;} -#colorbox{} - #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) -100px 0 no-repeat;} - #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) -129px 0 no-repeat;} - #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) -100px -29px no-repeat;} - #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) -129px -29px no-repeat;} - #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;} - #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;} - #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;} - #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;} - #cboxContent{background:#fff;} - #cboxLoadedContent{margin-bottom:28px;} - #cboxTitle{position:absolute; bottom:3px; left:0; text-align:center; width:100%; color:#949494;} - #cboxCurrent{position:absolute; bottom:3px; left:58px; color:#949494;} - #cboxSlideshow{position:absolute; bottom:3px; right:30px; color:#0092ef;} - #cboxPrevious{position:absolute; bottom:0; left:0px; background:url(images/controls.png) -75px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxPrevious.hover{background-position:-75px -25px;} - #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) -50px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxNext.hover{background-position:-50px -25px;} - #cboxLoadingOverlay{background:url(images/loading_background.png) center center no-repeat;} - #cboxLoadingGraphic{background:url(images/ajax-loader.gif) center center no-repeat;} - #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) -25px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxClose.hover{background-position:-25px -25px;} - -/* - The following fixes png-transparency for IE6. - It is also necessary for png-transparency in IE7 & IE8 to avoid 'black halos' with the fade transition - - Since this method does not support CSS background-positioning, it is incompatible with CSS sprites. - Colorbox preloads navigation hover classes to account for this. - - !! Important Note: AlphaImageLoader src paths are relative to the HTML document, - while regular CSS background images are relative to the CSS document. - - => Moved to qm.inc.php for friendly url compatibility -*/ - +/* + ColorBox Core Style + The following rules are the styles that are consistant between themes. + Avoid changing this area to maintain compatability with future versions of ColorBox. +*/ +#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} +#cboxOverlay{position:fixed; width:100%; height:100%;} +#cboxMiddleLeft, #cboxBottomLeft{clear:left;} +#cboxContent{position:relative; overflow:hidden;} +#cboxLoadedContent{overflow:auto;} +#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;} +#cboxTitle{margin:0;} +#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;} +#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} + +/* + Example user style + The following rules are ordered and tabbed in a way that represents the + order/nesting of the generated HTML, so that the structure easier to understand. +*/ +#cboxOverlay{background:#000;} +#colorbox{} + #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) -100px 0 no-repeat;} + #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) -129px 0 no-repeat;} + #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) -100px -29px no-repeat;} + #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) -129px -29px no-repeat;} + #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;} + #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;} + #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;} + #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;} + #cboxContent{background:#fff;} + #cboxLoadedContent{margin-bottom:28px;} + #cboxTitle{position:absolute; bottom:3px; left:0; text-align:center; width:100%; color:#949494;} + #cboxCurrent{position:absolute; bottom:3px; left:58px; color:#949494;} + #cboxSlideshow{position:absolute; bottom:3px; right:30px; color:#0092ef;} + #cboxPrevious{position:absolute; bottom:0; left:0px; background:url(images/controls.png) -75px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} + #cboxPrevious.hover{background-position:-75px -25px;} + #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) -50px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} + #cboxNext.hover{background-position:-50px -25px;} + #cboxLoadingOverlay{background:url(images/loading_background.png) center center no-repeat;} + #cboxLoadingGraphic{background:url(images/ajax-loader.gif) center center no-repeat;} + #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) -25px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} + #cboxClose.hover{background-position:-25px -25px;} + +/* + The following fixes png-transparency for IE6. + It is also necessary for png-transparency in IE7 & IE8 to avoid 'black halos' with the fade transition + + Since this method does not support CSS background-positioning, it is incompatible with CSS sprites. + Colorbox preloads navigation hover classes to account for this. + + !! Important Note: AlphaImageLoader src paths are relative to the HTML document, + while regular CSS background images are relative to the CSS document. + + => Moved to qm.inc.php for friendly url compatibility +*/ + diff --git a/assets/plugins/qm/css/ie.css b/assets/plugins/qm/css/ie.css index 72a11dd4d8..9a4ddf4beb 100755 --- a/assets/plugins/qm/css/ie.css +++ b/assets/plugins/qm/css/ie.css @@ -1,4 +1,4 @@ -#qmEditor ul -{ - padding-top: 0; +#qmEditor ul +{ + padding-top: 0; } \ No newline at end of file diff --git a/assets/plugins/qm/readme.html b/assets/plugins/qm/readme.html index 7d71ea6921..dc16e9576d 100755 --- a/assets/plugins/qm/readme.html +++ b/assets/plugins/qm/readme.html @@ -1,875 +1,875 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - QuickManager+ -

QuickManager+

- -@author Mikko Lammi, www.maagit.fi/quickmanager-plus
- -@license GNU General Public -License (GPL v3), www.gnu.org/copyleft/gpl.html
- -@version 1.5.5 updated 12/01/2011
- -@requirements MODx 1.0.0+ -              - 
- -

Description

- -QuickManager+ enables front-end content editing.
-

Installation

- -If this is an update from earlier version delete first your old -QuickManager+ plugin and all files at "assets/plugins/qm/".
- -

1. Extract all files from package to site root.

- -NOTICE: If you are using Mac OS X don't extract files to the site root or you will overwrite your whole assets folder.
- -

-2. Create plugin with

- -
    - -
  • Name: QuickManager+
    • -
  • Description: <strong>1.5.5</strong> Enables front-end -content editing
    -
    • -
- -

3. Copy paste plugin code:

- - - - - - -
/**
- * QuickManager+
- *
- * @author Mikko Lammi, www.maagit.fi/quickmanager-plus
- * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
- * @version 1.5.5 updated 12/01/2011   
- */
-
-// In manager
-if (isset($_SESSION['mgrValidated'])) {
-
-    $show = TRUE;
-   
-    if ($disabled  != '') {
-        $arr = explode(",", $disabled );
-        if (in_array($modx->documentIdentifier, $arr)) {
-            $show = FALSE;
-        }
-    }
-   
-    if ($show) {
-        // Replace [*#tv*] with QM+ edit TV button placeholders
-        if ($tvbuttons == 'true') {
-            $e = $modx->Event;
-            if ($e->name == 'OnParseDocument') {
-                 -$output = -&$modx->documentOutput;              -
-                 -$output = preg_replace('~\[\*#(.*?)\*\]~', '<!-- '.$tvbclass.' $1 --->[*$1*]', $output);  
-                 -$modx->documentOutput = $output;
-             }   
-         }
-        // In manager
-        if (isset($_SESSION['mgrValidated'])) {
-            -include_once($modx->config['base_path'].'assets/plugins/qm/qm.inc.php');
-            $qm -= new Qm($modx, $jqpath, $loadmanagerjq, $loadfrontendjq, -$noconflictjq, $loadtb, $tbwidth, $tbheight, $hidefields, $hidetabs, -$hidesections, $addbutton, $tpltype, $tplid, $custombutton, -$managerbutton, $logout, $autohide, $editbuttons, $editbclass, -$newbuttons, $newbclass, $tvbuttons, $tvbclass);
-        }
-    }
-}
- - -

4. Check events:

- -
    - -
  • OnParseDocument
    -
    • -
  • OnWebPagePrerender
    • - -
  • OnDocFormPrerender
    • -
  • OnDocFormSave
    • - -
  • OnManagerLogout 
    -
    • - -
- -NOTICE: Make sure QuickManager+ is the first plugin on OnParseDocument -event: Elements > Manage Elements > Plugins > Edit Plugin -Execution Order by Event > OnParseDocument -

5. Copy paste plugin default configuration:

- - - - - - - -
&jqpath=Path -to jQuery;text;assets/js/jquery-1.4.4.min.js &loadmanagerjq=Load -jQuery in manager;list;true,false;false &loadfrontendjq=Load jQuery -in front-end;list;true,false;true &noconflictjq=jQuery noConflict -mode in front-end;list;true,false;true &loadtb=Load modal box in -front-end;list;true,false;true &tbwidth=Modal box window -width;text;80% &tbheight=Modal box window height;text;90% -&hidefields=Hide document fields from front-end editors;text;parent -&hidetabs=Hide document tabs from front-end editors;text; -&hidesections=Hide document sections from front-end editors;text; -&addbutton=Show add document here button;list;true,false;true -&tpltype=New document template type;list;parent,id,selected;parent -&tplid=New document template id;int;3  -&custombutton=Custom buttons;textarea; &1=undefined;; -&managerbutton=Show go to manager button;list;true,false;true -&logout=Logout to;list;manager,front-end;manager -&disabled=Plugin disabled on documents;text; &autohide=Autohide -toolbar;list;true,false;true &editbuttons=Inline edit buttons;list;true,false;false &editbclass=Edit button CSS -class;text;qm-edit &newbuttons=Inline new -resource buttons;list;true,false;false &newbclass=New resource -button CSS -class;text;qm-new &tvbuttons=Inline template variable -buttons;list;true,false;false &tvbclass=Template variable button CSS -class;text;qm-tv

-

6. Save plugin.   
-

-

+ 7. Rich text editors (optional)
-

-If you don't need inline template variable buttons you can skip this.
-
-You don't need to change anything if your rich text editor version is at least:
-- TinyMCE 3.3.6r2 for MODx
-- CKEditor 3.3 for modx alpha 3
- -
Now the hardest part. To get rich text editors to work properly -with -QuickManager+ inline template variable buttons you will need to edit -the rich text editor plugin code. If you won't do this change the rich -text editors will use web theme buttons when editing richtext template -variables.
- -
- -TinyMCE 3.2.4.1 (MODx 1.0.2 and below):
-
- - -In MODx manager go to: Elements > Manage Elements > Plugins > TinyMCE
- -
- -Replace line:
- -if(isset($forfrontend)||$modx->isFrontend()){
- -
- -With:
- -if(isset($forfrontend)||($modx->isFrontend() -&& (intval($_GET['quickmanagertv'] != 1) && -!(isset($_SESSION['mgrValidated']))))){
- -
- -TinyMCE 3.3.2 (MODx 1.0.3) and 3.3.5.1 (MODX 1.0.4):
-
- - -In MODx manager go to: Elements > Manage Elements > Plugins > TinyMCE
- -
- -Replace line:
- -if($modx->isBackend())
- - -
- - -With:
- -if($modx->isBackend() || (intval($_GET['quickmanagertv']) == 1 && isset($_SESSION['mgrValidated'])))
- - -

Configuration

- -Go to plugin configuration tab.
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Configuration -optionDefault -valuePossible -valuesInstructions
Path to jQuery  assets/js/jquery-1.4.4.min.js  textPath to your jQuery script. 
Load jQuery in -manager truetrue || falsePrevent loading jQuery twice if you are already using -some other plugin -which loads jQuery such as ManagerManager.
Load jQuery in -front-end truetrue || false  Prevent loading jQuery twice if you are already using -it in your site -template.
jQuery noConflict mode in front-endtruetrue || falseDefine -if jQuery should use noConflict mode. NoConflict mode is useful if you -use other JavaScript libraries in front-end such as Mootools.
Load modal box in -front-end truetrue || false  Prevent loading the modal box JavaScript (ColorBox) twice if you are already -using -it in your site -template.
Modal box window width80%number || percentDefine modal box (ColorBox) window width, for example: -800 or 75%.
Modal box window height90%number || percentDefine modal box (ColorBox) window height, for example: -500 or 75%.
Hide document fields from front-end editors parenttextSeparate fields with commas, for example: -parent,template,menuindex
-
-Parent selection doesn't work at all with QuickManager+ due -missing menu tree -frame, so it should be hidden from front-end editors.
-
-Possible fields to hide: content, pagetitle, -longtitle, menuindex, parent, description, alias, link_attributes, -introtext, template, menutitle
-
-NOTICE! Hiding document fields may not work if fields are moved to -other tabs with ManagerManager plugin.
Hide document tabs from front-end -editors
- 		textSeparate tabs with commas, for example: settings,access
-
-Possible tabs to hide: general, settings, access
-
-NOTICE! Hiding tabs may not work properly if tab -order is changed with ManagerManager plugin.
Hide document sections from front-end -editors
- 		textSeparate sections with commas, for example: -content,tvs
-
-Possible sections to hide: docsettings, content, tvs
-
-NOTICE! Hiding sections may not work properly if you are hiding sections -with ManagerManager plugin.
Show add document here -button truetrue || false  Define if it's possible to add documents with -QuickManager+.
New document template -type parentparent || id || selected How to determine a -new document template:
-
-- parent: Use parent document template
-- id: Use template based on id number
-- selected: Define template based on parent document "inheritTpl" -template variable used by "Inherit Selected Template" plugin http://modxcms.com/extras.html?view=package/view&package=214. -You don't have to install the plugin, but you still have to -have "inheritTpl" template variable on parent document with correct -template id number.
New document template id3numberDefine which template id to use with new documents. -Used only if new -document template type is id.
Custom buttons
- 		textDefine custom buttons, for example add document to site -root or add news document
-
-- New document button: 'button title','new','parent -id','template id','visible for user role ids'
-
-- Link button: 'button -title','link','http://www.example.com','','visible for user role ids'
-
-- Modal button: 'button -title','modal','http://www.example.com','','visible for user role ids'
-
MODx link tag, e.g. [~23~], works for link and modal button links.
MODx id tag [*id*] works, e.g. http://www.example.com?refererMODxPageId=[*id*]
-Every custom button has individual CSS class, e.g. qm-custom-"index"
-
-Visible for user role ids: leave empty to accept all roles, role 1 = -Administrator
-
-Separate different buttons with ||
-
-Basic example:
-'Site statistics','link','http://www.google.com/analytics/','',''
-
Advanced example: -
-'New root document','new','0','3',''||'Add -news','new','10','4','4,5,6'||'For admins only','link','[~45~]','','1,4'||'Site -statistics','modal','http://www.google.com/analytics/','','1,4'
Show go to manager -buttontruetrue || falseDefine is go to manager button visible.
Logout tomanagermanager || front-endDefine where to logout: to manager login screen or to -active document -on front-end.
Plugin disabled on documents
-
- 		textDocument id numbers where the plugin is disabled.
-Separate fields with commas, for example: -34,22,7,19
Autohide toolbar
- 		true
- 		true || falseDefine if toolbar hides automatically or is always visible (manually close the toolbar by clicking MODx logo or X button)
-
Inline edit buttons
-		false
- 		true || falseDefine if special edit buttons are searched inside content.
-
-Purpose:
-Edit any page from other page, e.g. for editing ditto listings.
-
-How it works:
-- Add anywhere in to your page: <!-- "Edit button CSS class" "document id to be edited" '"Button title"' -->
-- This will create an edit button inside your page when logged in manager
-- For regular visitors it will be shown as a regular HTML comment visible only in the HTML source code
-
-Basic example:
-- Add in to your template <!-- qm-edit 1 'Edit this' -->
-- Creates button to edit page id 1
-
-Advanced example:
-- Add in to your Ditto template chunk: <!-- qm-edit [+id+] 'Edit news item' -->
-- Creates edit buttons for news listings etc. inside the container page
-
-NOTICE! Button title will fail if you use accented characters. Use HTML entities instead, for example &auml;
-
Edit button CSS classqm-edit
- 		text
- 		Default qm-edit class can be found at: assets/plugins/qm/css/style.css
-
-You can use your own class if you want to make your own edit button or for added security measure.
-
Inline new resource buttonsfalse
- 		true || falseDefine if special new resource buttons are searched inside content.
- -
- -Purpose:
- -Create any page from other page, e.g. create new news items.
- -
- -How it works:
- -- Add anywhere in to your page: <!-- "New resource button CSS class" "parent id" "template id" '"Button title"' -->
- -- This will create an new resource button inside your page when logged in manager
- -- For regular visitors it will be shown as a regular HTML comment visible only in the HTML source code
- -
- -Basic example:
- -- Add in to your template <!-- qm-new 1 3 'New news item' -->
- -- Creates new resource button
-- Parent id: 1 (new resource will be created under document id 1)
-- Template id: 3 (uses template id 3)
-- Button title: New news item
-
-NOTICE! Button title will fail if you use accented characters. Use HTML entities instead, for example &auml;
-
New resource button CSS classqm-new
- 		text
- 		Default qm-new class can be found at: assets/plugins/qm/css/style.css
- -
- -You can use your own class if you want to make your own new resource button or for added security measure.
Inline template variable buttonsfalse
- 		true || falseDefine if special template variable buttons are searched inside content.
- -
- -Purpose:
- -Edit any template variable.
- -
-Editable default MODx fields:
- pagetitle, longtitle, description, content, menutitle, introtext
-
- -How it works:
- -- Add anywhere in to your page: [*#tvName*], notice the "#"
-  OR
- -- Add anywhere in to your page: <!-- "Template variable button CSS class" "tvName" -->
- -- This will create a template variable button inside your page when logged in manager
- -- For regular visitors it will be shown as a regular HTML comment visible only in the HTML source code
- -
- -Basic example:
- -- Add in to your template [*#tvName*]
- -- Creates button to edit tvName template variable (and outputs the template variable)
- -
- -Advanced example:
- -- Add in to your template: <!-- qm-tv tvName -->
- -- Creates button to edit tvName template variable
-
Template variable button CSS classqm-tvtext
- 		Default qm-tv class can be found at: assets/plugins/qm/css/style.css
- -
- -You can use your own class if you want to make your own template variable button or for added security measure.
- -
- -

How to use

- -Just login, open frontend and enjoy!
-

- -Known issues -

-
    -
  • Parent selection is hidden and doesn't work at all with QuickManager+ due -missing menu tree frame.
    • -
-

Special thanks

-
    -
  • QuickManager+ is orginally based on QuickManager by Urique -Dertlian
    • -
  • Template variable editing ideas from QuickEdit by Adam Crownoble
    -
    • -
- - -

Changelog

-1.5.5 - 12/01/2011
- - -
    -
  • Changed: QM+ toolbar close button changed to li element for better cross-browser compatibility
    -
    • -
  • Fixed: Multiple little CSS fixes for better protection against global CSS definitions
    • -
- -1.5.4 - 03/01/2011
- - -
    -
  • Changed: Updated ColorBox to 1.3.15: http://colorpowered.com/colorbox/
    • -
  • Fixed: Support for jQuery 1.4.4
    -
    • -
  • Fixed: Inline template variable edit/save was still causing error -if "'" mark was used (was affecting pagetitle etc default fields)
    • -
-1.5.3 - 12/10/2010
- - -
    -
  • Changed: Plugin code checks immeditally at start if user is in manager to save processing time
    -
    • -
  • Fixed: Inline template variable edit/save was causing error if "'" mark was used
    -
    • - -
-1.5.2 - 14/09/2010
- -
    -
  • Added: CSS classes to toolbar buttons, also li elements: qmCustom, qmManager, qmLogout
    • -
  • Changed: Inline buttons div => span, validates correctly
    -
    • -
  • Fixed: Inline template variable editing when TV type is checkbox
    -
    • -
-1.5.1 - 02/08/2010
-
    -
  • Added: CSS classes to toolbar buttons: qmCustom, qmManager, qmLogout
    -
    • -
  • Fixed: Updated ColorBox to 1.3.9 that solves TinyMCE image align problems with IE6 and IE7
    -
    • -
-1.5
- -
    -
  • Added: Inline template variable buttons!!! Edit template variables with QuickEdit style. Off by default though.
    -
    • - -
  • Added: OnParseDocument plugin event
    • -
  • Added: Image TV preview
    • -
  • Added: Preserve alias on save
    • -
  • Added: "documentDirty=false;" to cancel button to prevent unnecessary MODx manager alert message
    • -
  • Added: Custom buttons now support standard MODx [*id*] tag, e.g. http://www.example.com?refererMODxPageId=[*id*]
    • -
  • Added: Individual CSS class for every custom button, e.g. qm-custom-"index"
    -
    • - - - - - -
  • Changed: Plugin content
    • -
  • Changed: TV access routine
    -
    • -
  • Fixed: TV edit form button labels
    • -
  • Removed: close.php => now implemented with OnWebPagePrerender event to preserve alias
    -
    • - - -
-1.4.1
-
    -
  • Added: Individual user language check, previously QM+ used global language setting for all users
    -
    • -
  • Changed: Edit buttons in content => Inline edit buttons, New resource buttons in content => Inline new resource buttons
    • -
  • Changed: Inline edit buttons "placeholder markup" changed to: <!-- "Edit button CSS class" "document id to be edited" '"Button title"' -->
    • -
  • Fixed: Inline edit/new buttons access control
    -
    • -
-1.4
-
    -
  • Added: Edit buttons inside content. Edit any page from other page, e.g. for editing ditto listings.
    • -
  • Added: New resource buttons inside content. Create any page from other page, e.g. create new news item.
    • -
  • Added: Custom buttons works now with default MODx links, e.g. [~23~]
    -
    • -
  • Added: Show friendly alias after saving the document. Notice: This is still an experimental feature in is off by default.
    -
    • -
  • Changed: Multiple CSS tweaks mainly for IE
    • -
  • Changed: close.php uses now sessions instead of JavaScript cookies
    -
    • -
  • Fixed: PHP4 support fixed (Thanks yama!)
    • -
  • Fixed: Hiding tabs and sections fixed (access -tab and docsettings -section)
    • -
  • Removed: .htaccess file under qm -folder that was accidentally left there is not needed at all.
    -
    • -
-1.3.4.1
-
    -
  • Changed: CSS tweaks for IE, opacity now works fine with IE8 but unfortunately with IE7 ugly fonts remain (Thanks again uxello!)
    • -
- - -1.3.4
- -
    - -
  • Added: Autohide toolbar configuration option
    • -
  • Changed: Updated ColorBox to 1.3.6: http://colorpowered.com/colorbox/
    -
    • -
  • Changed: CSS tweaks, mainly for IE (opacity removed for IE, it breaks cleartype fonts resulting very ugly looking fonts)
    • -
  • Changed: Plugin code moved from text file to this file (Installation / 3. Copy paste plugin code)
    -
    • -
  • Fixed: -Document lock problem solved, now document lock is released when cancel -button is pressed (Thanks uxello for the solution!)
    -
    • -
  • Fixed: Toolbar is now valid XHTML 1.0 Transitional code
    • - -
  • Removed: Unnecessary $disabled variable from edit code
    • -
  • Removed: Images folder, all images are now under css > images
    -
    • - -
- - -1.3.3
- -
    - -
  • Added: A fallback to English if the languages are missing in the -Manager/user settings
    • -
  • Added: -Little tweaks with QuickManager action buttons: small hide/show -animations and possibilty to close the menu by clicking the MODx logo
    • -
  • Added: New option for custom buttons: modal = any link opened in -a modal box (ColorBox)
    • -
  • Changed:  Custom buttons separator is now || instead of # -(reserved for URL anchors)
    • -
  • Changed: Rounded modal box is back, finally resolved bugs -with ColorBox CSS in IE and friendly urls
    • -
  • Changed: qm-colorbox.css renamed back to colorbox.css
    • -
  • Fixed: Satinitized possible XSS vulnerabilities
    • -
  • Removed: OnManagerPageInit plugin event removed
    • -
  • Removed: IE6 support dropped, QuickManager+ is not tested with -IE6 as MODx manager doesn't offially support IE6
    • -
- -1.3.2.1
- -
    - -
  • Fixed: Language file loading
    • -
- -1.3.2
- -
    - -
  • Added: New configuration option - jQuery noConflict mode in -front-end
    • -
  • Added: Check user manager access permissions to current document -and show action buttons according to permissions
    • -
  • Added: It's now possible to hide QM+ action buttons
    • -
  • Added: Hide parent frame scrollbars and QM+ buttons when modal -box is visible (ColorBox bindings)
    • -
  • Added: Modal box can't be accidentally closed by clicking the -overlay
    • -
  • Changed: -Stylish ColorBox CSS style didn't work properly with IE and crashed too -often with Safari, had to replace it with minimalistic style for better -cross-browser compatibility
    • -
  • Changed: Updated ColorBox to version 1.3.1, includes for example -IE ClearType fix (no more ugly fonts)
    • -
  • Changed: colorbox.css renamed to qm-colorbox.css and moved to QM+ -css folder
    • -
  • Fixed: -All normal MODx manager actions including template and RTE selection -works now just fine (thank you very much Susan O. for your ideas!)
    • -
  • Fixed: Multiple small CSS fixes for IE
    • -
  • Fixed: Alias friendly logout code (thanks Mar!)
    • -
  • Fixed: Language selection a bit more robust and offer a level of -fallback
    • -
  • Removed: Use with ManagerManager -plugin  -option deprecated
    • -
- -1.3.1
- -
    - -
  • Added: -It's now possible to change template once. After that you can't change -the template again but of course you can press cancel button and try -again.
    -Note: ToDo: Investigate if there is a way to detect parent frame in PHP -to solve this problem
    • -
- -1.3
- -
    - -
  • Added: Support for MODx Evolution 1.0.0 version, better -combatibility with MODx Carbon manager theme
    • -
  • Added: Support for jQuery in noConflict mode by default
    • -
  • Added: ColorBox modal box support
    • -
  • Added: Modal box (ColorBox) window width
    • -
  • Added: Modal box (ColorBox) window height
    • -
  • Added: Possibility to add custom link buttons
    • -
  • Removed: Thickbox window max width
    • -
  • Removed: MODx versions below 1.0.0 are not supported due -manager interface changes
    • -
  • Removed: ThickBox modal box support
    • -
- -1.2
- -
    - -
  • Added: Plugin disabled option
    • -
  • Added: Show go to manager -button option
    • -
  • Added: Custom add buttons option
    • -
  • Added: Hide document sections from front-end -editors option
    • -
  • Added: Hide document tabs from front-end -editors option
    • -
  • Added: Dynamic ThickBox windows size adjustement, window size is -calculated without refreshing the window
    • -
  • Added: ThickBox window max width option 
    • -
  • Added: Logout to configuration option added, needs -event OnManagerLogout 
    • -
  • Fixed: Documentation changed to html file
    • -
  • Fixed: Clearer plugin folder structure
    • -
  • Fixed: Hiding templates if only one template
    • -
  • Fixed: Load jQuery in -front-end was not working properly
    • -
  • Fixed: mcc.class.php => hideTab & hideSection
    • -
  • Removed: ThickBox windows width and height options removed.
    • -
- -1.1.1
- -
    - -
  • Fixed: Logout function changed. Previous version had a problem -with multiple users resulting document locked issues. Now plugin logs -user nicely out to the manager login page.
    • -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + QuickManager+ +

QuickManager+

+ +@author Mikko Lammi, www.maagit.fi/quickmanager-plus
+ +@license GNU General Public +License (GPL v3), www.gnu.org/copyleft/gpl.html
+ +@version 1.5.5 updated 12/01/2011
+ +@requirements MODx 1.0.0+ +              + 
+ +

Description

+ +QuickManager+ enables front-end content editing.
+

Installation

+ +If this is an update from earlier version delete first your old +QuickManager+ plugin and all files at "assets/plugins/qm/".
+ +

1. Extract all files from package to site root.

+ +NOTICE: If you are using Mac OS X don't extract files to the site root or you will overwrite your whole assets folder.
+ +

+2. Create plugin with

+ +
    + +
  • Name: QuickManager+
    • +
  • Description: <strong>1.5.5</strong> Enables front-end +content editing
    +
    • +
+ +

3. Copy paste plugin code:

+ + + + + + +
/**
+ * QuickManager+
+ *
+ * @author Mikko Lammi, www.maagit.fi/quickmanager-plus
+ * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
+ * @version 1.5.5 updated 12/01/2011   
+ */
+
+// In manager
+if (isset($_SESSION['mgrValidated'])) {
+
+    $show = TRUE;
+   
+    if ($disabled  != '') {
+        $arr = explode(",", $disabled );
+        if (in_array($modx->documentIdentifier, $arr)) {
+            $show = FALSE;
+        }
+    }
+   
+    if ($show) {
+        // Replace [*#tv*] with QM+ edit TV button placeholders
+        if ($tvbuttons == 'true') {
+            $e = $modx->Event;
+            if ($e->name == 'OnParseDocument') {
+                 +$output = +&$modx->documentOutput;              +
+                 +$output = preg_replace('~\[\*#(.*?)\*\]~', '<!-- '.$tvbclass.' $1 +-->[*$1*]', $output);  
+                 +$modx->documentOutput = $output;
+             }   
+         }
+        // In manager
+        if (isset($_SESSION['mgrValidated'])) {
+            +include_once($modx->config['base_path'].'assets/plugins/qm/qm.inc.php');
+            $qm += new Qm($modx, $jqpath, $loadmanagerjq, $loadfrontendjq, +$noconflictjq, $loadtb, $tbwidth, $tbheight, $hidefields, $hidetabs, +$hidesections, $addbutton, $tpltype, $tplid, $custombutton, +$managerbutton, $logout, $autohide, $editbuttons, $editbclass, +$newbuttons, $newbclass, $tvbuttons, $tvbclass);
+        }
+    }
+}
+ + +

4. Check events:

+ +
    + +
  • OnParseDocument
    +
    • +
  • OnWebPagePrerender
    • + +
  • OnDocFormPrerender
    • +
  • OnDocFormSave
    • + +
  • OnManagerLogout 
    +
    • + +
+ +NOTICE: Make sure QuickManager+ is the first plugin on OnParseDocument +event: Elements > Manage Elements > Plugins > Edit Plugin +Execution Order by Event > OnParseDocument +

5. Copy paste plugin default configuration:

+ + + + + + + +
&jqpath=Path +to jQuery;text;assets/js/jquery-1.4.4.min.js &loadmanagerjq=Load +jQuery in manager;list;true,false;false &loadfrontendjq=Load jQuery +in front-end;list;true,false;true &noconflictjq=jQuery noConflict +mode in front-end;list;true,false;true &loadtb=Load modal box in +front-end;list;true,false;true &tbwidth=Modal box window +width;text;80% &tbheight=Modal box window height;text;90% +&hidefields=Hide document fields from front-end editors;text;parent +&hidetabs=Hide document tabs from front-end editors;text; +&hidesections=Hide document sections from front-end editors;text; +&addbutton=Show add document here button;list;true,false;true +&tpltype=New document template type;list;parent,id,selected;parent +&tplid=New document template id;int;3  +&custombutton=Custom buttons;textarea; &1=undefined;; +&managerbutton=Show go to manager button;list;true,false;true +&logout=Logout to;list;manager,front-end;manager +&disabled=Plugin disabled on documents;text; &autohide=Autohide +toolbar;list;true,false;true &editbuttons=Inline edit buttons;list;true,false;false &editbclass=Edit button CSS +class;text;qm-edit &newbuttons=Inline new +resource buttons;list;true,false;false &newbclass=New resource +button CSS +class;text;qm-new &tvbuttons=Inline template variable +buttons;list;true,false;false &tvbclass=Template variable button CSS +class;text;qm-tv

+

6. Save plugin.   
+

+

+ 7. Rich text editors (optional)
+

+If you don't need inline template variable buttons you can skip this.
+
+You don't need to change anything if your rich text editor version is at least:
+- TinyMCE 3.3.6r2 for MODx
+- CKEditor 3.3 for modx alpha 3
+ +
Now the hardest part. To get rich text editors to work properly +with +QuickManager+ inline template variable buttons you will need to edit +the rich text editor plugin code. If you won't do this change the rich +text editors will use web theme buttons when editing richtext template +variables.
+ +
+ +TinyMCE 3.2.4.1 (MODx 1.0.2 and below):
+
+ + +In MODx manager go to: Elements > Manage Elements > Plugins > TinyMCE
+ +
+ +Replace line:
+ +if(isset($forfrontend)||$modx->isFrontend()){
+ +
+ +With:
+ +if(isset($forfrontend)||($modx->isFrontend() +&& (intval($_GET['quickmanagertv'] != 1) && +!(isset($_SESSION['mgrValidated']))))){
+ +
+ +TinyMCE 3.3.2 (MODx 1.0.3) and 3.3.5.1 (MODX 1.0.4):
+
+ + +In MODx manager go to: Elements > Manage Elements > Plugins > TinyMCE
+ +
+ +Replace line:
+ +if($modx->isBackend())
+ + +
+ + +With:
+ +if($modx->isBackend() || (intval($_GET['quickmanagertv']) == 1 && isset($_SESSION['mgrValidated'])))
+ + +

Configuration

+ +Go to plugin configuration tab.
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Configuration +optionDefault +valuePossible +valuesInstructions
Path to jQuery  assets/js/jquery-1.4.4.min.js  textPath to your jQuery script. 
Load jQuery in +manager truetrue || falsePrevent loading jQuery twice if you are already using +some other plugin +which loads jQuery such as ManagerManager.
Load jQuery in +front-end truetrue || false  Prevent loading jQuery twice if you are already using +it in your site +template.
jQuery noConflict mode in front-endtruetrue || falseDefine +if jQuery should use noConflict mode. NoConflict mode is useful if you +use other JavaScript libraries in front-end such as Mootools.
Load modal box in +front-end truetrue || false  Prevent loading the modal box JavaScript (ColorBox) twice if you are already +using +it in your site +template.
Modal box window width80%number || percentDefine modal box (ColorBox) window width, for example: +800 or 75%.
Modal box window height90%number || percentDefine modal box (ColorBox) window height, for example: +500 or 75%.
Hide document fields from front-end editors parenttextSeparate fields with commas, for example: +parent,template,menuindex
+
+Parent selection doesn't work at all with QuickManager+ due +missing menu tree +frame, so it should be hidden from front-end editors.
+
+Possible fields to hide: content, pagetitle, +longtitle, menuindex, parent, description, alias, link_attributes, +introtext, template, menutitle
+
+NOTICE! Hiding document fields may not work if fields are moved to +other tabs with ManagerManager plugin.
Hide document tabs from front-end +editors
+ 		textSeparate tabs with commas, for example: settings,access
+
+Possible tabs to hide: general, settings, access
+
+NOTICE! Hiding tabs may not work properly if tab +order is changed with ManagerManager plugin.
Hide document sections from front-end +editors
+ 		textSeparate sections with commas, for example: +content,tvs
+
+Possible sections to hide: docsettings, content, tvs
+
+NOTICE! Hiding sections may not work properly if you are hiding sections +with ManagerManager plugin.
Show add document here +button truetrue || false  Define if it's possible to add documents with +QuickManager+.
New document template +type parentparent || id || selected How to determine a +new document template:
+
+- parent: Use parent document template
+- id: Use template based on id number
+- selected: Define template based on parent document "inheritTpl" +template variable used by "Inherit Selected Template" plugin http://modxcms.com/extras.html?view=package/view&package=214. +You don't have to install the plugin, but you still have to +have "inheritTpl" template variable on parent document with correct +template id number.
New document template id3numberDefine which template id to use with new documents. +Used only if new +document template type is id.
Custom buttons
+ 		textDefine custom buttons, for example add document to site +root or add news document
+
+- New document button: 'button title','new','parent +id','template id','visible for user role ids'
+
+- Link button: 'button +title','link','http://www.example.com','','visible for user role ids'
+
+- Modal button: 'button +title','modal','http://www.example.com','','visible for user role ids'
+
MODx link tag, e.g. [~23~], works for link and modal button links.
MODx id tag [*id*] works, e.g. http://www.example.com?refererMODxPageId=[*id*]
+Every custom button has individual CSS class, e.g. qm-custom-"index"
+
+Visible for user role ids: leave empty to accept all roles, role 1 = +Administrator
+
+Separate different buttons with ||
+
+Basic example:
+'Site statistics','link','http://www.google.com/analytics/','',''
+
Advanced example: +
+'New root document','new','0','3',''||'Add +news','new','10','4','4,5,6'||'For admins only','link','[~45~]','','1,4'||'Site +statistics','modal','http://www.google.com/analytics/','','1,4'
Show go to manager +buttontruetrue || falseDefine is go to manager button visible.
Logout tomanagermanager || front-endDefine where to logout: to manager login screen or to +active document +on front-end.
Plugin disabled on documents
+
+ 		textDocument id numbers where the plugin is disabled.
+Separate fields with commas, for example: +34,22,7,19
Autohide toolbar
+ 		true
+ 		true || falseDefine if toolbar hides automatically or is always visible (manually close the toolbar by clicking MODx logo or X button)
+
Inline edit buttons
+		false
+ 		true || falseDefine if special edit buttons are searched inside content.
+
+Purpose:
+Edit any page from other page, e.g. for editing ditto listings.
+
+How it works:
+- Add anywhere in to your page: <!-- "Edit button CSS class" "document id to be edited" '"Button title"' -->
+- This will create an edit button inside your page when logged in manager
+- For regular visitors it will be shown as a regular HTML comment visible only in the HTML source code
+
+Basic example:
+- Add in to your template <!-- qm-edit 1 'Edit this' -->
+- Creates button to edit page id 1
+
+Advanced example:
+- Add in to your Ditto template chunk: <!-- qm-edit [+id+] 'Edit news item' -->
+- Creates edit buttons for news listings etc. inside the container page
+
+NOTICE! Button title will fail if you use accented characters. Use HTML entities instead, for example &auml;
+
Edit button CSS classqm-edit
+ 		text
+ 		Default qm-edit class can be found at: assets/plugins/qm/css/style.css
+
+You can use your own class if you want to make your own edit button or for added security measure.
+
Inline new resource buttonsfalse
+ 		true || falseDefine if special new resource buttons are searched inside content.
+ +
+ +Purpose:
+ +Create any page from other page, e.g. create new news items.
+ +
+ +How it works:
+ +- Add anywhere in to your page: <!-- "New resource button CSS class" "parent id" "template id" '"Button title"' -->
+ +- This will create an new resource button inside your page when logged in manager
+ +- For regular visitors it will be shown as a regular HTML comment visible only in the HTML source code
+ +
+ +Basic example:
+ +- Add in to your template <!-- qm-new 1 3 'New news item' -->
+ +- Creates new resource button
+- Parent id: 1 (new resource will be created under document id 1)
+- Template id: 3 (uses template id 3)
+- Button title: New news item
+
+NOTICE! Button title will fail if you use accented characters. Use HTML entities instead, for example &auml;
+
New resource button CSS classqm-new
+ 		text
+ 		Default qm-new class can be found at: assets/plugins/qm/css/style.css
+ +
+ +You can use your own class if you want to make your own new resource button or for added security measure.
Inline template variable buttonsfalse
+ 		true || falseDefine if special template variable buttons are searched inside content.
+ +
+ +Purpose:
+ +Edit any template variable.
+ +
+Editable default MODx fields:
+ pagetitle, longtitle, description, content, menutitle, introtext
+
+ +How it works:
+ +- Add anywhere in to your page: [*#tvName*], notice the "#"
+  OR
+ +- Add anywhere in to your page: <!-- "Template variable button CSS class" "tvName" -->
+ +- This will create a template variable button inside your page when logged in manager
+ +- For regular visitors it will be shown as a regular HTML comment visible only in the HTML source code
+ +
+ +Basic example:
+ +- Add in to your template [*#tvName*]
+ +- Creates button to edit tvName template variable (and outputs the template variable)
+ +
+ +Advanced example:
+ +- Add in to your template: <!-- qm-tv tvName -->
+ +- Creates button to edit tvName template variable
+
Template variable button CSS classqm-tvtext
+ 		Default qm-tv class can be found at: assets/plugins/qm/css/style.css
+ +
+ +You can use your own class if you want to make your own template variable button or for added security measure.
+ +
+ +

How to use

+ +Just login, open frontend and enjoy!
+

+ +Known issues +

+
    +
  • Parent selection is hidden and doesn't work at all with QuickManager+ due +missing menu tree frame.
    • +
+

Special thanks

+
    +
  • QuickManager+ is orginally based on QuickManager by Urique +Dertlian
    • +
  • Template variable editing ideas from QuickEdit by Adam Crownoble
    +
    • +
+ + +

Changelog

+1.5.5 - 12/01/2011
+ + +
    +
  • Changed: QM+ toolbar close button changed to li element for better cross-browser compatibility
    +
    • +
  • Fixed: Multiple little CSS fixes for better protection against global CSS definitions
    • +
+ +1.5.4 - 03/01/2011
+ + +
    +
  • Changed: Updated ColorBox to 1.3.15: http://colorpowered.com/colorbox/
    • +
  • Fixed: Support for jQuery 1.4.4
    +
    • +
  • Fixed: Inline template variable edit/save was still causing error +if "'" mark was used (was affecting pagetitle etc default fields)
    • +
+1.5.3 - 12/10/2010
+ + +
    +
  • Changed: Plugin code checks immeditally at start if user is in manager to save processing time
    +
    • +
  • Fixed: Inline template variable edit/save was causing error if "'" mark was used
    +
    • + +
+1.5.2 - 14/09/2010
+ +
    +
  • Added: CSS classes to toolbar buttons, also li elements: qmCustom, qmManager, qmLogout
    • +
  • Changed: Inline buttons div => span, validates correctly
    +
    • +
  • Fixed: Inline template variable editing when TV type is checkbox
    +
    • +
+1.5.1 - 02/08/2010
+
    +
  • Added: CSS classes to toolbar buttons: qmCustom, qmManager, qmLogout
    +
    • +
  • Fixed: Updated ColorBox to 1.3.9 that solves TinyMCE image align problems with IE6 and IE7
    +
    • +
+1.5
+ +
    +
  • Added: Inline template variable buttons!!! Edit template variables with QuickEdit style. Off by default though.
    +
    • + +
  • Added: OnParseDocument plugin event
    • +
  • Added: Image TV preview
    • +
  • Added: Preserve alias on save
    • +
  • Added: "documentDirty=false;" to cancel button to prevent unnecessary MODx manager alert message
    • +
  • Added: Custom buttons now support standard MODx [*id*] tag, e.g. http://www.example.com?refererMODxPageId=[*id*]
    • +
  • Added: Individual CSS class for every custom button, e.g. qm-custom-"index"
    +
    • + + + + + +
  • Changed: Plugin content
    • +
  • Changed: TV access routine
    +
    • +
  • Fixed: TV edit form button labels
    • +
  • Removed: close.php => now implemented with OnWebPagePrerender event to preserve alias
    +
    • + + +
+1.4.1
+
    +
  • Added: Individual user language check, previously QM+ used global language setting for all users
    +
    • +
  • Changed: Edit buttons in content => Inline edit buttons, New resource buttons in content => Inline new resource buttons
    • +
  • Changed: Inline edit buttons "placeholder markup" changed to: <!-- "Edit button CSS class" "document id to be edited" '"Button title"' -->
    • +
  • Fixed: Inline edit/new buttons access control
    +
    • +
+1.4
+
    +
  • Added: Edit buttons inside content. Edit any page from other page, e.g. for editing ditto listings.
    • +
  • Added: New resource buttons inside content. Create any page from other page, e.g. create new news item.
    • +
  • Added: Custom buttons works now with default MODx links, e.g. [~23~]
    +
    • +
  • Added: Show friendly alias after saving the document. Notice: This is still an experimental feature in is off by default.
    +
    • +
  • Changed: Multiple CSS tweaks mainly for IE
    • +
  • Changed: close.php uses now sessions instead of JavaScript cookies
    +
    • +
  • Fixed: PHP4 support fixed (Thanks yama!)
    • +
  • Fixed: Hiding tabs and sections fixed (access -tab and docsettings -section)
    • +
  • Removed: .htaccess file under qm -folder that was accidentally left there is not needed at all.
    +
    • +
+1.3.4.1
+
    +
  • Changed: CSS tweaks for IE, opacity now works fine with IE8 but unfortunately with IE7 ugly fonts remain (Thanks again uxello!)
    • +
+ + +1.3.4
+ +
    + +
  • Added: Autohide toolbar configuration option
    • +
  • Changed: Updated ColorBox to 1.3.6: http://colorpowered.com/colorbox/
    +
    • +
  • Changed: CSS tweaks, mainly for IE (opacity removed for IE, it breaks cleartype fonts resulting very ugly looking fonts)
    • +
  • Changed: Plugin code moved from text file to this file (Installation / 3. Copy paste plugin code)
    +
    • +
  • Fixed: +Document lock problem solved, now document lock is released when cancel +button is pressed (Thanks uxello for the solution!)
    +
    • +
  • Fixed: Toolbar is now valid XHTML 1.0 Transitional code
    • + +
  • Removed: Unnecessary $disabled variable from edit code
    • +
  • Removed: Images folder, all images are now under css > images
    +
    • + +
+ + +1.3.3
+ +
    + +
  • Added: A fallback to English if the languages are missing in the +Manager/user settings
    • +
  • Added: +Little tweaks with QuickManager action buttons: small hide/show +animations and possibilty to close the menu by clicking the MODx logo
    • +
  • Added: New option for custom buttons: modal = any link opened in +a modal box (ColorBox)
    • +
  • Changed:  Custom buttons separator is now || instead of # +(reserved for URL anchors)
    • +
  • Changed: Rounded modal box is back, finally resolved bugs +with ColorBox CSS in IE and friendly urls
    • +
  • Changed: qm-colorbox.css renamed back to colorbox.css
    • +
  • Fixed: Satinitized possible XSS vulnerabilities
    • +
  • Removed: OnManagerPageInit plugin event removed
    • +
  • Removed: IE6 support dropped, QuickManager+ is not tested with +IE6 as MODx manager doesn't offially support IE6
    • +
+ +1.3.2.1
+ +
    + +
  • Fixed: Language file loading
    • +
+ +1.3.2
+ +
    + +
  • Added: New configuration option - jQuery noConflict mode in +front-end
    • +
  • Added: Check user manager access permissions to current document +and show action buttons according to permissions
    • +
  • Added: It's now possible to hide QM+ action buttons
    • +
  • Added: Hide parent frame scrollbars and QM+ buttons when modal +box is visible (ColorBox bindings)
    • +
  • Added: Modal box can't be accidentally closed by clicking the +overlay
    • +
  • Changed: +Stylish ColorBox CSS style didn't work properly with IE and crashed too +often with Safari, had to replace it with minimalistic style for better +cross-browser compatibility
    • +
  • Changed: Updated ColorBox to version 1.3.1, includes for example +IE ClearType fix (no more ugly fonts)
    • +
  • Changed: colorbox.css renamed to qm-colorbox.css and moved to QM+ +css folder
    • +
  • Fixed: +All normal MODx manager actions including template and RTE selection +works now just fine (thank you very much Susan O. for your ideas!)
    • +
  • Fixed: Multiple small CSS fixes for IE
    • +
  • Fixed: Alias friendly logout code (thanks Mar!)
    • +
  • Fixed: Language selection a bit more robust and offer a level of +fallback
    • +
  • Removed: Use with ManagerManager +plugin  -option deprecated
    • +
+ +1.3.1
+ +
    + +
  • Added: +It's now possible to change template once. After that you can't change +the template again but of course you can press cancel button and try +again.
    +Note: ToDo: Investigate if there is a way to detect parent frame in PHP +to solve this problem
    • +
+ +1.3
+ +
    + +
  • Added: Support for MODx Evolution 1.0.0 version, better +combatibility with MODx Carbon manager theme
    • +
  • Added: Support for jQuery in noConflict mode by default
    • +
  • Added: ColorBox modal box support
    • +
  • Added: Modal box (ColorBox) window width
    • +
  • Added: Modal box (ColorBox) window height
    • +
  • Added: Possibility to add custom link buttons
    • +
  • Removed: Thickbox window max width
    • +
  • Removed: MODx versions below 1.0.0 are not supported due +manager interface changes
    • +
  • Removed: ThickBox modal box support
    • +
+ +1.2
+ +
    + +
  • Added: Plugin disabled option
    • +
  • Added: Show go to manager +button option
    • +
  • Added: Custom add buttons option
    • +
  • Added: Hide document sections from front-end +editors option
    • +
  • Added: Hide document tabs from front-end +editors option
    • +
  • Added: Dynamic ThickBox windows size adjustement, window size is +calculated without refreshing the window
    • +
  • Added: ThickBox window max width option 
    • +
  • Added: Logout to configuration option added, needs +event OnManagerLogout 
    • +
  • Fixed: Documentation changed to html file
    • +
  • Fixed: Clearer plugin folder structure
    • +
  • Fixed: Hiding templates if only one template
    • +
  • Fixed: Load jQuery in +front-end was not working properly
    • +
  • Fixed: mcc.class.php => hideTab & hideSection
    • +
  • Removed: ThickBox windows width and height options removed.
    • +
+ +1.1.1
+ +
    + +
  • Fixed: Logout function changed. Previous version had a problem +with multiple users resulting document locked issues. Now plugin logs +user nicely out to the manager login page.
    • +
+ \ No newline at end of file diff --git a/assets/plugins/tinymce/tiny_mce/plugins/fullpage/css/fullpage.css b/assets/plugins/tinymce/tiny_mce/plugins/fullpage/css/fullpage.css index 2675cec155..28b721f9b3 100644 --- a/assets/plugins/tinymce/tiny_mce/plugins/fullpage/css/fullpage.css +++ b/assets/plugins/tinymce/tiny_mce/plugins/fullpage/css/fullpage.css @@ -1,143 +1,143 @@ -/* Hide the advanced tab */ -#advanced_tab { - display: none; -} - -#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright { - width: 280px; -} - -#doctype, #docencoding { - width: 200px; -} - -#langcode { - width: 30px; -} - -#bgimage { - width: 220px; -} - -#fontface { - width: 240px; -} - -#leftmargin, #rightmargin, #topmargin, #bottommargin { - width: 50px; -} - -.panel_wrapper div.current { - height: 400px; -} - -#stylesheet, #style { - width: 240px; -} - -#doctypes { - width: 200px; -} - -/* Head list classes */ - -.headlistwrapper { - width: 100%; -} - -.selected { - border: 1px solid #0A246A; - background-color: #B6BDD2; -} - -.toolbar { - width: 100%; -} - -#headlist { - width: 100%; - margin-top: 3px; - font-size: 11px; -} - -#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element { - display: none; -} - -#addmenu { - position: absolute; - border: 1px solid gray; - display: none; - z-index: 100; - background-color: white; -} - -#addmenu a { - display: block; - width: 100%; - line-height: 20px; - text-decoration: none; - background-color: white; -} - -#addmenu a:hover { - background-color: #B6BDD2; - color: black; -} - -#addmenu span { - padding-left: 10px; - padding-right: 10px; -} - -#updateElementPanel { - display: none; -} - -#script_element .panel_wrapper div.current { - height: 108px; -} - -#style_element .panel_wrapper div.current { - height: 108px; -} - -#link_element .panel_wrapper div.current { - height: 140px; -} - -#element_script_value { - width: 100%; - height: 100px; -} - -#element_comment_value { - width: 100%; - height: 120px; -} - -#element_style_value { - width: 100%; - height: 100px; -} - -#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title { - width: 250px; -} - -.updateElementButton { - margin-top: 3px; -} - -/* MSIE specific styles */ - -* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton { - width: 22px; - height: 22px; -} - -textarea { - height: 55px; -} - +/* Hide the advanced tab */ +#advanced_tab { + display: none; +} + +#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright { + width: 280px; +} + +#doctype, #docencoding { + width: 200px; +} + +#langcode { + width: 30px; +} + +#bgimage { + width: 220px; +} + +#fontface { + width: 240px; +} + +#leftmargin, #rightmargin, #topmargin, #bottommargin { + width: 50px; +} + +.panel_wrapper div.current { + height: 400px; +} + +#stylesheet, #style { + width: 240px; +} + +#doctypes { + width: 200px; +} + +/* Head list classes */ + +.headlistwrapper { + width: 100%; +} + +.selected { + border: 1px solid #0A246A; + background-color: #B6BDD2; +} + +.toolbar { + width: 100%; +} + +#headlist { + width: 100%; + margin-top: 3px; + font-size: 11px; +} + +#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element { + display: none; +} + +#addmenu { + position: absolute; + border: 1px solid gray; + display: none; + z-index: 100; + background-color: white; +} + +#addmenu a { + display: block; + width: 100%; + line-height: 20px; + text-decoration: none; + background-color: white; +} + +#addmenu a:hover { + background-color: #B6BDD2; + color: black; +} + +#addmenu span { + padding-left: 10px; + padding-right: 10px; +} + +#updateElementPanel { + display: none; +} + +#script_element .panel_wrapper div.current { + height: 108px; +} + +#style_element .panel_wrapper div.current { + height: 108px; +} + +#link_element .panel_wrapper div.current { + height: 140px; +} + +#element_script_value { + width: 100%; + height: 100px; +} + +#element_comment_value { + width: 100%; + height: 120px; +} + +#element_style_value { + width: 100%; + height: 100px; +} + +#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title { + width: 250px; +} + +.updateElementButton { + margin-top: 3px; +} + +/* MSIE specific styles */ + +* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton { + width: 22px; + height: 22px; +} + +textarea { + height: 55px; +} + .panel_wrapper div.current {height:420px;} \ No newline at end of file diff --git a/assets/plugins/tinymce/tiny_mce/plugins/fullpage/fullpage.htm b/assets/plugins/tinymce/tiny_mce/plugins/fullpage/fullpage.htm index 14ab8652ea..200f2b8e6c 100644 --- a/assets/plugins/tinymce/tiny_mce/plugins/fullpage/fullpage.htm +++ b/assets/plugins/tinymce/tiny_mce/plugins/fullpage/fullpage.htm @@ -1,259 +1,259 @@ - - - - {#fullpage_dlg.title} - - - - - - - -
-
- -
- -
-
-
- {#fullpage_dlg.meta_props} - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 
 
 
 
  - -
-
- -
- {#fullpage_dlg.langprops} - - - - - - - - - - - - - - - - - - - - - - -
- -
  - -
 
- -
 
-
-
- -
-
- {#fullpage_dlg.appearance_textprops} - - - - - - - - - - - - - - - - -
- -
- -
- - - - - -
 
-
-
- -
- {#fullpage_dlg.appearance_bgprops} - - - - - - - - - - -
- - - - - -
 
-
- - - - - -
 
-
-
- -
- {#fullpage_dlg.appearance_marginprops} - - - - - - - - - - - - - - -
-
- -
- {#fullpage_dlg.appearance_linkprops} - - - - - - - - - - - - - - - - - -
- - - - - -
- 		- - - - - -
 
-
- - - - - -
 
- 		  
-
- -
- {#fullpage_dlg.appearance_style} - - - - - - - - - - -
- - - - -
 
-
-
-
- -
- - -
-
- - + + + + {#fullpage_dlg.title} + + + + + + + +
+
+ +
+ +
+
+
+ {#fullpage_dlg.meta_props} + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
 
 
 
 
  + +
+
+ +
+ {#fullpage_dlg.langprops} + + + + + + + + + + + + + + + + + + + + + + +
+ +
  + +
 
+ +
 
+
+
+ +
+
+ {#fullpage_dlg.appearance_textprops} + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + +
 
+
+
+ +
+ {#fullpage_dlg.appearance_bgprops} + + + + + + + + + + +
+ + + + + +
 
+
+ + + + + +
 
+
+
+ +
+ {#fullpage_dlg.appearance_marginprops} + + + + + + + + + + + + + + +
+
+ +
+ {#fullpage_dlg.appearance_linkprops} + + + + + + + + + + + + + + + + + +
+ + + + + +
+ 		+ + + + + +
 
+
+ + + + + +
 
+ 		  
+
+ +
+ {#fullpage_dlg.appearance_style} + + + + + + + + + + +
+ + + + +
 
+
+
+
+ +
+ + +
+
+ + diff --git a/assets/plugins/tinymce/tiny_mce/plugins/fullpage/js/fullpage.js b/assets/plugins/tinymce/tiny_mce/plugins/fullpage/js/fullpage.js index 3f672ad3ba..66eec2d7b4 100644 --- a/assets/plugins/tinymce/tiny_mce/plugins/fullpage/js/fullpage.js +++ b/assets/plugins/tinymce/tiny_mce/plugins/fullpage/js/fullpage.js @@ -1,232 +1,232 @@ -/** - * fullpage.js - * - * Copyright 2009, Moxiecode Systems AB - * Released under LGPL License. - * - * License: http://tinymce.moxiecode.com/license - * Contributing: http://tinymce.moxiecode.com/contributing - */ - -(function() { - tinyMCEPopup.requireLangPack(); - - var defaultDocTypes = - 'XHTML 1.0 Transitional=,' + - 'XHTML 1.0 Frameset=,' + - 'XHTML 1.0 Strict=,' + - 'XHTML 1.1=,' + - 'HTML 4.01 Transitional=,' + - 'HTML 4.01 Strict=,' + - 'HTML 4.01 Frameset='; - - var defaultEncodings = - 'Western european (iso-8859-1)=iso-8859-1,' + - 'Central European (iso-8859-2)=iso-8859-2,' + - 'Unicode (UTF-8)=utf-8,' + - 'Chinese traditional (Big5)=big5,' + - 'Cyrillic (iso-8859-5)=iso-8859-5,' + - 'Japanese (iso-2022-jp)=iso-2022-jp,' + - 'Greek (iso-8859-7)=iso-8859-7,' + - 'Korean (iso-2022-kr)=iso-2022-kr,' + - 'ASCII (us-ascii)=us-ascii'; - - var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings'; - var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px'; - - function setVal(id, value) { - var elm = document.getElementById(id); - - if (elm) { - value = value || ''; - - if (elm.nodeName == "SELECT") - selectByValue(document.forms[0], id, value); - else if (elm.type == "checkbox") - elm.checked = !!value; - else - elm.value = value; - } - }; - - function getVal(id) { - var elm = document.getElementById(id); - - if (elm.nodeName == "SELECT") - return elm.options[elm.selectedIndex].value; - - if (elm.type == "checkbox") - return elm.checked; - - return elm.value; - }; - - window.FullPageDialog = { - changedStyle : function() { - var val, styles = tinyMCEPopup.editor.dom.parseStyle(getVal('style')); - - setVal('fontface', styles['font-face']); - setVal('fontsize', styles['font-size']); - setVal('textcolor', styles['color']); - - if (val = styles['background-image']) - setVal('bgimage', val.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1")); - else - setVal('bgimage', ''); - - setVal('bgcolor', styles['background-color']); - - // Reset margin form elements - setVal('topmargin', ''); - setVal('rightmargin', ''); - setVal('bottommargin', ''); - setVal('leftmargin', ''); - - // Expand margin - if (val = styles['margin']) { - val = val.split(' '); - styles['margin-top'] = val[0] || ''; - styles['margin-right'] = val[1] || val[0] || ''; - styles['margin-bottom'] = val[2] || val[0] || ''; - styles['margin-left'] = val[3] || val[0] || ''; - } - - if (val = styles['margin-top']) - setVal('topmargin', val.replace(/px/, '')); - - if (val = styles['margin-right']) - setVal('rightmargin', val.replace(/px/, '')); - - if (val = styles['margin-bottom']) - setVal('bottommargin', val.replace(/px/, '')); - - if (val = styles['margin-left']) - setVal('leftmargin', val.replace(/px/, '')); - - updateColor('bgcolor_pick', 'bgcolor'); - updateColor('textcolor_pick', 'textcolor'); - }, - - changedStyleProp : function() { - var val, dom = tinyMCEPopup.editor.dom, styles = dom.parseStyle(getVal('style')); - - styles['font-face'] = getVal('fontface'); - styles['font-size'] = getVal('fontsize'); - styles['color'] = getVal('textcolor'); - styles['background-color'] = getVal('bgcolor'); - - if (val = getVal('bgimage')) - styles['background-image'] = "url('" + val + "')"; - else - styles['background-image'] = ''; - - delete styles['margin']; - - if (val = getVal('topmargin')) - styles['margin-top'] = val + "px"; - else - styles['margin-top'] = ''; - - if (val = getVal('rightmargin')) - styles['margin-right'] = val + "px"; - else - styles['margin-right'] = ''; - - if (val = getVal('bottommargin')) - styles['margin-bottom'] = val + "px"; - else - styles['margin-bottom'] = ''; - - if (val = getVal('leftmargin')) - styles['margin-left'] = val + "px"; - else - styles['margin-left'] = ''; - - // Serialize, parse and reserialize this will compress redundant styles - setVal('style', dom.serializeStyle(dom.parseStyle(dom.serializeStyle(styles)))); - this.changedStyle(); - }, - - update : function() { - var data = {}; - - tinymce.each(tinyMCEPopup.dom.select('select,input,textarea'), function(node) { - data[node.id] = getVal(node.id); - }); - - tinyMCEPopup.editor.plugins.fullpage._dataToHtml(data); - tinyMCEPopup.close(); - } - }; - - function init() { - var form = document.forms[0], i, item, list, editor = tinyMCEPopup.editor; - - // Setup doctype select box - list = editor.getParam("fullpage_doctypes", defaultDocTypes).split(','); - for (i = 0; i < list.length; i++) { - item = list[i].split('='); - - if (item.length > 1) - addSelectValue(form, 'doctype', item[0], item[1]); - } - - // Setup fonts select box - list = editor.getParam("fullpage_fonts", defaultFontNames).split(';'); - for (i = 0; i < list.length; i++) { - item = list[i].split('='); - - if (item.length > 1) - addSelectValue(form, 'fontface', item[0], item[1]); - } - - // Setup fontsize select box - list = editor.getParam("fullpage_fontsizes", defaultFontSizes).split(','); - for (i = 0; i < list.length; i++) - addSelectValue(form, 'fontsize', list[i], list[i]); - - // Setup encodings select box - list = editor.getParam("fullpage_encodings", defaultEncodings).split(','); - for (i = 0; i < list.length; i++) { - item = list[i].split('='); - - if (item.length > 1) - addSelectValue(form, 'docencoding', item[0], item[1]); - } - - // Setup color pickers - document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor'); - document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color'); - document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color'); - document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color'); - document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor'); - document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage'); - document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage'); - - // Resize some elements - if (isVisible('stylesheetbrowser')) - document.getElementById('stylesheet').style.width = '220px'; - - if (isVisible('link_href_browser')) - document.getElementById('element_link_href').style.width = '230px'; - - if (isVisible('bgimage_browser')) - document.getElementById('bgimage').style.width = '210px'; - - // Update form - tinymce.each(tinyMCEPopup.getWindowArg('data'), function(value, key) { - setVal(key, value); - }); - - FullPageDialog.changedStyle(); - - // Update colors - updateColor('textcolor_pick', 'textcolor'); - updateColor('bgcolor_pick', 'bgcolor'); - updateColor('visited_color_pick', 'visited_color'); - updateColor('active_color_pick', 'active_color'); - updateColor('link_color_pick', 'link_color'); - }; - - tinyMCEPopup.onInit.add(init); -})(); +/** + * fullpage.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinyMCEPopup.requireLangPack(); + + var defaultDocTypes = + 'XHTML 1.0 Transitional=,' + + 'XHTML 1.0 Frameset=,' + + 'XHTML 1.0 Strict=,' + + 'XHTML 1.1=,' + + 'HTML 4.01 Transitional=,' + + 'HTML 4.01 Strict=,' + + 'HTML 4.01 Frameset='; + + var defaultEncodings = + 'Western european (iso-8859-1)=iso-8859-1,' + + 'Central European (iso-8859-2)=iso-8859-2,' + + 'Unicode (UTF-8)=utf-8,' + + 'Chinese traditional (Big5)=big5,' + + 'Cyrillic (iso-8859-5)=iso-8859-5,' + + 'Japanese (iso-2022-jp)=iso-2022-jp,' + + 'Greek (iso-8859-7)=iso-8859-7,' + + 'Korean (iso-2022-kr)=iso-2022-kr,' + + 'ASCII (us-ascii)=us-ascii'; + + var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings'; + var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px'; + + function setVal(id, value) { + var elm = document.getElementById(id); + + if (elm) { + value = value || ''; + + if (elm.nodeName == "SELECT") + selectByValue(document.forms[0], id, value); + else if (elm.type == "checkbox") + elm.checked = !!value; + else + elm.value = value; + } + }; + + function getVal(id) { + var elm = document.getElementById(id); + + if (elm.nodeName == "SELECT") + return elm.options[elm.selectedIndex].value; + + if (elm.type == "checkbox") + return elm.checked; + + return elm.value; + }; + + window.FullPageDialog = { + changedStyle : function() { + var val, styles = tinyMCEPopup.editor.dom.parseStyle(getVal('style')); + + setVal('fontface', styles['font-face']); + setVal('fontsize', styles['font-size']); + setVal('textcolor', styles['color']); + + if (val = styles['background-image']) + setVal('bgimage', val.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1")); + else + setVal('bgimage', ''); + + setVal('bgcolor', styles['background-color']); + + // Reset margin form elements + setVal('topmargin', ''); + setVal('rightmargin', ''); + setVal('bottommargin', ''); + setVal('leftmargin', ''); + + // Expand margin + if (val = styles['margin']) { + val = val.split(' '); + styles['margin-top'] = val[0] || ''; + styles['margin-right'] = val[1] || val[0] || ''; + styles['margin-bottom'] = val[2] || val[0] || ''; + styles['margin-left'] = val[3] || val[0] || ''; + } + + if (val = styles['margin-top']) + setVal('topmargin', val.replace(/px/, '')); + + if (val = styles['margin-right']) + setVal('rightmargin', val.replace(/px/, '')); + + if (val = styles['margin-bottom']) + setVal('bottommargin', val.replace(/px/, '')); + + if (val = styles['margin-left']) + setVal('leftmargin', val.replace(/px/, '')); + + updateColor('bgcolor_pick', 'bgcolor'); + updateColor('textcolor_pick', 'textcolor'); + }, + + changedStyleProp : function() { + var val, dom = tinyMCEPopup.editor.dom, styles = dom.parseStyle(getVal('style')); + + styles['font-face'] = getVal('fontface'); + styles['font-size'] = getVal('fontsize'); + styles['color'] = getVal('textcolor'); + styles['background-color'] = getVal('bgcolor'); + + if (val = getVal('bgimage')) + styles['background-image'] = "url('" + val + "')"; + else + styles['background-image'] = ''; + + delete styles['margin']; + + if (val = getVal('topmargin')) + styles['margin-top'] = val + "px"; + else + styles['margin-top'] = ''; + + if (val = getVal('rightmargin')) + styles['margin-right'] = val + "px"; + else + styles['margin-right'] = ''; + + if (val = getVal('bottommargin')) + styles['margin-bottom'] = val + "px"; + else + styles['margin-bottom'] = ''; + + if (val = getVal('leftmargin')) + styles['margin-left'] = val + "px"; + else + styles['margin-left'] = ''; + + // Serialize, parse and reserialize this will compress redundant styles + setVal('style', dom.serializeStyle(dom.parseStyle(dom.serializeStyle(styles)))); + this.changedStyle(); + }, + + update : function() { + var data = {}; + + tinymce.each(tinyMCEPopup.dom.select('select,input,textarea'), function(node) { + data[node.id] = getVal(node.id); + }); + + tinyMCEPopup.editor.plugins.fullpage._dataToHtml(data); + tinyMCEPopup.close(); + } + }; + + function init() { + var form = document.forms[0], i, item, list, editor = tinyMCEPopup.editor; + + // Setup doctype select box + list = editor.getParam("fullpage_doctypes", defaultDocTypes).split(','); + for (i = 0; i < list.length; i++) { + item = list[i].split('='); + + if (item.length > 1) + addSelectValue(form, 'doctype', item[0], item[1]); + } + + // Setup fonts select box + list = editor.getParam("fullpage_fonts", defaultFontNames).split(';'); + for (i = 0; i < list.length; i++) { + item = list[i].split('='); + + if (item.length > 1) + addSelectValue(form, 'fontface', item[0], item[1]); + } + + // Setup fontsize select box + list = editor.getParam("fullpage_fontsizes", defaultFontSizes).split(','); + for (i = 0; i < list.length; i++) + addSelectValue(form, 'fontsize', list[i], list[i]); + + // Setup encodings select box + list = editor.getParam("fullpage_encodings", defaultEncodings).split(','); + for (i = 0; i < list.length; i++) { + item = list[i].split('='); + + if (item.length > 1) + addSelectValue(form, 'docencoding', item[0], item[1]); + } + + // Setup color pickers + document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor'); + document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color'); + document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color'); + document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color'); + document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor'); + document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage'); + document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage'); + + // Resize some elements + if (isVisible('stylesheetbrowser')) + document.getElementById('stylesheet').style.width = '220px'; + + if (isVisible('link_href_browser')) + document.getElementById('element_link_href').style.width = '230px'; + + if (isVisible('bgimage_browser')) + document.getElementById('bgimage').style.width = '210px'; + + // Update form + tinymce.each(tinyMCEPopup.getWindowArg('data'), function(value, key) { + setVal(key, value); + }); + + FullPageDialog.changedStyle(); + + // Update colors + updateColor('textcolor_pick', 'textcolor'); + updateColor('bgcolor_pick', 'bgcolor'); + updateColor('visited_color_pick', 'visited_color'); + updateColor('active_color_pick', 'active_color'); + updateColor('link_color_pick', 'link_color'); + }; + + tinyMCEPopup.onInit.add(init); +})(); From 28ddd43038e4699befc6d84891c93d075027789c Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 20 Apr 2013 19:31:22 +0900 Subject: [PATCH 004/530] Refactor #9861 Should be core files line feed code is "lf" (part 3) http://tracker.modx.com/issues/9861 --- .../modules/docmanager/lang/english.inc.php | 324 +++++++++--------- .../docmanager/lang/japanese-utf8.inc.php | 322 ++++++++--------- .../docmanager/lang/russian-UTF8.inc.php | 324 +++++++++--------- 3 files changed, 485 insertions(+), 485 deletions(-) diff --git a/assets/modules/docmanager/lang/english.inc.php b/assets/modules/docmanager/lang/english.inc.php index f5e44bc31b..199306a556 100644 --- a/assets/modules/docmanager/lang/english.inc.php +++ b/assets/modules/docmanager/lang/english.inc.php @@ -1,162 +1,162 @@ -Key (where n is a document ID number):

- n* - Change setting for this document and immediate children
- n** - Change setting for this document and ALL children
- n-n2 - Change setting for this range of documents
- n - Change setting for a single document

-

Example: 1*,4**,2-20,25 - This will change the selected setting - for documents 1 and its children, document 4 and all children, documents 2 - through 20 and document 25.

'; -$_lang['DM_select_tree'] ='View and select documents using the Document Tree'; - -//-- process tree/range messages -$_lang['DM_process_noselection'] = 'No selection was made. '; -$_lang['DM_process_novalues'] = 'No values have been specified.'; -$_lang['DM_process_limits_error'] = 'Upper limit less than lower limit:'; -$_lang['DM_process_invalid_error'] = 'Invalid Value:'; -$_lang['DM_process_update_success'] = 'Update was completed successfully, with no errors.'; -$_lang['DM_process_update_error'] = 'Update has completed but encountered errors:'; -$_lang['DM_process_back'] = 'Back'; - -//-- manager access logging -$_lang['DM_log_template'] = 'Document Manager: Templates changed.'; -$_lang['DM_log_templatevariables'] = 'Document Manager: Template variables changed.'; -$_lang['DM_log_docpermissions'] ='Document Manager: Document Permissions changed.'; -$_lang['DM_log_sortmenu']='Document Manager: Menu Index operation completed.'; -$_lang['DM_log_publish']='Document Manager: Document Manager: Documents Published/Unpublished settings changed.'; -$_lang['DM_log_hidemenu']='Document Manager: Documents Hide/Show in Menu settings changed.'; -$_lang['DM_log_search']='Document Manager: Documents Searchable/Unsearchable settings changed.'; -$_lang['DM_log_cache']='Document Manager: Documents Cacheable/Uncacheable settings changed.'; -$_lang['DM_log_richtext']='Document Manager: Documents Use Richtext Editor settings changed.'; -$_lang['DM_log_delete']='Document Manager: Documents Delete/Undelete settings changed.'; -$_lang['DM_log_dates']='Document Manager: Documents Date settings changed.'; -$_lang['DM_log_authors']='Document Manager: Documents Author settings changed.'; - -?> +Key (where n is a document ID number):

+ n* - Change setting for this document and immediate children
+ n** - Change setting for this document and ALL children
+ n-n2 - Change setting for this range of documents
+ n - Change setting for a single document

+

Example: 1*,4**,2-20,25 - This will change the selected setting + for documents 1 and its children, document 4 and all children, documents 2 + through 20 and document 25.

'; +$_lang['DM_select_tree'] ='View and select documents using the Document Tree'; + +//-- process tree/range messages +$_lang['DM_process_noselection'] = 'No selection was made. '; +$_lang['DM_process_novalues'] = 'No values have been specified.'; +$_lang['DM_process_limits_error'] = 'Upper limit less than lower limit:'; +$_lang['DM_process_invalid_error'] = 'Invalid Value:'; +$_lang['DM_process_update_success'] = 'Update was completed successfully, with no errors.'; +$_lang['DM_process_update_error'] = 'Update has completed but encountered errors:'; +$_lang['DM_process_back'] = 'Back'; + +//-- manager access logging +$_lang['DM_log_template'] = 'Document Manager: Templates changed.'; +$_lang['DM_log_templatevariables'] = 'Document Manager: Template variables changed.'; +$_lang['DM_log_docpermissions'] ='Document Manager: Document Permissions changed.'; +$_lang['DM_log_sortmenu']='Document Manager: Menu Index operation completed.'; +$_lang['DM_log_publish']='Document Manager: Document Manager: Documents Published/Unpublished settings changed.'; +$_lang['DM_log_hidemenu']='Document Manager: Documents Hide/Show in Menu settings changed.'; +$_lang['DM_log_search']='Document Manager: Documents Searchable/Unsearchable settings changed.'; +$_lang['DM_log_cache']='Document Manager: Documents Cacheable/Uncacheable settings changed.'; +$_lang['DM_log_richtext']='Document Manager: Documents Use Richtext Editor settings changed.'; +$_lang['DM_log_delete']='Document Manager: Documents Delete/Undelete settings changed.'; +$_lang['DM_log_dates']='Document Manager: Documents Date settings changed.'; +$_lang['DM_log_authors']='Document Manager: Documents Author settings changed.'; + +?> diff --git a/assets/modules/docmanager/lang/japanese-utf8.inc.php b/assets/modules/docmanager/lang/japanese-utf8.inc.php index 193f32055b..0b3f8657bd 100755 --- a/assets/modules/docmanager/lang/japanese-utf8.inc.php +++ b/assets/modules/docmanager/lang/japanese-utf8.inc.php @@ -1,162 +1,162 @@ -サイトルートか、並べ替えたい範囲の親リソース(コンテナ)をクリックしてください。'; -$_lang['DM_sort_updating'] = '更新中 ...'; -$_lang['DM_sort_updated'] = '更新しました。「閉じる」または「戻る」ボタンをクリックしてください。'; -$_lang['DM_sort_nochildren'] = 'このリソースにはサブリソースがありません。'; -$_lang['DM_sort_noid']='リソースが選択されていません。戻ってリソースを選択してください。'; - -//-- other tab -$_lang['DM_other_header'] = 'リソースの各種設定'; -$_lang['DM_misc_label'] = '変更対象の設定:'; -$_lang['DM_misc_desc'] = '変更する設定をドロップダウンメニューから選択してください。そして必要なオプションを指定します。一度にひとつの設定しか変更できません。'; - -$_lang['DM_other_dropdown_publish'] = '公開/非公開'; -$_lang['DM_other_dropdown_show'] = 'メニューに表示/非表示'; -$_lang['DM_other_dropdown_search'] = '検索対象/非対象'; -$_lang['DM_other_dropdown_cache'] = 'キャッシュ/不可'; -$_lang['DM_other_dropdown_richtext'] = 'エディタ/なし'; -$_lang['DM_other_dropdown_delete'] = '削除/復活'; - -//-- radio button text -$_lang['DM_other_publish_radio1'] = '公開'; -$_lang['DM_other_publish_radio2'] = '非公開'; -$_lang['DM_other_show_radio1'] = 'メニューから隠す'; -$_lang['DM_other_show_radio2'] = 'メニューに表示'; -$_lang['DM_other_search_radio1'] = '検索対象'; -$_lang['DM_other_search_radio2'] = '検索しない'; -$_lang['DM_other_cache_radio1'] = 'キャッシュする'; -$_lang['DM_other_cache_radio2'] = 'キャッシュしない'; -$_lang['DM_other_richtext_radio1'] = 'エディタ使用'; -$_lang['DM_other_richtext_radio2'] = 'エディタ不要'; -$_lang['DM_other_delete_radio1'] = '削除'; -$_lang['DM_other_delete_radio2'] = '削除から復活'; - -//-- adjust dates -$_lang['DM_adjust_dates_header'] = 'リソースの各種日時設定'; -$_lang['DM_adjust_dates_desc'] = '複数のリソースの日時設定をまとめて変更できます。'; -$_lang['DM_view_calendar'] = 'カレンダーを表示'; -$_lang['DM_clear_date'] = 'リセット'; - -//-- adjust authors -$_lang['DM_adjust_authors_header'] = '作成者などの設定'; -$_lang['DM_adjust_authors_desc'] = 'リソースの作成者/編集者をリストから選んでください'; -$_lang['DM_adjust_authors_createdby'] = '作成者:'; -$_lang['DM_adjust_authors_editedby'] = '編集者:'; -$_lang['DM_adjust_authors_noselection'] = '変更なし'; - - //-- labels -$_lang['DM_date_pubdate'] = '公開日時:'; -$_lang['DM_date_unpubdate'] = '公開終了日時:'; -$_lang['DM_date_createdon'] = '作成日時:'; -$_lang['DM_date_editedon'] = '編集日時:'; -//$_lang['DM_date_deletedon'] = 'Deleted On Date'; - -$_lang['DM_date_notset'] = ' (変更しません)'; -//deprecated -$_lang['DM_date_dateselect_label'] = '日付を選択: '; - -//-- document select section -$_lang['DM_select_submit'] = '適用'; -$_lang['DM_select_range'] = 'ID指定画面に戻ります'; -$_lang['DM_select_range_text'] = '

指定方法（n、m はリソースIDを示す数字です):

-
  • n*　 - その親リソース(コンテナ)と直下のサブリソースを意味する指定
    • -
  • n** - その親リソース(コンテナ)と配下の子、孫など全てのリソースを意味する指定
    • -
  • n-m - n から m までのIDの範囲を意味る指定。n、m を含みます
    • -
  • n　　 - IDがnの1つのリソースを意味する指定
    • -
  • 例：1*,4**,2-20,25　- この指定では、1、1のサブリソース、4、4の全配下リソース、 - 2から20までの19個のリソース及び25 の各IDのリソースが指定されています。
'; -$_lang['DM_select_tree'] ='ツリー表示からリソースを選択します'; - -//-- process tree/range messages -$_lang['DM_process_noselection'] = '必要な指定がされていません。'; -$_lang['DM_process_novalues'] = '値が指定されていませんでした。'; -$_lang['DM_process_limits_error'] = '上限が下限よりも小さいです:'; -$_lang['DM_process_invalid_error'] = '値がイレギュラーです '; -$_lang['DM_process_update_success'] = '変更は無事完了しました。'; -$_lang['DM_process_update_error'] = '変更は完了しましたが、エラーがありました:'; -$_lang['DM_process_back'] = '戻る'; - -//-- manager access logging -$_lang['DM_log_template'] = 'Doc Manager: テンプレートを変更しました。'; -$_lang['DM_log_templatevariables'] = 'Doc Manager: テンプレート変数を変更しました。'; -$_lang['DM_log_docpermissions'] ='Doc Manager: リソースのアクセス制限を変更しました。'; -$_lang['DM_log_sortmenu']='Document Manager: メニューインデックス操作を完了しました。'; -$_lang['DM_log_publish']='Document Manager: リソースの公開/非公開を変更しました。'; -$_lang['DM_log_hidemenu']='Document Manager: リソースのメニュー表示/非表示を変更しました。'; -$_lang['DM_log_search']='Document Manager: リソースの検索対象/非対象を変更しました。'; -$_lang['DM_log_cache']='Document Manager: リソースのキャッシュ可/不可を変更しました。'; -$_lang['DM_log_richtext']='Document Manager: リソースのリッチテキストエディタの設定を変更しました。'; -$_lang['DM_log_delete']='Document Manager: リソースの削除/復活を変更しました。'; -$_lang['DM_log_dates']='Document Manager: リソースの各種日付を変更しました。'; -$_lang['DM_log_authors']='Document Manager: リソースの作成者などの情報を変更しました。'; - +サイトルートか、並べ替えたい範囲の親リソース(コンテナ)をクリックしてください。'; +$_lang['DM_sort_updating'] = '更新中 ...'; +$_lang['DM_sort_updated'] = '更新しました。「閉じる」または「戻る」ボタンをクリックしてください。'; +$_lang['DM_sort_nochildren'] = 'このリソースにはサブリソースがありません。'; +$_lang['DM_sort_noid']='リソースが選択されていません。戻ってリソースを選択してください。'; + +//-- other tab +$_lang['DM_other_header'] = 'リソースの各種設定'; +$_lang['DM_misc_label'] = '変更対象の設定:'; +$_lang['DM_misc_desc'] = '変更する設定をドロップダウンメニューから選択してください。そして必要なオプションを指定します。一度にひとつの設定しか変更できません。'; + +$_lang['DM_other_dropdown_publish'] = '公開/非公開'; +$_lang['DM_other_dropdown_show'] = 'メニューに表示/非表示'; +$_lang['DM_other_dropdown_search'] = '検索対象/非対象'; +$_lang['DM_other_dropdown_cache'] = 'キャッシュ/不可'; +$_lang['DM_other_dropdown_richtext'] = 'エディタ/なし'; +$_lang['DM_other_dropdown_delete'] = '削除/復活'; + +//-- radio button text +$_lang['DM_other_publish_radio1'] = '公開'; +$_lang['DM_other_publish_radio2'] = '非公開'; +$_lang['DM_other_show_radio1'] = 'メニューから隠す'; +$_lang['DM_other_show_radio2'] = 'メニューに表示'; +$_lang['DM_other_search_radio1'] = '検索対象'; +$_lang['DM_other_search_radio2'] = '検索しない'; +$_lang['DM_other_cache_radio1'] = 'キャッシュする'; +$_lang['DM_other_cache_radio2'] = 'キャッシュしない'; +$_lang['DM_other_richtext_radio1'] = 'エディタ使用'; +$_lang['DM_other_richtext_radio2'] = 'エディタ不要'; +$_lang['DM_other_delete_radio1'] = '削除'; +$_lang['DM_other_delete_radio2'] = '削除から復活'; + +//-- adjust dates +$_lang['DM_adjust_dates_header'] = 'リソースの各種日時設定'; +$_lang['DM_adjust_dates_desc'] = '複数のリソースの日時設定をまとめて変更できます。'; +$_lang['DM_view_calendar'] = 'カレンダーを表示'; +$_lang['DM_clear_date'] = 'リセット'; + +//-- adjust authors +$_lang['DM_adjust_authors_header'] = '作成者などの設定'; +$_lang['DM_adjust_authors_desc'] = 'リソースの作成者/編集者をリストから選んでください'; +$_lang['DM_adjust_authors_createdby'] = '作成者:'; +$_lang['DM_adjust_authors_editedby'] = '編集者:'; +$_lang['DM_adjust_authors_noselection'] = '変更なし'; + + //-- labels +$_lang['DM_date_pubdate'] = '公開日時:'; +$_lang['DM_date_unpubdate'] = '公開終了日時:'; +$_lang['DM_date_createdon'] = '作成日時:'; +$_lang['DM_date_editedon'] = '編集日時:'; +//$_lang['DM_date_deletedon'] = 'Deleted On Date'; + +$_lang['DM_date_notset'] = ' (変更しません)'; +//deprecated +$_lang['DM_date_dateselect_label'] = '日付を選択: '; + +//-- document select section +$_lang['DM_select_submit'] = '適用'; +$_lang['DM_select_range'] = 'ID指定画面に戻ります'; +$_lang['DM_select_range_text'] = '

指定方法（n、m はリソースIDを示す数字です):

+
  • n*　 - その親リソース(コンテナ)と直下のサブリソースを意味する指定
    • +
  • n** - その親リソース(コンテナ)と配下の子、孫など全てのリソースを意味する指定
    • +
  • n-m - n から m までのIDの範囲を意味る指定。n、m を含みます
    • +
  • n　　 - IDがnの1つのリソースを意味する指定
    • +
  • 例：1*,4**,2-20,25　- この指定では、1、1のサブリソース、4、4の全配下リソース、 + 2から20までの19個のリソース及び25 の各IDのリソースが指定されています。
'; +$_lang['DM_select_tree'] ='ツリー表示からリソースを選択します'; + +//-- process tree/range messages +$_lang['DM_process_noselection'] = '必要な指定がされていません。'; +$_lang['DM_process_novalues'] = '値が指定されていませんでした。'; +$_lang['DM_process_limits_error'] = '上限が下限よりも小さいです:'; +$_lang['DM_process_invalid_error'] = '値がイレギュラーです '; +$_lang['DM_process_update_success'] = '変更は無事完了しました。'; +$_lang['DM_process_update_error'] = '変更は完了しましたが、エラーがありました:'; +$_lang['DM_process_back'] = '戻る'; + +//-- manager access logging +$_lang['DM_log_template'] = 'Doc Manager: テンプレートを変更しました。'; +$_lang['DM_log_templatevariables'] = 'Doc Manager: テンプレート変数を変更しました。'; +$_lang['DM_log_docpermissions'] ='Doc Manager: リソースのアクセス制限を変更しました。'; +$_lang['DM_log_sortmenu']='Document Manager: メニューインデックス操作を完了しました。'; +$_lang['DM_log_publish']='Document Manager: リソースの公開/非公開を変更しました。'; +$_lang['DM_log_hidemenu']='Document Manager: リソースのメニュー表示/非表示を変更しました。'; +$_lang['DM_log_search']='Document Manager: リソースの検索対象/非対象を変更しました。'; +$_lang['DM_log_cache']='Document Manager: リソースのキャッシュ可/不可を変更しました。'; +$_lang['DM_log_richtext']='Document Manager: リソースのリッチテキストエディタの設定を変更しました。'; +$_lang['DM_log_delete']='Document Manager: リソースの削除/復活を変更しました。'; +$_lang['DM_log_dates']='Document Manager: リソースの各種日付を変更しました。'; +$_lang['DM_log_authors']='Document Manager: リソースの作成者などの情報を変更しました。'; + ?> \ No newline at end of file diff --git a/assets/modules/docmanager/lang/russian-UTF8.inc.php b/assets/modules/docmanager/lang/russian-UTF8.inc.php index 7200da9692..8913928d7d 100755 --- a/assets/modules/docmanager/lang/russian-UTF8.inc.php +++ b/assets/modules/docmanager/lang/russian-UTF8.inc.php @@ -1,163 +1,163 @@ -Можно использовать следующий синтаксис при задании диапазона (вместо "n" указывайте число ID ресурса):

-
    -
  • n* - изменить свойства ресурса с ID=n и непосредственных дочерних ресурсов;
    • -
  • n** - изменить свойства ресурса с ID=n и ВСЕХ его дочерних ресурсов;
    • -
  • n-n2 - изменить свойства для всех ресурсов, ID которых находятся в указанном диапазоне;
    • -
  • n - изменить свойства для одного ресурса с ID=n;
    • -
  • n*,n**,n-n2,n - можно сразу указать несколько диапазонов, разделяя их запятыми.
    • -

Пример: 1*,4**,2-20,25 - будут изменены свойства для ресурса с ID=1 и его непосредственных дочерних ресурсов, ресурса с ID=4 и всех его дочерних ресурсов, ресурсов с ID в диапазоне от 2 до 20, и ресурса с ID=25.

'; -$_lang['DM_select_tree'] = 'Просмотреть и выбрать ресурсы в дереве'; - -//-- process tree/range messages -$_lang['DM_process_noselection'] = 'Ничего не выбрано. '; -$_lang['DM_process_novalues'] = 'Никаких значений не задано.'; -$_lang['DM_process_limits_error'] = 'Верхняя граница диапазона меньше нижней границы:'; -$_lang['DM_process_invalid_error'] = 'Недопустимое значение:'; -$_lang['DM_process_update_success'] = 'Изменение прошло успешно.'; -$_lang['DM_process_update_error'] = 'Изменение завершено с ошибками:'; -$_lang['DM_process_back'] = 'Назад'; - -//-- manager access logging -$_lang['DM_log_template'] = 'Менеджер ресурсов: шаблоны изменены.'; -$_lang['DM_log_templatevariables'] = 'Менеджер ресурсов: параметры (TV) изменены.'; -$_lang['DM_log_docpermissions'] = 'Менеджер ресурсов: права на ресурсы изменены.'; -$_lang['DM_log_sortmenu'] = 'Менеджер ресурсов: изменение индексов пунктов меню завершено.'; -$_lang['DM_log_publish'] = 'Менеджер ресурсов: свойство ресурсов "Опубликовать / Отменить публикацию" изменено.'; -$_lang['DM_log_hidemenu'] = 'Менеджер ресурсов: свойство ресурсов "Показывать / Не показывать в меню" изменено.'; -$_lang['DM_log_search'] = 'Менеджер ресурсов: свойство ресурсов "Разрешить / Запретить поиск в содержимом" изменено.'; -$_lang['DM_log_cache'] = 'Менеджер ресурсов: свойство ресурсов "Кэшировать / Не кэшировать" изменено.'; -$_lang['DM_log_richtext'] = 'Менеджер ресурсов: свойство ресурсов "Использовать / Не использовать HTML-редактор" изменено.'; -$_lang['DM_log_delete'] = 'Менеджер ресурсов: удаление / отмена удаления прошла успешно.'; -$_lang['DM_log_dates'] = 'Менеджер ресурсов: даты ресурсов изменены.'; -$_lang['DM_log_authors'] = 'Менеджер ресурсов: авторы ресурсов изменены.'; - +Можно использовать следующий синтаксис при задании диапазона (вместо "n" указывайте число ID ресурса):

+
    +
  • n* - изменить свойства ресурса с ID=n и непосредственных дочерних ресурсов;
    • +
  • n** - изменить свойства ресурса с ID=n и ВСЕХ его дочерних ресурсов;
    • +
  • n-n2 - изменить свойства для всех ресурсов, ID которых находятся в указанном диапазоне;
    • +
  • n - изменить свойства для одного ресурса с ID=n;
    • +
  • n*,n**,n-n2,n - можно сразу указать несколько диапазонов, разделяя их запятыми.
    • +

Пример: 1*,4**,2-20,25 - будут изменены свойства для ресурса с ID=1 и его непосредственных дочерних ресурсов, ресурса с ID=4 и всех его дочерних ресурсов, ресурсов с ID в диапазоне от 2 до 20, и ресурса с ID=25.

'; +$_lang['DM_select_tree'] = 'Просмотреть и выбрать ресурсы в дереве'; + +//-- process tree/range messages +$_lang['DM_process_noselection'] = 'Ничего не выбрано. '; +$_lang['DM_process_novalues'] = 'Никаких значений не задано.'; +$_lang['DM_process_limits_error'] = 'Верхняя граница диапазона меньше нижней границы:'; +$_lang['DM_process_invalid_error'] = 'Недопустимое значение:'; +$_lang['DM_process_update_success'] = 'Изменение прошло успешно.'; +$_lang['DM_process_update_error'] = 'Изменение завершено с ошибками:'; +$_lang['DM_process_back'] = 'Назад'; + +//-- manager access logging +$_lang['DM_log_template'] = 'Менеджер ресурсов: шаблоны изменены.'; +$_lang['DM_log_templatevariables'] = 'Менеджер ресурсов: параметры (TV) изменены.'; +$_lang['DM_log_docpermissions'] = 'Менеджер ресурсов: права на ресурсы изменены.'; +$_lang['DM_log_sortmenu'] = 'Менеджер ресурсов: изменение индексов пунктов меню завершено.'; +$_lang['DM_log_publish'] = 'Менеджер ресурсов: свойство ресурсов "Опубликовать / Отменить публикацию" изменено.'; +$_lang['DM_log_hidemenu'] = 'Менеджер ресурсов: свойство ресурсов "Показывать / Не показывать в меню" изменено.'; +$_lang['DM_log_search'] = 'Менеджер ресурсов: свойство ресурсов "Разрешить / Запретить поиск в содержимом" изменено.'; +$_lang['DM_log_cache'] = 'Менеджер ресурсов: свойство ресурсов "Кэшировать / Не кэшировать" изменено.'; +$_lang['DM_log_richtext'] = 'Менеджер ресурсов: свойство ресурсов "Использовать / Не использовать HTML-редактор" изменено.'; +$_lang['DM_log_delete'] = 'Менеджер ресурсов: удаление / отмена удаления прошла успешно.'; +$_lang['DM_log_dates'] = 'Менеджер ресурсов: даты ресурсов изменены.'; +$_lang['DM_log_authors'] = 'Менеджер ресурсов: авторы ресурсов изменены.'; + ?> \ No newline at end of file From 72f6068a71856853b8d05f29d1d28f2dab3ae3bd Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 20 Apr 2013 19:31:36 +0900 Subject: [PATCH 005/530] Refactor #9861 Should be core files line feed code is "lf" (part 4) http://tracker.modx.com/issues/9861 --- manager/frames/1.php | 72 +- manager/includes/session_keepalive.php | 42 +- .../php/Commands/GetFoldersAndFiles.php | 368 +++++----- manager/media/style/common/login.tpl | 688 +++++++++--------- 4 files changed, 585 insertions(+), 585 deletions(-) diff --git a/manager/frames/1.php b/manager/frames/1.php index 05692303bf..b33848b85f 100755 --- a/manager/frames/1.php +++ b/manager/frames/1.php @@ -1,36 +1,36 @@ -INCLUDE_ORDERING_ERROR

Please use the MODx Content Manager instead of accessing this file directly."); -include_once ("browsercheck.inc.php"); -$browser = $client->property('browser'); -$_SESSION['browser'] = $browser; -$version = $client->property('version'); -$_SESSION['browser_version'] = $version; -$mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en'; -if(!isset($modx->config['manager_menu_height'])) $modx->config['manager_menu_height'] = '70'; -if(!isset($modx->config['manager_tree_width'])) $modx->config['manager_tree_width'] = '260'; -?> - -> - - <?php echo $site_name?> - (MODX CMS Manager) - - - - - - - - - - - - - - - -This software requires a browser with support for frames. - +INCLUDE_ORDERING_ERROR

Please use the MODx Content Manager instead of accessing this file directly."); +include_once ("browsercheck.inc.php"); +$browser = $client->property('browser'); +$_SESSION['browser'] = $browser; +$version = $client->property('version'); +$_SESSION['browser_version'] = $version; +$mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en'; +if(!isset($modx->config['manager_menu_height'])) $modx->config['manager_menu_height'] = '70'; +if(!isset($modx->config['manager_tree_width'])) $modx->config['manager_tree_width'] = '260'; +?> + +> + + <?php echo $site_name?> - (MODX CMS Manager) + + + + + + + + + + + + + + + +This software requires a browser with support for frames. + diff --git a/manager/includes/session_keepalive.php b/manager/includes/session_keepalive.php index 21a4fe47fc..19d9417424 100644 --- a/manager/includes/session_keepalive.php +++ b/manager/includes/session_keepalive.php @@ -1,21 +1,21 @@ -fckphp_config=$fckphp_config; - $this->type=$type; - $this->raw_cwd=$cwd; - $this->actual_cwd=str_replace("//","/",($fckphp_config['UserFilesPath']."/$type/".$this->raw_cwd)); - $this->real_cwd=str_replace("//","/",($this->fckphp_config['basedir']."/".$this->actual_cwd)); - } - - function run() { - - header ("Content-Type: application/xml; charset=utf-8"); - echo "\n"; - ?> - - - - - - - - - - - - - - - - - - - - -] > - - - - -real_cwd)) { - - /** - * Initiate the array to store the foldernames - */ - $folders_array = array(); - - while (($filename=readdir($dh))!==false) { - - if (($filename!=".")&&($filename!="..")) { - if (is_dir($this->real_cwd."/$filename")) { - //check if$fckphp_configured not to show this folder - $hide=false; - for($i=0;$ifckphp_config['ResourceAreas'][$this->type]['HideFolders']);$i++) - $hide=(preg_match("/".$this->fckphp_config['ResourceAreas'][$this->type]['HideFolders'][$i]."/",$filename)?true:$hide); - - /** - * Dont echo the entry, push it in the array - */ - //if (!$hide) echo "\t\t\n"; - if (!$hide) array_push($folders_array,$filename); - - } else { - array_push($files,$filename); - } - } - } - closedir($dh); - - /** - * Sort the array by the way you like and show it. - */ - natcasesort($folders_array); - foreach($folders_array as $k=>$v) - { - echo ''."\n"; - } - - } - - echo "\t\n"; - echo "\t\n"; - - /** - * The filenames are in the array $files - * SORT IT! - */ - natcasesort($files); - $files = array_values($files); - - for ($i=0;$ifckphp_config['ResourceAreas'][$this->type]['AllowedExtensions'])) { - - //check if$fckphp_configured not to show this file - $editable=$hide=false; - for($j=0;$jfckphp_config['ResourceAreas'][$this->type]['HideFiles']);$j++) - $hide=(preg_match("/".$this->fckphp_config['ResourceAreas'][$this->type]['HideFiles'][$j]."/",$files[$i])?true:$hide); - - if (!$hide) { - if ($this->fckphp_config['ResourceAreas'][$this->type]['AllowImageEditing']) - $editable=$this->isImageEditable($this->real_cwd."/".$files[$i]); - - if(extension_loaded('mbstring')) { - $name = mb_convert_encoding($files [$i] , 'UTF-8', mb_detect_encoding($files[$i] , 'UTF-8, windows-1251, ASCII, ISO-8859-1')); - } else { - $name = $files[$i]; - } - // $this->fckphp_config['modx']['charset'] if needed - echo "\t\treal_cwd."/".$files [$i] )/1024)."\" editable=\"" . ( $editable?"1":"0" ) . "\" />\n"; - } - - } - - } - - echo "\t\n"; - echo "\n"; - } - - - function isImageEditable($file) { - $fh=fopen($file,"r"); - if ($fh) { - $start4=fread($fh,4); - fclose($fh); - - $start3=substr($start4,0,3); - - if ($start4=="\x89PNG") { //PNG - return (function_exists("imagecreatefrompng") && function_exists("imagepng")); - - } elseif ($start3=="GIF") { //GIF - return (function_exists("imagecreatefromgif") && function_exists("imagegif")); - - } elseif ($start3=="\xFF\xD8\xFF") { //JPEG - return (function_exists("imagecreatefromjpeg")&& function_exists("imagejpeg")); - - } elseif ($start4=="hsi1") { //JPEG - return (function_exists("imagecreatefromjpeg")&& function_exists("imagejpeg")); - - } else { - return false; - } - - } else { - return false; - } - } - - -} - +fckphp_config=$fckphp_config; + $this->type=$type; + $this->raw_cwd=$cwd; + $this->actual_cwd=str_replace("//","/",($fckphp_config['UserFilesPath']."/$type/".$this->raw_cwd)); + $this->real_cwd=str_replace("//","/",($this->fckphp_config['basedir']."/".$this->actual_cwd)); + } + + function run() { + + header ("Content-Type: application/xml; charset=utf-8"); + echo "\n"; + ?> + + + + + + + + + + + + + + + + + + + + +] > + + + + +real_cwd)) { + + /** + * Initiate the array to store the foldernames + */ + $folders_array = array(); + + while (($filename=readdir($dh))!==false) { + + if (($filename!=".")&&($filename!="..")) { + if (is_dir($this->real_cwd."/$filename")) { + //check if$fckphp_configured not to show this folder + $hide=false; + for($i=0;$ifckphp_config['ResourceAreas'][$this->type]['HideFolders']);$i++) + $hide=(preg_match("/".$this->fckphp_config['ResourceAreas'][$this->type]['HideFolders'][$i]."/",$filename)?true:$hide); + + /** + * Dont echo the entry, push it in the array + */ + //if (!$hide) echo "\t\t\n"; + if (!$hide) array_push($folders_array,$filename); + + } else { + array_push($files,$filename); + } + } + } + closedir($dh); + + /** + * Sort the array by the way you like and show it. + */ + natcasesort($folders_array); + foreach($folders_array as $k=>$v) + { + echo ''."\n"; + } + + } + + echo "\t\n"; + echo "\t\n"; + + /** + * The filenames are in the array $files + * SORT IT! + */ + natcasesort($files); + $files = array_values($files); + + for ($i=0;$ifckphp_config['ResourceAreas'][$this->type]['AllowedExtensions'])) { + + //check if$fckphp_configured not to show this file + $editable=$hide=false; + for($j=0;$jfckphp_config['ResourceAreas'][$this->type]['HideFiles']);$j++) + $hide=(preg_match("/".$this->fckphp_config['ResourceAreas'][$this->type]['HideFiles'][$j]."/",$files[$i])?true:$hide); + + if (!$hide) { + if ($this->fckphp_config['ResourceAreas'][$this->type]['AllowImageEditing']) + $editable=$this->isImageEditable($this->real_cwd."/".$files[$i]); + + if(extension_loaded('mbstring')) { + $name = mb_convert_encoding($files [$i] , 'UTF-8', mb_detect_encoding($files[$i] , 'UTF-8, windows-1251, ASCII, ISO-8859-1')); + } else { + $name = $files[$i]; + } + // $this->fckphp_config['modx']['charset'] if needed + echo "\t\treal_cwd."/".$files [$i] )/1024)."\" editable=\"" . ( $editable?"1":"0" ) . "\" />\n"; + } + + } + + } + + echo "\t\n"; + echo "\n"; + } + + + function isImageEditable($file) { + $fh=fopen($file,"r"); + if ($fh) { + $start4=fread($fh,4); + fclose($fh); + + $start3=substr($start4,0,3); + + if ($start4=="\x89PNG") { //PNG + return (function_exists("imagecreatefrompng") && function_exists("imagepng")); + + } elseif ($start3=="GIF") { //GIF + return (function_exists("imagecreatefromgif") && function_exists("imagegif")); + + } elseif ($start3=="\xFF\xD8\xFF") { //JPEG + return (function_exists("imagecreatefromjpeg")&& function_exists("imagejpeg")); + + } elseif ($start4=="hsi1") { //JPEG + return (function_exists("imagecreatefromjpeg")&& function_exists("imagejpeg")); + + } else { + return false; + } + + } else { + return false; + } + } + + +} + ?> \ No newline at end of file diff --git a/manager/media/style/common/login.tpl b/manager/media/style/common/login.tpl index 21826a3554..d5d53cd5ad 100644 --- a/manager/media/style/common/login.tpl +++ b/manager/media/style/common/login.tpl @@ -1,345 +1,345 @@ - - - - MODx CMF Manager Login - - - - - - - -
[+site_name+]MODX Evolution
-
-
- - [+OnManagerLoginFormPrerender+] -

[+login_message+]

-
- - -
-

[+login_captcha_message+]

- [+captcha_image+] - [+captcha_input+] -
- - - - [+OnManagerLoginFormRender+] -
-
-
- © 2005-2013 by MODX®, and licensed under the GPL. -
-
- - - - + + + + MODx CMF Manager Login + + + + + + + +
[+site_name+]MODX Evolution
+
+
+ + [+OnManagerLoginFormPrerender+] +

[+login_message+]

+
+ + +
+

[+login_captcha_message+]

+ [+captcha_image+] + [+captcha_input+] +
+ + + + [+OnManagerLoginFormRender+] +
+
+
+ © 2005-2013 by MODX®, and licensed under the GPL. +
+
+ + + + \ No newline at end of file From ab52e6335b3538cff4afc00a7689975d2cdef3f1 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 22 Apr 2013 22:10:08 +0900 Subject: [PATCH 006/530] Refactor #9720 Separation deprecated core functions http://tracker.modx.com/issues/9720 --- .../includes/document.parser.class.inc.php | 218 ++---------------- .../extenders/deprecated.functions.inc.php | 184 +++++++++++++++ 2 files changed, 200 insertions(+), 202 deletions(-) create mode 100644 manager/includes/extenders/deprecated.functions.inc.php diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 97ef7d0b5a..6e2bb3d847 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -68,6 +68,11 @@ function DocumentParser() { $this->error_reporting = 1; } + function __call($name,$args) { + include_once(MODX_BASE_PATH . 'manager/includes/extenders/deprecated.functions.inc.php'); + if(method_exists($this->old,$name)) return call_user_func_array(array($this->old,$name),$args); + } + // loads an extension from the extenders folder function loadExtension($extname) { global $database_type; @@ -186,45 +191,6 @@ function sendUnauthorizedPage() { exit(); } - // function to connect to the database - // - deprecated use $modx->db->connect() - function dbConnect() { - $this->db->connect(); - $this->rs= $this->db->conn; // for compatibility - } - - // function to query the database - // - deprecated use $modx->db->query() - function dbQuery($sql) { - return $this->db->query($sql); - } - - // function to count the number of rows in a record set - function recordCount($rs) { - return $this->db->getRecordCount($rs); - } - - // - deprecated, use $modx->db->getRow() - function fetchRow($rs, $mode= 'assoc') { - return $this->db->getRow($rs, $mode); - } - - // - deprecated, use $modx->db->getAffectedRows() - function affectedRows($rs) { - return $this->db->getAffectedRows($rs); - } - - // - deprecated, use $modx->db->getInsertId() - function insertId($rs) { - return $this->db->getInsertId($rs); - } - - // function to close a database connection - // - deprecated, use $modx->db->disconnect() - function dbClose() { - $this->db->disconnect(); - } - function getSettings() { if (!is_array($this->config) || empty ($this->config)) { if ($included= file_exists(MODX_BASE_PATH . 'assets/cache/siteCache.idx.php')) { @@ -672,35 +638,6 @@ function postProcess() { // end post processing } - function mergeDocumentMETATags($template) { - if ($this->documentObject['haskeywords'] == 1) { - // insert keywords - $keywords = $this->getKeywords(); - if (is_array($keywords) && count($keywords) > 0) { - $keywords = implode(", ", $keywords); - $metas= "\t\n"; - } - - // Don't process when cached - $this->documentObject['haskeywords'] = '0'; - } - if ($this->documentObject['hasmetatags'] == 1) { - // insert meta tags - $tags= $this->getMETATags(); - foreach ($tags as $n => $col) { - $tag= strtolower($col['tag']); - $tagvalue= $col['tagvalue']; - $tagstyle= $col['http_equiv'] ? 'http-equiv' : 'name'; - $metas .= "\t\n"; - } - - // Don't process when cached - $this->documentObject['hasmetatags'] = '0'; - } - if ($metas) $template = preg_replace("/()/i", "\\1\n\t" . trim($metas), $template); - return $template; - } - // mod by Raymond function mergeDocumentContent($template) { $replace= array (); @@ -1037,15 +974,6 @@ private function _get_snip_properties($snip_call) return $snippetObject; } - function makeFriendlyURL($pre, $suff, $alias, $isfolder=0) { - $Alias = explode('/',$alias); - $alias = array_pop($Alias); - $dir = implode('/', $Alias); - unset($Alias); - if($this->config['make_folders']==='1' && $isfolder==1) $suff = '/'; - return ($dir != '' ? "$dir/" : '') . $pre . $alias . $suff; - } - function rewriteUrls($documentSource) { // rewrite the urls if ($this->config['friendly_urls'] == 1) { @@ -1181,7 +1109,9 @@ function parseDocumentSource($source) { // replace HTMLSnippets in document $source= $this->mergeChunkContent($source); // insert META tags & keywords - $source= $this->mergeDocumentMETATags($source); + if(isset($this->config['show_meta']) && $this->config['show_meta']==1) { + $source= $this->mergeDocumentMETATags($source); + } // find and merge snippets $source= $this->evalSnippets($source); // find and replace Placeholders (must be parsed last) - Added by Raymond @@ -1488,12 +1418,18 @@ function logEvent($evtid, $type, $msg, $source= 'Parser') { # Returns true if parser is executed in backend (manager) mode function isBackend() { - return $this->insideManager() ? true : false; + if(defined('IN_MANAGER_MODE') && IN_MANAGER_MODE == 'true') { + return true; + } + else return false; } # Returns true if parser is executed in frontend mode function isFrontend() { - return !$this->insideManager() ? true : false; + if(defined('IN_MANAGER_MODE') && IN_MANAGER_MODE == 'true') { + return false; + } + else return true; } function getAllChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id, pagetitle, description, parent, alias, menutitle') { @@ -1792,97 +1728,6 @@ function getVersionData($data=null) { return (!is_null($data) && is_array($this->version) && isset($this->version[$data])) ? $this->version[$data] : $this->version; } - function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) { - // first find out whether the value passed is an array - if (!is_array($array)) { - return "
  • Bad list
"; - } - if (!empty ($type)) { - $typestr= " style='list-style-type: $type'"; - } else { - $typestr= ""; - } - $tabs= ""; - for ($i= 0; $i < $tablevel; $i++) { - $tabs .= "\t"; - } - $listhtml= $ordered == true ? $tabs . "
    \n" : $tabs . "
      \n"; - foreach ($array as $key => $value) { - if (is_array($value)) { - $listhtml .= $tabs . "\t
    • " . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t
      • \n"; - } else { - $listhtml .= $tabs . "\t
    • " . $value . "
      • \n"; - } - } - $listhtml .= $ordered == true ? $tabs . "
\n" : $tabs . "\n"; - return $listhtml; - } - - function userLoggedIn() { - $userdetails= array (); - if ($this->isFrontend() && isset ($_SESSION['webValidated'])) { - // web user - $userdetails['loggedIn']= true; - $userdetails['id']= $_SESSION['webInternalKey']; - $userdetails['username']= $_SESSION['webShortname']; - $userdetails['usertype']= 'web'; // added by Raymond - return $userdetails; - } else - if ($this->isBackend() && isset ($_SESSION['mgrValidated'])) { - // manager user - $userdetails['loggedIn']= true; - $userdetails['id']= $_SESSION['mgrInternalKey']; - $userdetails['username']= $_SESSION['mgrShortname']; - $userdetails['usertype']= 'manager'; // added by Raymond - return $userdetails; - } else { - return false; - } - } - - function getKeywords($id= 0) { - if ($id == 0) { - $id= $this->documentObject['id']; - } - $tblKeywords= $this->getFullTableName('site_keywords'); - $tblKeywordXref= $this->getFullTableName('keyword_xref'); - $sql= "SELECT keywords.keyword FROM " . $tblKeywords . " AS keywords INNER JOIN " . $tblKeywordXref . " AS xref ON keywords.id=xref.keyword_id WHERE xref.content_id = '$id'"; - $result= $this->db->query($sql); - $limit= $this->db->getRecordCount($result); - $keywords= array (); - if ($limit > 0) { - for ($i= 0; $i < $limit; $i++) { - $row= $this->db->getRow($result); - $keywords[]= $row['keyword']; - } - } - return $keywords; - } - - function getMETATags($id= 0) { - if ($id == 0) { - $id= $this->documentObject['id']; - } - $sql= "SELECT smt.* " . - "FROM " . $this->getFullTableName("site_metatags") . " smt " . - "INNER JOIN " . $this->getFullTableName("site_content_metatags") . " cmt ON cmt.metatag_id=smt.id " . - "WHERE cmt.content_id = '$id'"; - $ds= $this->db->query($sql); - $limit= $this->db->getRecordCount($ds); - $metatags= array (); - if ($limit > 0) { - for ($i= 0; $i < $limit; $i++) { - $row= $this->db->getRow($ds); - $metatags[$row['name']]= array ( - "tag" => $row['tag'], - "tagvalue" => $row['tagvalue'], - "http_equiv" => $row['http_equiv'] - ); - } - } - return $metatags; - } - function runSnippet($snippetName, $params= array ()) { if (isset ($this->snippetCache[$snippetName])) { $snippet= $this->snippetCache[$snippetName]; @@ -1911,11 +1756,6 @@ function getChunk($chunkName) { return $t; } - // deprecated - function putChunk($chunkName) { // alias name >.< - return $this->getChunk($chunkName); - } - function parseChunk($chunkName, $chunkArr, $prefix= "{", $suffix= "}") { if (!is_array($chunkArr)) { return false; @@ -1927,11 +1767,6 @@ function parseChunk($chunkName, $chunkArr, $prefix= "{", $suffix= "}") { return $chunk; } - function getUserData() { - include $this->config["base_path"] . "manager/includes/extenders/getUserData.extender.php"; - return $tmpArray; - } - function toDateFormat($timestamp = 0, $mode = '') { $timestamp = trim($timestamp); $timestamp = intval($timestamp); @@ -2227,21 +2062,6 @@ function sendAlert($type, $to, $from, $subject, $msg, $private= 0) { $rs= $this->db->query($sql); } - # Returns true, install or interact when inside manager - // deprecated - function insideManager() { - $m= false; - if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE == 'true') { - $m= true; - if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true') - $m= "interact"; - else - if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true') - $m= "install"; - } - return $m; - } - # Returns current user id function getLoginUserID($context= '') { if ($context && isset ($_SESSION[$context . 'Validated'])) { @@ -2351,9 +2171,6 @@ function getUserDocGroups($resolveIds= false) { return $dgn; } } - function getDocGroups() { - return $this->getUserDocGroups(); - } // deprecated # Change current web user's password - returns true if successful, oterhwise return error message function changeWebUserPassword($oldPwd, $newPwd) { @@ -2386,9 +2203,6 @@ function changeWebUserPassword($oldPwd, $newPwd) { } } } - function changePassword($o, $n) { - return changeWebUserPassword($o, $n); - } // deprecated # returns true if the current web user is a member the specified groups function isMemberOfWebGroup($groupNames= array ()) { diff --git a/manager/includes/extenders/deprecated.functions.inc.php b/manager/includes/extenders/deprecated.functions.inc.php new file mode 100644 index 0000000000..bffddfebaa --- /dev/null +++ b/manager/includes/extenders/deprecated.functions.inc.php @@ -0,0 +1,184 @@ +old = new OldFunctions(); +class OldFunctions { + + function dbConnect() {global $modx; $modx->db->connect();$modx->rs = $modx->db->conn;} + function dbQuery($sql) {global $modx;return $modx->db->query($sql);} + function recordCount($rs) {global $modx;return $modx->db->getRecordCount($rs);} + function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);} + function affectedRows($rs) {global $modx;return $modx->db->getAffectedRows($rs);} + function insertId($rs) {global $modx;return $modx->db->getInsertId($rs);} + function dbClose() {global $modx; $modx->db->disconnect();} + + function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) { + // first find out whether the value passed is an array + if (!is_array($array)) { + return "
  • Bad list
"; + } + if (!empty ($type)) { + $typestr= " style='list-style-type: $type'"; + } else { + $typestr= ""; + } + $tabs= ""; + for ($i= 0; $i < $tablevel; $i++) { + $tabs .= "\t"; + } + $listhtml= $ordered == true ? $tabs . "
    \n" : $tabs . "
      \n"; + foreach ($array as $key => $value) { + if (is_array($value)) { + $listhtml .= $tabs . "\t
    • " . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t
      • \n"; + } else { + $listhtml .= $tabs . "\t
    • " . $value . "
      • \n"; + } + } + $listhtml .= $ordered == true ? $tabs . "
\n" : $tabs . "\n"; + return $listhtml; + } + + + function getUserData() { + global $modx; + include $modx->config["base_path"] . "manager/includes/extenders/getUserData.extender.php"; + return $tmpArray; + } + + # Returns true, install or interact when inside manager + // deprecated + function insideManager() { + $m= false; + if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE == 'true') { + $m= true; + if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true') + $m= "interact"; + else + if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true') + $m= "install"; + } + return $m; + } + + // deprecated + function putChunk($chunkName) { // alias name >.< + global $modx; + return $modx->getChunk($chunkName); + } + + function getDocGroups() { + global $modx; + return $modx->getUserDocGroups(); + } // deprecated + + function changePassword($o, $n) { + return changeWebUserPassword($o, $n); + } // deprecated + + function mergeDocumentMETATags($template) { + global $modx; + if ($modx->documentObject['haskeywords'] == 1) { + // insert keywords + $keywords = $modx->getKeywords(); + if (is_array($keywords) && count($keywords) > 0) { + $keywords = implode(", ", $keywords); + $metas= "\t\n"; + } + + // Don't process when cached + $modx->documentObject['haskeywords'] = '0'; + } + if ($modx->documentObject['hasmetatags'] == 1) { + // insert meta tags + $tags= $modx->getMETATags(); + foreach ($tags as $n => $col) { + $tag= strtolower($col['tag']); + $tagvalue= $col['tagvalue']; + $tagstyle= $col['http_equiv'] ? 'http-equiv' : 'name'; + $metas .= "\t\n"; + } + + // Don't process when cached + $modx->documentObject['hasmetatags'] = '0'; + } + if ($metas) $template = preg_replace("/()/i", "\\1\n\t" . trim($metas), $template); + return $template; + } + + function getMETATags($id= 0) { + global $modx; + if ($id == 0) { + $id= $modx->documentObject['id']; + } + $sql= "SELECT smt.* " . + "FROM " . $modx->getFullTableName("site_metatags") . " smt " . + "INNER JOIN " . $modx->getFullTableName("site_content_metatags") . " cmt ON cmt.metatag_id=smt.id " . + "WHERE cmt.content_id = '$id'"; + $ds= $modx->db->query($sql); + $limit= $modx->db->getRecordCount($ds); + $metatags= array (); + if ($limit > 0) { + for ($i= 0; $i < $limit; $i++) { + $row= $modx->db->getRow($ds); + $metatags[$row['name']]= array ( + "tag" => $row['tag'], + "tagvalue" => $row['tagvalue'], + "http_equiv" => $row['http_equiv'] + ); + } + } + return $metatags; + } + + function userLoggedIn() { + global $modx; + $userdetails= array (); + if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) { + // web user + $userdetails['loggedIn']= true; + $userdetails['id']= $_SESSION['webInternalKey']; + $userdetails['username']= $_SESSION['webShortname']; + $userdetails['usertype']= 'web'; // added by Raymond + return $userdetails; + } else + if ($modx->isBackend() && isset ($_SESSION['mgrValidated'])) { + // manager user + $userdetails['loggedIn']= true; + $userdetails['id']= $_SESSION['mgrInternalKey']; + $userdetails['username']= $_SESSION['mgrShortname']; + $userdetails['usertype']= 'manager'; // added by Raymond + return $userdetails; + } else { + return false; + } + } + + function getKeywords($id= 0) { + global $modx; + if ($id == 0) { + $id= $modx->documentObject['id']; + } + $tblKeywords= $modx->getFullTableName('site_keywords'); + $tblKeywordXref= $modx->getFullTableName('keyword_xref'); + $sql= "SELECT keywords.keyword FROM " . $tblKeywords . " AS keywords INNER JOIN " . $tblKeywordXref . " AS xref ON keywords.id=xref.keyword_id WHERE xref.content_id = '$id'"; + $result= $modx->db->query($sql); + $limit= $modx->db->getRecordCount($result); + $keywords= array (); + if ($limit > 0) { + for ($i= 0; $i < $limit; $i++) { + $row= $modx->db->getRow($result); + $keywords[]= $row['keyword']; + } + } + return $keywords; + } + + function makeFriendlyURL($pre, $suff, $alias, $isfolder=0) { + global $modx; + $Alias = explode('/',$alias); + $alias = array_pop($Alias); + $dir = implode('/', $Alias); + unset($Alias); + if($modx->config['make_folders']==='1' && $isfolder==1) $suff = '/'; + return ($dir != '' ? "$dir/" : '') . $pre . $alias . $suff; + } + +} \ No newline at end of file From 1163e54dc5e6e6d7e97388d0160ac03e2fbd6670 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 22 Apr 2013 22:20:27 +0900 Subject: [PATCH 007/530] Refactor #9860 Delete Etomite database functions http://tracker.modx.com/issues/9860 --- .../includes/document.parser.class.inc.php | 184 ----------------- .../extenders/deprecated.functions.inc.php | 191 ++++++++++++++++++ 2 files changed, 191 insertions(+), 184 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 6e2bb3d847..8e64ee5400 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -2441,190 +2441,6 @@ function parseProperties($propertyString) { return $parameter; } - /*############################################ - Etomite_dbFunctions.php - New database functions for Etomite CMS - Author: Ralph A. Dahlgren - rad14701@yahoo.com - Etomite ID: rad14701 - See documentation for usage details - ############################################*/ - function getIntTableRows($fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { - // function to get rows from ANY internal database table - if ($from == "") { - return false; - } else { - $where= ($where != "") ? "WHERE $where" : ""; - $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; - $limit= ($limit != "") ? "LIMIT $limit" : ""; - $tbl= $this->getFullTableName($from); - $sql= "SELECT $fields FROM $tbl $where $sort $limit;"; - $result= $this->db->query($sql); - $resourceArray= array (); - for ($i= 0; $i < @ $this->db->getRecordCount($result); $i++) { - array_push($resourceArray, @ $this->db->getRow($result)); - } - return $resourceArray; - } - } - - function putIntTableRow($fields= "", $into= "") { - // function to put a row into ANY internal database table - if (($fields == "") || ($into == "")) { - return false; - } else { - $tbl= $this->getFullTableName($into); - $sql= "INSERT INTO $tbl SET "; - foreach ($fields as $key => $value) { - $sql .= $key . "="; - if (is_numeric($value)) - $sql .= $value . ","; - else - $sql .= "'" . $value . "',"; - } - $sql= rtrim($sql, ","); - $sql .= ";"; - $result= $this->db->query($sql); - return $result; - } - } - - function updIntTableRow($fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { - // function to update a row into ANY internal database table - if (($fields == "") || ($into == "")) { - return false; - } else { - $where= ($where != "") ? "WHERE $where" : ""; - $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; - $limit= ($limit != "") ? "LIMIT $limit" : ""; - $tbl= $this->getFullTableName($into); - $sql= "UPDATE $tbl SET "; - foreach ($fields as $key => $value) { - $sql .= $key . "="; - if (is_numeric($value)) - $sql .= $value . ","; - else - $sql .= "'" . $value . "',"; - } - $sql= rtrim($sql, ","); - $sql .= " $where $sort $limit;"; - $result= $this->db->query($sql); - return $result; - } - } - - function getExtTableRows($host= "", $user= "", $pass= "", $dbase= "", $fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { - // function to get table rows from an external MySQL database - if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($from == "")) { - return false; - } else { - $where= ($where != "") ? "WHERE $where" : ""; - $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; - $limit= ($limit != "") ? "LIMIT $limit" : ""; - $tbl= $dbase . "." . $from; - $this->dbExtConnect($host, $user, $pass, $dbase); - $sql= "SELECT $fields FROM $tbl $where $sort $limit;"; - $result= $this->db->query($sql); - $resourceArray= array (); - for ($i= 0; $i < @ $this->db->getRecordCount($result); $i++) { - array_push($resourceArray, @ $this->db->getRow($result)); - } - return $resourceArray; - } - } - - function putExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "") { - // function to put a row into an external database table - if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($fields == "") || ($into == "")) { - return false; - } else { - $this->dbExtConnect($host, $user, $pass, $dbase); - $tbl= $dbase . "." . $into; - $sql= "INSERT INTO $tbl SET "; - foreach ($fields as $key => $value) { - $sql .= $key . "="; - if (is_numeric($value)) - $sql .= $value . ","; - else - $sql .= "'" . $value . "',"; - } - $sql= rtrim($sql, ","); - $sql .= ";"; - $result= $this->db->query($sql); - return $result; - } - } - - function updExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { - // function to update a row into an external database table - if (($fields == "") || ($into == "")) { - return false; - } else { - $this->dbExtConnect($host, $user, $pass, $dbase); - $tbl= $dbase . "." . $into; - $where= ($where != "") ? "WHERE $where" : ""; - $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; - $limit= ($limit != "") ? "LIMIT $limit" : ""; - $sql= "UPDATE $tbl SET "; - foreach ($fields as $key => $value) { - $sql .= $key . "="; - if (is_numeric($value)) - $sql .= $value . ","; - else - $sql .= "'" . $value . "',"; - } - $sql= rtrim($sql, ","); - $sql .= " $where $sort $limit;"; - $result= $this->db->query($sql); - return $result; - } - } - - function dbExtConnect($host, $user, $pass, $dbase) { - // function to connect to external database - $tstart= $this->getMicroTime(); - if (@ !$this->rs= mysql_connect($host, $user, $pass)) { - $this->messageQuit("Failed to create connection to the $dbase database!"); - } else { - mysql_select_db($dbase); - $tend= $this->getMicroTime(); - $totaltime= $tend - $tstart; - if ($this->dumpSQL) { - $this->queryCode .= "
Database connection" . sprintf("Database connection to %s was created in %2.4f s", $dbase, $totaltime) . "

"; - } - $this->queryTime= $this->queryTime + $totaltime; - } - } - - function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) { - // function to retrieve form results into an associative array - $results= array (); - $method= strtoupper($method); - if ($method == "") - $method= $REQUEST_METHOD; - if ($method == "POST") - $method= & $_POST; - elseif ($method == "GET") $method= & $_GET; - else - return false; - reset($method); - foreach ($method as $key => $value) { - if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) { - if ($trim) { - $pieces= explode($prefix, $key, 2); - $key= $pieces[1]; - $results[$key]= $value; - } else - $results[$key]= $value; - } - elseif ($prefix == "") $results[$key]= $value; - } - return $results; - } - - ######################################## - // END New database functions - rad14701 - ######################################## - /***************************************************************************************/ /* End of API functions */ /***************************************************************************************/ diff --git a/manager/includes/extenders/deprecated.functions.inc.php b/manager/includes/extenders/deprecated.functions.inc.php index bffddfebaa..513eaca3fd 100644 --- a/manager/includes/extenders/deprecated.functions.inc.php +++ b/manager/includes/extenders/deprecated.functions.inc.php @@ -181,4 +181,195 @@ function makeFriendlyURL($pre, $suff, $alias, $isfolder=0) { return ($dir != '' ? "$dir/" : '') . $pre . $alias . $suff; } + /*############################################ + Etomite_dbFunctions.php + New database functions for Etomite CMS + Author: Ralph A. Dahlgren - rad14701@yahoo.com + Etomite ID: rad14701 + See documentation for usage details + ############################################*/ + function getIntTableRows($fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { + // function to get rows from ANY internal database table + global $modx; + if ($from == "") { + return false; + } else { + $where= ($where != "") ? "WHERE $where" : ""; + $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; + $limit= ($limit != "") ? "LIMIT $limit" : ""; + $tbl= $modx->getFullTableName($from); + $sql= "SELECT $fields FROM $tbl $where $sort $limit;"; + $result= $modx->db->query($sql); + $resourceArray= array (); + for ($i= 0; $i < @ $modx->db->getRecordCount($result); $i++) { + array_push($resourceArray, @ $modx->db->getRow($result)); + } + return $resourceArray; + } + } + + function putIntTableRow($fields= "", $into= "") { + // function to put a row into ANY internal database table + global $modx; + if (($fields == "") || ($into == "")) { + return false; + } else { + $tbl= $modx->getFullTableName($into); + $sql= "INSERT INTO $tbl SET "; + foreach ($fields as $key => $value) { + $sql .= $key . "="; + if (is_numeric($value)) + $sql .= $value . ","; + else + $sql .= "'" . $value . "',"; + } + $sql= rtrim($sql, ","); + $sql .= ";"; + $result= $modx->db->query($sql); + return $result; + } + } + + function updIntTableRow($fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { + // function to update a row into ANY internal database table + global $modx; + if (($fields == "") || ($into == "")) { + return false; + } else { + $where= ($where != "") ? "WHERE $where" : ""; + $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; + $limit= ($limit != "") ? "LIMIT $limit" : ""; + $tbl= $modx->getFullTableName($into); + $sql= "UPDATE $tbl SET "; + foreach ($fields as $key => $value) { + $sql .= $key . "="; + if (is_numeric($value)) + $sql .= $value . ","; + else + $sql .= "'" . $value . "',"; + } + $sql= rtrim($sql, ","); + $sql .= " $where $sort $limit;"; + $result= $modx->db->query($sql); + return $result; + } + } + + function getExtTableRows($host= "", $user= "", $pass= "", $dbase= "", $fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { + // function to get table rows from an external MySQL database + global $modx; + if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($from == "")) { + return false; + } else { + $where= ($where != "") ? "WHERE $where" : ""; + $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; + $limit= ($limit != "") ? "LIMIT $limit" : ""; + $tbl= $dbase . "." . $from; + $this->dbExtConnect($host, $user, $pass, $dbase); + $sql= "SELECT $fields FROM $tbl $where $sort $limit;"; + $result= $modx->db->query($sql); + $resourceArray= array (); + for ($i= 0; $i < @ $modx->db->getRecordCount($result); $i++) { + array_push($resourceArray, @ $modx->db->getRow($result)); + } + return $resourceArray; + } + } + + function putExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "") { + // function to put a row into an external database table + global $modx; + if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($fields == "") || ($into == "")) { + return false; + } else { + $this->dbExtConnect($host, $user, $pass, $dbase); + $tbl= $dbase . "." . $into; + $sql= "INSERT INTO $tbl SET "; + foreach ($fields as $key => $value) { + $sql .= $key . "="; + if (is_numeric($value)) + $sql .= $value . ","; + else + $sql .= "'" . $value . "',"; + } + $sql= rtrim($sql, ","); + $sql .= ";"; + $result= $modx->db->query($sql); + return $result; + } + } + + function updExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { + // function to update a row into an external database table + global $modx; + if (($fields == "") || ($into == "")) { + return false; + } else { + $this->dbExtConnect($host, $user, $pass, $dbase); + $tbl= $dbase . "." . $into; + $where= ($where != "") ? "WHERE $where" : ""; + $sort= ($sort != "") ? "ORDER BY $sort $dir" : ""; + $limit= ($limit != "") ? "LIMIT $limit" : ""; + $sql= "UPDATE $tbl SET "; + foreach ($fields as $key => $value) { + $sql .= $key . "="; + if (is_numeric($value)) + $sql .= $value . ","; + else + $sql .= "'" . $value . "',"; + } + $sql= rtrim($sql, ","); + $sql .= " $where $sort $limit;"; + $result= $modx->db->query($sql); + return $result; + } + } + + function dbExtConnect($host, $user, $pass, $dbase) { + // function to connect to external database + global $modx; + $tstart= $modx->getMicroTime(); + if (@ !$modx->rs= mysql_connect($host, $user, $pass)) { + $modx->messageQuit("Failed to create connection to the $dbase database!"); + } else { + mysql_select_db($dbase); + $tend= $modx->getMicroTime(); + $totaltime= $tend - $tstart; + if ($modx->dumpSQL) { + $modx->queryCode .= "
Database connection" . sprintf("Database connection to %s was created in %2.4f s", $dbase, $totaltime) . "

"; + } + $modx->queryTime= $modx->queryTime + $totaltime; + } + } + + function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) { + // function to retrieve form results into an associative array + global $modx; + $results= array (); + $method= strtoupper($method); + if ($method == "") + $method= $REQUEST_METHOD; + if ($method == "POST") + $method= & $_POST; + elseif ($method == "GET") $method= & $_GET; + else + return false; + reset($method); + foreach ($method as $key => $value) { + if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) { + if ($trim) { + $pieces= explode($prefix, $key, 2); + $key= $pieces[1]; + $results[$key]= $value; + } else + $results[$key]= $value; + } + elseif ($prefix == "") $results[$key]= $value; + } + return $results; + } + + ######################################## + // END New database functions - rad14701 + ######################################## } \ No newline at end of file From f3d65e979c3f0b4484872348cca755503b4a468d Mon Sep 17 00:00:00 2001 From: Thomas Jakobi Date: Mon, 22 Apr 2013 21:04:42 +0200 Subject: [PATCH 008/530] Bug #9865: Fix ManagerManager field rules The ManagerManager field rule mm_moveFieldsToTab was modified to not depend on $fieldtype. This is changed for all other field rules, too. --- .../managermanager/functions/fields.inc.php | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/assets/plugins/managermanager/functions/fields.inc.php b/assets/plugins/managermanager/functions/fields.inc.php index 51f42ca31c..94a48ba2e0 100644 --- a/assets/plugins/managermanager/functions/fields.inc.php +++ b/assets/plugins/managermanager/functions/fields.inc.php @@ -18,24 +18,26 @@ function mm_renameField($field, $newlabel, $roles='', $templates='', $newhelp='' $output = " // ----------- Rename field -------------- \n"; + $output .= '$j("select[id$=_prefix]").each( function() { $j(this).parents("tr:first").addClass("urltv"); } ); '; + switch ($field) { // Exceptions case 'keywords': - $output .= '$j("select[name*=keywords]").siblings("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; + $output .= '$j("select[name*=keywords]").siblings("span.warning").html("'.jsSafe($newlabel).'");'; break; case 'metatags': - $output .= '$j("select[name*=metatags]").siblings("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; + $output .= '$j("select[name*=metatags]").siblings("span.warning").html("'.jsSafe($newlabel).'");'; break; case 'hidemenu': case 'show_in_menu': - $output .= '$j("input[name=hidemenucheck]").siblings("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; + $output .= '$j("input[name=hidemenucheck]").siblings("span.warning").html("'.jsSafe($newlabel).'");'; break; case 'which_editor': - $output .= '$j("#which_editor").prev("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; + $output .= '$j("#which_editor").prev("span.warning").html("'.jsSafe($newlabel).'");'; break; // Ones that follow the regular pattern @@ -44,7 +46,7 @@ function mm_renameField($field, $newlabel, $roles='', $templates='', $newhelp='' if (isset($mm_fields[$field])) { $fieldtype = $mm_fields[$field]['fieldtype']; $fieldname = $mm_fields[$field]['fieldname']; - $output .= '$j("'.$fieldtype.'[name='.$fieldname.']").parents("td").prev("td").children("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; + $output .= '$j(":input[name='.$fieldname.']").parents("tr:not(.urltv)").children("td:first").children("span.warning").html("'.jsSafe($newlabel).'");'; } break; @@ -86,6 +88,8 @@ function mm_hideFields($fields, $roles='', $templates='') { $output = ''; + $output .= '$j("select[id$=_prefix]").each( function() { $j(this).parents("tr:first").addClass("urltv"); } ); '; + switch ($field) { // Exceptions @@ -130,7 +134,7 @@ function mm_hideFields($fields, $roles='', $templates='') { // Ones that follow the regular pattern default: if (isset($mm_fields[$field])) { // Check the fields exist, so we're not writing JS for elements that don't exist - $output .= '$j("'.$mm_fields[$field]['fieldtype'].'[name='.$mm_fields[$field]['fieldname'].']").parents("tr").hide().next("tr").find("td[colspan=2]").parent("tr").hide(); '; + $output .= '$j(":input[name='.$mm_fields[$field]['fieldname'].']").parents("tr:not(.urltv)").hide().next("tr").find("td[colspan=2]").parent("tr").hide(); '; } break; } // end switch @@ -168,18 +172,25 @@ function mm_changeFieldHelp($field, $helptext='', $roles='', $templates='') { // Ones that follow the regular pattern default: + $output .= '$j("select[id$=_prefix]").each( function() { $j(this).parents("tr:first").addClass("urltv"); } ); ' . "\n"; + // What type is this field? if (isset($mm_fields[$field])) { $fieldtype = $mm_fields[$field]['fieldtype']; $fieldname = $mm_fields[$field]['fieldname']; // Give the help button an ID, and modify the alt/title text - $output .= '$j("'.$fieldtype.'[name='.$fieldname.']").siblings("img[style:contains(\'cursor:help\')]").attr("id", "'.$fieldname.'-help").attr("alt", "'.jsSafe($helptext).'").attr("title", "'.jsSafe($helptext).'"); '; + $output .= 'if ($j(":input[name=' . $fieldname . ']").siblings("img[style:contains(\'cursor:help\')]").length) {' . "\n"; + $output .= '$j(":input[name=' . $fieldname . ']").siblings("img[style:contains(\'cursor:help\')]").attr("id", "' . $fieldname . '-help").attr("alt", "'.jsSafe($helptext).'").attr("title", "'.jsSafe($helptext).'"); ' . "\n"; + $output .= '} else {' . "\n"; + $output .= 'var help' . $fieldname . ' = $j("").attr("id", "' . $fieldname . '-help").addClass("tooltip").css("cursor", "help").attr("src", "media/style/' . $modx->config['manager_theme'] . '/images/icons/b02_trans.gif").attr("alt", "'.jsSafe($helptext).'").attr("title", "'.jsSafe($helptext).'");' . "\n"; + $output .= '$j(":input[name=' . $fieldname . ']").closest("tr").children("td:last").append(help' . $fieldname . ');' . "\n"; + $output .= '}' . "\n"; } else { break; } - + //alt="NEW pagetitle help" break; } // end switch From 54125da0ea931b9d9bf425b9943aa66408766f75 Mon Sep 17 00:00:00 2001 From: Peter Bowyer Date: Wed, 24 Apr 2013 12:42:43 +0100 Subject: [PATCH 009/530] Refactor parser statistics into own method, so accessible from all code --- .../includes/document.parser.class.inc.php | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 97ef7d0b5a..68d5d590ac 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -540,27 +540,18 @@ function outputContent($noEvent= false) { } } - $totalTime= ($this->getMicroTime() - $this->tstart); - $queryTime= $this->queryTime; - $phpTime= $totalTime - $queryTime; - - $queryTime= sprintf("%2.4f s", $queryTime); - $totalTime= sprintf("%2.4f s", $totalTime); - $phpTime= sprintf("%2.4f s", $phpTime); - $source= $this->documentGenerated == 1 ? "database" : "cache"; - $queries= isset ($this->executedQueries) ? $this->executedQueries : 0; - $phpMemory = (memory_get_peak_usage(true) / 1024 / 1024) . " mb"; + $stats = $this->getTimerStats($this->tstart); $out =& $this->documentOutput; if ($this->dumpSQL) { $out .= $this->queryCode; } - $out= str_replace("[^q^]", $queries, $out); - $out= str_replace("[^qt^]", $queryTime, $out); - $out= str_replace("[^p^]", $phpTime, $out); - $out= str_replace("[^t^]", $totalTime, $out); - $out= str_replace("[^s^]", $source, $out); - $out= str_replace("[^m^]", $phpMemory, $out); + $out= str_replace("[^q^]", $stats['queries'] , $out); + $out= str_replace("[^qt^]", $stats['queryTime'] , $out); + $out= str_replace("[^p^]", $stats['phpTime'] , $out); + $out= str_replace("[^t^]", $stats['totalTime'] , $out); + $out= str_replace("[^s^]", $stats['source'] , $out); + $out= str_replace("[^m^]", $stats['phpMemory'], $out); //$this->documentOutput= $out; // invoke OnWebPagePrerender event @@ -572,6 +563,23 @@ function outputContent($noEvent= false) { ob_end_flush(); } + function getTimerStats($tstart) { + $stats = array(); + + $stats['totalTime'] = ($this->getMicroTime() - $tstart); + $stats['queryTime'] = $this->queryTime; + $stats['phpTime'] = $stats['totalTime'] - $stats['queryTime']; + + $stats['queryTime'] = sprintf("%2.4f s", $stats['queryTime']); + $stats['totalTime'] = sprintf("%2.4f s", $stats['totalTime']); + $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']); + $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache"; + $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0; + $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb"; + + return $stats; + } + function checkPublishStatus() { $cacheRefreshTime= 0; @include $this->config["base_path"] . "assets/cache/sitePublishing.idx.php"; From 0516013e5f01d4e7626045534c408645ca80e2d5 Mon Sep 17 00:00:00 2001 From: Roope Date: Wed, 24 Apr 2013 17:08:26 +0300 Subject: [PATCH 010/530] Fixed 'wrong datatype' warning at install Install options page throws warning: in_array() [function.in-array]: Wrong datatype for second argument at some server setups. --- install/action.options.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/action.options.php b/install/action.options.php index 76481506c2..27d36e5644 100644 --- a/install/action.options.php +++ b/install/action.options.php @@ -158,7 +158,7 @@ if ($limit > 0) { $pluginOutput = ''; for ($i = 0; $i < $limit; $i++) { - $class = !in_array('sample', $modulePlugins[$i][8]) ? "toggle" : "toggle demo"; + $class = !in_array('sample', (array) $modulePlugins[$i][8]) ? "toggle" : "toggle demo"; $chk = in_array($i, $plugins) || (!$options_selected) ? 'checked="checked"' : ""; $pluginOutput .= "" . $_lang['install_update'] . " " . $modulePlugins[$i][0] . " - " . $modulePlugins[$i][1] . "
"; } @@ -174,7 +174,7 @@ if ($limit > 0) { $snippetOutput = ''; for ($i = 0; $i < $limit; $i++) { - $class = !in_array('sample', $moduleSnippets[$i][5]) ? "toggle" : "toggle demo"; + $class = !in_array('sample', (array) $moduleSnippets[$i][5]) ? "toggle" : "toggle demo"; $chk = in_array($i, $snippets) || (!$options_selected) ? 'checked="checked"' : ""; $snippetOutput .= "" . $_lang['install_update'] . " " . $moduleSnippets[$i][0] . " - " . $moduleSnippets[$i][1] . "
"; } From 29b19cb2a493c5d30880c44398306f14061e6f9d Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 28 Apr 2013 23:44:44 +0300 Subject: [PATCH 011/530] add php doc and manager path constant --- .../includes/document.parser.class.inc.php | 947 ++++++++++++++++-- 1 file changed, 856 insertions(+), 91 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 97ef7d0b5a..e3bb64019c 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -50,7 +50,11 @@ class DocumentParser { var $error_reporting; private $version=array(); - // constructor + /** + * Document constructor + * + * @return DocumentParser + */ function DocumentParser() { global $database_server; if(substr(PHP_OS,0,3) === 'WIN' && $database_server==='localhost') $database_server = '127.0.0.1'; @@ -68,14 +72,21 @@ function DocumentParser() { $this->error_reporting = 1; } - // loads an extension from the extenders folder + /** + * Loads an extension from the extenders folder. + * Currently of limited use - can only load the DBAPI and ManagerAPI. + * + * @global string $database_type + * @param string $extnamegetAllChildren + * @return boolean + */ function loadExtension($extname) { global $database_type; switch ($extname) { // Database API case 'DBAPI' : - if (!include_once MODX_BASE_PATH . 'manager/includes/extenders/dbapi.' . $database_type . '.class.inc.php') + if (!include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php') return false; $this->db= new DBAPI; return true; @@ -83,7 +94,7 @@ function loadExtension($extname) { // Manager API case 'ManagerAPI' : - if (!include_once MODX_BASE_PATH . 'manager/includes/extenders/manager.api.class.inc.php') + if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php') return false; $this->manager= new ManagerAPI; return true; @@ -94,11 +105,27 @@ function loadExtension($extname) { } } + /** + * Returns the current micro time + * + * @return float + */ function getMicroTime() { list ($usec, $sec)= explode(' ', microtime()); return ((float) $usec + (float) $sec); } + /** + * Redirect + * + * @global string $base_url + * @global string $site_url + * @param string $url + * @param int $count_attempts + * @param type $type + * @param type $responseCode + * @return boolean + */ function sendRedirect($url, $count_attempts= 0, $type= '', $responseCode= '') { if (empty ($url)) { return false; @@ -146,6 +173,12 @@ function sendRedirect($url, $count_attempts= 0, $type= '', $responseCode= '') { } } + /** + * Forward to another page + * + * @param int $id + * @param string $responseCode + */ function sendForward($id, $responseCode= '') { if ($this->forwards > 0) { $this->forwards= $this->forwards - 1; @@ -163,6 +196,9 @@ function sendForward($id, $responseCode= '') { } } + /** + * Redirect to the error page, by calling sendForward(). This is called for example when the page was not found. + */ function sendErrorPage() { // invoke OnPageNotFound event $this->invokeEvent('OnPageNotFound'); @@ -186,54 +222,93 @@ function sendUnauthorizedPage() { exit(); } - // function to connect to the database - // - deprecated use $modx->db->connect() + /** + * Connect to the database + * + * @deprecated use $modx->db->connect() + */ function dbConnect() { $this->db->connect(); $this->rs= $this->db->conn; // for compatibility } - // function to query the database - // - deprecated use $modx->db->query() + /** + * Query the database + * + * @deprecated use $modx->db->query() + * @param string $sql The SQL statement to execute + * @return resource|bool + */ function dbQuery($sql) { return $this->db->query($sql); } - // function to count the number of rows in a record set + /** + * Count the number of rows in a record set + * + * @deprecated use $modx->db->getRecordCount($rs) + * @param resource + * @return int + */ function recordCount($rs) { return $this->db->getRecordCount($rs); } - // - deprecated, use $modx->db->getRow() + /** + * Get a result row + * + * @deprecated use $modx->db->getRow() + * @param array $rs + * @param string $mode + * @return array + */ function fetchRow($rs, $mode= 'assoc') { return $this->db->getRow($rs, $mode); } - // - deprecated, use $modx->db->getAffectedRows() + /** + * Get the number of rows affected in the last db operation + * + * @deprecated use $modx->db->getAffectedRows() + * @param array $rs + * @return int + */ function affectedRows($rs) { return $this->db->getAffectedRows($rs); } - // - deprecated, use $modx->db->getInsertId() + /** + * Get the ID generated in the last query + * + * @deprecated use $modx->db->getInsertId() + * @param array $rs + * @return int + */ function insertId($rs) { return $this->db->getInsertId($rs); } - // function to close a database connection - // - deprecated, use $modx->db->disconnect() + /** + * Close a database connection + * + * @deprecated use $modx->db->disconnect() + */ function dbClose() { $this->db->disconnect(); } + /** + * Get MODx settings including, but not limited to, the system_settings table + */ function getSettings() { if (!is_array($this->config) || empty ($this->config)) { if ($included= file_exists(MODX_BASE_PATH . 'assets/cache/siteCache.idx.php')) { $included= include_once (MODX_BASE_PATH . 'assets/cache/siteCache.idx.php'); } if (!$included || !is_array($this->config) || empty ($this->config)) { - include_once MODX_BASE_PATH . "/manager/processors/cache_sync.class.processor.php"; + include_once MODX_MANAGER_PATH . "processors/cache_sync.class.processor.php"; $cache = new synccache(); - $cache->setCachepath(MODX_BASE_PATH . "/assets/cache/"); + $cache->setCachepath(MODX_BASE_PATH . "assets/cache/"); $cache->setReport(false); $rebuilt = $cache->buildCache($this); $included = false; @@ -255,6 +330,8 @@ function getSettings() { $this->config['base_url']= MODX_BASE_URL; $this->config['base_path']= MODX_BASE_PATH; $this->config['site_url']= MODX_SITE_URL; + $this->config['site_manager_url']=MODX_MANAGER_URL; + $this->config['site_manager_path']=MODX_MANAGER_PATH; // load user setting if user is logged in $usrSettings= array (); @@ -304,6 +381,11 @@ function getSettings() { } } + /** + * Get the method by which the current document/resource was requested + * + * @return string 'alias' (friendly url alias) or 'id' + */ function getDocumentMethod() { // function to test the query and find the retrieval method if (isset ($_REQUEST['q'])) { @@ -316,6 +398,12 @@ function getDocumentMethod() { } } + /** + * Returns the document identifier of the current request + * + * @param string $method id and alias are allowed + * @return int + */ function getDocumentIdentifier($method) { // function to test the query and find the retrieval method $docIdentifier= $this->config['site_start']; @@ -334,7 +422,11 @@ function getDocumentIdentifier($method) { return $docIdentifier; } - // check for manager login session + /** + * Check for manager login session + * + * @return boolean + */ function checkSession() { if (isset ($_SESSION['mgrValidated'])) { return true; @@ -343,6 +435,11 @@ function checkSession() { } } + /** + * Checks, if a the result is a preview + * + * @return boolean + */ function checkPreview() { if ($this->checkSession() == true) { if (isset ($_REQUEST['z']) && $_REQUEST['z'] == 'manprev') { @@ -355,7 +452,11 @@ function checkPreview() { } } - // check if site is offline + /** + * check if site is offline + * + * @return boolean + */ function checkSiteStatus() { $siteStatus= $this->config['site_status']; if ($siteStatus == 1) { @@ -371,6 +472,12 @@ function checkSiteStatus() { } } + /** + * Create a 'clean' document identifier with path information, friendly URL suffix and prefix. + * + * @param string $qOrig + * @return string + */ function cleanDocumentIdentifier($qOrig) { (!empty($qOrig)) or $qOrig = $this->config['site_start']; $q= $qOrig; @@ -413,6 +520,12 @@ function cleanDocumentIdentifier($qOrig) { } } + /** + * Check the cache for a specific document/resource + * + * @param int $id + * @return string + */ function checkCache($id) { $cacheFile= "assets/cache/docid_" . $id . ".pageCache.php"; if (file_exists($cacheFile)) { @@ -473,6 +586,16 @@ function checkCache($id) { } } + /** + * Final processing and output of the document/resource. + * + * - runs uncached snippets + * - add javascript to + * - removes unused placeholders + * - converts URL tags [~...~] to URLs + * + * @param boolean $noEvent Default: false + */ function outputContent($noEvent= false) { $this->documentOutput= $this->documentContent; @@ -572,6 +695,9 @@ function outputContent($noEvent= false) { ob_end_flush(); } + /** + * Checks the publish state of page + */ function checkPublishStatus() { $cacheRefreshTime= 0; @include $this->config["base_path"] . "assets/cache/sitePublishing.idx.php"; @@ -645,6 +771,11 @@ function checkPublishStatus() { } } + /** + * Final jobs. + * + * - cache page + */ function postProcess() { // if the current document was generated, cache it! if ($this->documentGenerated == 1 && $this->documentObject['cacheable'] == 1 && $this->documentObject['type'] == 'document' && $this->documentObject['published'] == 1) { @@ -672,6 +803,12 @@ function postProcess() { // end post processing } + /** + * Merge meta tags + * + * @param string $template + * @return string + */ function mergeDocumentMETATags($template) { if ($this->documentObject['haskeywords'] == 1) { // insert keywords @@ -701,12 +838,17 @@ function mergeDocumentMETATags($template) { return $template; } - // mod by Raymond + /** + * Merge content fields and TVs + * + * @param string $template + * @return string + */ function mergeDocumentContent($template) { $replace= array (); preg_match_all('~\[\*(.*?)\*\]~', $template, $matches); $variableCount= count($matches[1]); - $basepath= $this->config["base_path"] . "manager/includes"; + $basepath= MODX_MANAGER_PATH . "includes"; for ($i= 0; $i < $variableCount; $i++) { $key= $matches[1][$i]; $key= substr($key, 0, 1) == '#' ? substr($key, 1) : $key; // remove # for QuickEdit format @@ -725,6 +867,12 @@ function mergeDocumentContent($template) { return $template; } + /** + * Merge system settings + * + * @param string $template + * @return string + */ function mergeSettingsContent($template) { $replace= array (); $matches= array (); @@ -740,6 +888,12 @@ function mergeSettingsContent($template) { return $template; } + /** + * Merge chunks + * + * @param string $content + * @return string + */ function mergeChunkContent($content) { $replace= array (); $matches= array (); @@ -767,7 +921,12 @@ function mergeChunkContent($content) { return $content; } - // Added by Raymond + /** + * Merge placeholder values + * + * @param string $content + * @return string + */ function mergePlaceholderContent($content) { $replace= array (); $matches= array (); @@ -788,7 +947,12 @@ function mergePlaceholderContent($content) { return $content; } - // evalPlugin + /** + * Run a plugin + * + * @param string $pluginCode Code to run + * @param array $params + */ function evalPlugin($pluginCode, $params) { $etomite= $modx= & $this; $modx->event->params= & $params; // store params inside event object @@ -817,6 +981,13 @@ function evalPlugin($pluginCode, $params) { unset ($modx->event->params); } + /** + * Run a snippet + * + * @param string $snippet Code to run + * @param array $params + * @return string + */ function evalSnippet($snippet, $params) { $etomite= $modx= & $this; @@ -849,6 +1020,12 @@ function evalSnippet($snippet, $params) { return $msg . $snip; } + /** + * Run snippets as per the tags in $documentSource and replace the tags with the returned values. + * + * @param string $documentSource + * @return string + */ function evalSnippets($documentSource) { $etomite= & $this; @@ -1036,7 +1213,15 @@ private function _get_snip_properties($snip_call) } return $snippetObject; } - + + /** + * Create a friendly URL + * + * @param string $pre + * @param string $suff + * @param string $alias + * @return string + */ function makeFriendlyURL($pre, $suff, $alias, $isfolder=0) { $Alias = explode('/',$alias); $alias = array_pop($Alias); @@ -1046,6 +1231,12 @@ function makeFriendlyURL($pre, $suff, $alias, $isfolder=0) { return ($dir != '' ? "$dir/" : '') . $pre . $alias . $suff; } + /** + * Convert URL tags [~...~] to URLs + * + * @param string $documentSource + * @return string + */ function rewriteUrls($documentSource) { // rewrite the urls if ($this->config['friendly_urls'] == 1) { @@ -1073,8 +1264,11 @@ function rewriteUrls($documentSource) { } /** - * name: getDocumentObject - used by parser - * desc: returns a document object - $method: alias, id + * Get all db fields and TVs for a document/resource + * + * @param type $method + * @param type $identifier + * @return array */ function getDocumentObject($method, $identifier) { $tblsc= $this->getFullTableName("site_content"); @@ -1153,8 +1347,14 @@ function getDocumentObject($method, $identifier) { } /** - * name: parseDocumentSource - used by parser - * desc: return document source aftering parsing tvs, snippets, chunks, etc. + * Parse a source string. + * + * Handles most MODx tags. Exceptions include: + * - uncached snippet tags [!...!] + * - URL tags [~...~] + * + * @param string $source + * @return string */ function parseDocumentSource($source) { // set the number of times we are to parse the document source @@ -1199,6 +1399,14 @@ function parseDocumentSource($source) { return $source; } + /** + * Starts the parsing operations. + * + * - connects to the db + * - gets the settings (including system_settings) + * - gets the document/resource identifier as in the query string + * - finally calls prepareResponse() + */ function executeParser() { //error_reporting(0); if (version_compare(phpversion(), "5.0.0", ">=")) @@ -1294,6 +1502,15 @@ function executeParser() { $this->prepareResponse(); } + /** + * The next step called at the end of executeParser() + * + * - checks cache + * - checks if document/resource is deleted/unpublished + * - checks if resource is a weblink and redirects if so + * - gets template and parses it + * - ensures that postProcess is called when PHP is finished + */ function prepareResponse() { // we now know the method and identifier, let's check the cache $this->documentContent= $this->checkCache($this->documentIdentifier); @@ -1319,7 +1536,7 @@ function prepareResponse() { $this->sendErrorPage(); } else { // Inculde the necessary files to check document permissions - include_once ($this->config['base_path'] . '/manager/processors/user_documents_permissions.class.php'); + include_once ($this->config['site_manager_path'] . 'processors/user_documents_permissions.class.php'); $udperms= new udperms(); $udperms->user= $this->getLoginUserID(); $udperms->document= $this->documentIdentifier; @@ -1386,10 +1603,13 @@ function prepareResponse() { //$this->postProcess(); } - /***************************************************************************************/ - /* API functions / - /***************************************************************************************/ - + /** + * Returns an array of all parent record IDs for the id passed. + * + * @param int $id Docid to get parents for. + * @param int $height The maximum number of levels to go up, default 10. + * @return array + */ function getParentIds($id, $height= 10) { $parents= array (); while ( $id && $height-- ) { @@ -1403,6 +1623,14 @@ function getParentIds($id, $height= 10) { return $parents; } + /** + * Returns an array of child IDs belonging to the specified parent. + * + * @param int $id The parent resource/document to start from + * @param int $depth How many levels deep to search for children, default: 10 + * @param array $children Optional array of docids to merge with the result. + * @return array Contains the document Listing (tree) like the sitemap + */ function getChildIds($id, $depth= 10, $children= array ()) { // Initialise a static array to index parents->children @@ -1432,7 +1660,12 @@ function getChildIds($id, $depth= 10, $children= array ()) { return $children; } - # Displays a javascript alert message in the web browser + /** + * Displays a javascript alert message in the web browser + * + * @param string $msg Message to show + * @param string $url URL to redirect to + */ function webAlert($msg, $url= "") { $msg= addslashes($this->db->escape($msg)); if (substr(strtolower($url), 0, 11) == "javascript:") { @@ -1449,7 +1682,12 @@ function webAlert($msg, $url= "") { } } - # Returns true if user has the currect permission + /** + * Returns true if user has the currect permission + * + * @param string $pm Permission name + * @return int + */ function hasPermission($pm) { $state= false; $pms= $_SESSION['mgrPermissions']; @@ -1458,7 +1696,15 @@ function hasPermission($pm) { return $state; } - # Add an a alert message to the system event log + /** + * Add an a alert message to the system event log + * + * @param int $evtid Event ID + * @param int $type Types: 1 = information, 2 = warning, 3 = error + * @param string $msg Message to be logged + * @param string $source source of the event (module, snippet name, etc.) + * Default: Parser + */ function logEvent($evtid, $type, $msg, $source= 'Parser') { $msg= $this->db->escape($msg); $source= $this->db->escape($source); @@ -1486,16 +1732,35 @@ function logEvent($evtid, $type, $msg, $source= 'Parser') { } } - # Returns true if parser is executed in backend (manager) mode + /** + * Returns true if we are currently in the manager/backend + * + * @return boolean + */ function isBackend() { return $this->insideManager() ? true : false; } - # Returns true if parser is executed in frontend mode + /** + * Returns true if we are currently in the frontend + * + * @return boolean + */ function isFrontend() { return !$this->insideManager() ? true : false; } + /** + * Gets all child documents of the specified document, including those which are unpublished or deleted. + * + * @param int $id The Document identifier to start with + * @param string $sort Sort field + * Default: menuindex + * @param string $dir Sort direction, ASC and DESC is possible + * Default: ASC + * @param string $fields Default: id, pagetitle, description, parent, alias, menutitle + * @return array + */ function getAllChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id, pagetitle, description, parent, alias, menutitle') { $tblsc= $this->getFullTableName("site_content"); $tbldg= $this->getFullTableName("document_groups"); @@ -1522,6 +1787,17 @@ function getAllChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id, p return $resourceArray; } + /** + * Gets all active child documents of the specified document, i.e. those which published and not deleted. + * + * @param int $id The Document identifier to start with + * @param string $sort Sort field + * Default: menuindex + * @param string $dir Sort direction, ASC and DESC is possible + * Default: ASC + * @param string $fields Default: id, pagetitle, description, parent, alias, menutitle + * @return array + */ function getActiveChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id, pagetitle, description, parent, alias, menutitle') { $tblsc= $this->getFullTableName("site_content"); $tbldg= $this->getFullTableName("document_groups"); @@ -1549,6 +1825,27 @@ function getActiveChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id return $resourceArray; } + /** + * Returns the children of the selected document/folder. + * + * @param int $parentid The parent document identifier + * Default: 0 (site root) + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @param int $deleted Whether deleted or undeleted documents are in the result + * Default: 0 (undeleted) + * @param string $fields List of fields + * Default: * (all fields) + * @param string $where Where condition in SQL style. Should include a leading 'AND ' + * Default: Empty string + * @param type $sort Should be a comma-separated list of field names on which to sort + * Default: menuindex + * @param string $dir Sort direction, ASC and DESC is possible + * Default: ASC + * @param string|int $limit Should be a valid SQL LIMIT clause without the 'LIMIT' i.e. just include the numbers as a string. + * Default: Empty string (no limit) + * @return array + */ function getDocumentChildren($parentid= 0, $published= 1, $deleted= 0, $fields= "*", $where= '', $sort= "menuindex", $dir= "ASC", $limit= "") { $limit= ($limit != "") ? "LIMIT $limit" : ""; $tblsc= $this->getFullTableName("site_content"); @@ -1579,6 +1876,28 @@ function getDocumentChildren($parentid= 0, $published= 1, $deleted= 0, $fields= return $resourceArray; } + /** + * Returns multiple documents/resources + * + * @category API-Function + * @param array $ids Documents to fetch by docid + * Default: Empty array + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @param int $deleted Whether deleted or undeleted documents are in the result + * Default: 0 (undeleted) + * @param string $fields List of fields + * Default: * (all fields) + * @param string $where Where condition in SQL style. Should include a leading 'AND '. + * Default: Empty string + * @param type $sort Should be a comma-separated list of field names on which to sort + * Default: menuindex + * @param string $dir Sort direction, ASC and DESC is possible + * Default: ASC + * @param string|int $limit Should be a valid SQL LIMIT clause without the 'LIMIT' i.e. just include the numbers as a string. + * Default: Empty string (no limit) + * @return array|boolean Result array with documents, or false + */ function getDocuments($ids= array (), $published= 1, $deleted= 0, $fields= "*", $where= '', $sort= "menuindex", $dir= "ASC", $limit= "") { if (count($ids) == 0) { return false; @@ -1611,6 +1930,20 @@ function getDocuments($ids= array (), $published= 1, $deleted= 0, $fields= "*", } } + /** + * Returns one document/resource + * + * @category API-Function + * @param int $id docid + * Default: 0 (no documents) + * @param string $fields List of fields + * Default: * (all fields) + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @param int $deleted Whether deleted or undeleted documents are in the result + * Default: 0 (undeleted) + * @return boolean|string + */ function getDocument($id= 0, $fields= "*", $published= 1, $deleted= 0) { if ($id == 0) { return false; @@ -1625,6 +1958,19 @@ function getDocument($id= 0, $fields= "*", $published= 1, $deleted= 0) { } } + /** + * Returns the page information as database row, the type of result is + * defined with the parameter $rowMode + * + * @param int $pageid The parent document identifier + * Default: -1 (no result) + * @param int $active Should we fetch only published and undeleted documents/resources? + * 1 = yes, 0 = no + * Default: 1 + * @param string $fields List of fields + * Default: id, pagetitle, description, alias + * @return boolean|array + */ function getPageInfo($pageid= -1, $active= 1, $fields= 'id, pagetitle, description, alias') { if ($pageid == 0) { return false; @@ -1651,6 +1997,18 @@ function getPageInfo($pageid= -1, $active= 1, $fields= 'id, pagetitle, descripti } } + /** + * Returns the parent document/resource of the given docid + * + * @param int $pid The parent docid. If -1, then fetch the current document/resource's parent + * Default: -1 + * @param int $active Should we fetch only published and undeleted documents/resources? + * 1 = yes, 0 = no + * Default: 1 + * @param string $fields List of fields + * Default: id, pagetitle, description, alias + * @return boolean|array + */ function getParent($pid= -1, $active= 1, $fields= 'id, pagetitle, description, alias, parent') { if ($pid == -1) { $pid= $this->documentObject['parent']; @@ -1667,6 +2025,11 @@ function getParent($pid= -1, $active= 1, $fields= 'id, pagetitle, description, a } } + /** + * Returns the id of the current snippet. + * + * @return int + */ function getSnippetId() { if ($this->currentSnippet) { $tbl= $this->getFullTableName("site_snippets"); @@ -1678,10 +2041,20 @@ function getSnippetId() { return 0; } + /** + * Returns the name of the current snippet. + * + * @return string + */ function getSnippetName() { return $this->currentSnippet; } + /** + * Clear the cache of MODX. + * + * @return boolean + */ function clearCache() { $basepath= $this->config["base_path"] . "assets/cache"; if (@ $handle= opendir($basepath)) { @@ -1703,6 +2076,20 @@ function clearCache() { } } + /** + * Create an URL for the given document identifier. The url prefix and + * postfix are used, when friendly_url is active. + * + * @param int $id The document identifier + * @param string $alias The alias name for the document + * Default: Empty string + * @param string $args The paramaters to add to the URL + * Default: Empty string + * @param string $scheme With full as valus, the site url configuration is + * used + * Default: Empty string + * @return string + */ function makeUrl($id, $alias= '', $args= '', $scheme= '') { $url= ''; $virtualDir= ''; @@ -1769,6 +2156,13 @@ function makeUrl($id, $alias= '', $args= '', $scheme= '') { } } + /** + * Returns an entry from the config + * + * Note: most code accesses the config array directly and we will continue to support this. + * + * @return boolean|string + */ function getConfig($name= '') { if (!empty ($this->config[$name])) { return $this->config[$name]; @@ -1777,11 +2171,17 @@ function getConfig($name= '') { } } + /** + * Returns the ClipperCMS version information as version, branch, release date and full application name. + * + * @return array + */ + function getVersionData($data=null) { $out=array(); if(empty($this->version) || !is_array($this->version)){ //include for compatibility modx version < 1.0.10 - include $this->config["base_path"] . "manager/includes/version.inc.php"; + include MODX_MANAGER_PATH . "includes/version.inc.php"; $this->version=array(); $this->version['version']= isset($modx_version) ? $modx_version : ''; $this->version['branch']= isset($modx_branch) ? $modx_branch : ''; @@ -1792,6 +2192,17 @@ function getVersionData($data=null) { return (!is_null($data) && is_array($this->version) && isset($this->version[$data])) ? $this->version[$data] : $this->version; } + /** + * Returns an ordered or unordered HTML list. + * + * @param array $array + * @param string $ulroot Default: root + * @param string $ulprefix Default: sub_ + * @param string $type Default: Empty string + * @param boolean $ordered Default: false + * @param int $tablevel Default: 0 + * @return string + */ function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) { // first find out whether the value passed is an array if (!is_array($array)) { @@ -1818,6 +2229,11 @@ function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordere return $listhtml; } + /** + * Returns user login information, as loggedIn (true or false), internal key, username and usertype (web or manager). + * + * @return boolean|array + */ function userLoggedIn() { $userdetails= array (); if ($this->isFrontend() && isset ($_SESSION['webValidated'])) { @@ -1840,6 +2256,13 @@ function userLoggedIn() { } } + /** + * Returns an array with keywords for the current document, or a document with a given docid + * + * @param int $id The docid, 0 means the current document + * Default: 0 + * @return array + */ function getKeywords($id= 0) { if ($id == 0) { $id= $this->documentObject['id']; @@ -1859,6 +2282,13 @@ function getKeywords($id= 0) { return $keywords; } + /** + * Returns an array with meta tags for the current document, or a document with a given docid. + * + * @param int $id The document identifier, 0 means the current document + * Default: 0 + * @return array + */ function getMETATags($id= 0) { if ($id == 0) { $id= $this->documentObject['id']; @@ -1883,6 +2313,13 @@ function getMETATags($id= 0) { return $metatags; } + /** + * Executes a snippet. + * + * @param string $snippetName + * @param array $params Default: Empty array + * @return string + */ function runSnippet($snippetName, $params= array ()) { if (isset ($this->snippetCache[$snippetName])) { $snippet= $this->snippetCache[$snippetName]; @@ -1906,12 +2343,24 @@ function runSnippet($snippetName, $params= array ()) { return $this->evalSnippet($snippet, $parameters); } + /** + * Returns the chunk content for the given chunk name + * + * @param string $chunkName + * @return boolean|string + */ function getChunk($chunkName) { $t= $this->chunkCache[$chunkName]; return $t; } - // deprecated + /** + * Old method that just calls getChunk() + * + * @deprecated Use getChunk + * @param string $chunkName + * @return boolean|string + */ function putChunk($chunkName) { // alias name >.< return $this->getChunk($chunkName); } @@ -1927,11 +2376,24 @@ function parseChunk($chunkName, $chunkArr, $prefix= "{", $suffix= "}") { return $chunk; } + /** + * Get data from phpSniff + * + * @category API-Function + * @return array + */ function getUserData() { - include $this->config["base_path"] . "manager/includes/extenders/getUserData.extender.php"; + include MODX_MANAGER_PATH . "includes/extenders/getUserData.extender.php"; return $tmpArray; } + /** + * Returns the timestamp in the date format defined in $this->config['datetime_format'] + * + * @param int $timestamp Default: 0 + * @param string $mode Default: Empty string (adds the time as below). Can also be 'dateOnly' for no time or 'formatOnly' to get the datetime_format string. + * @return string + */ function toDateFormat($timestamp = 0, $mode = '') { $timestamp = trim($timestamp); $timestamp = intval($timestamp); @@ -1963,6 +2425,12 @@ function toDateFormat($timestamp = 0, $mode = '') { return $strTime; } + /** + * Make a timestamp from a string corresponding to the format in $this->config['datetime_format'] + * + * @param string $str + * @return string + */ function toTimeStamp($str) { $str = trim($str); if (empty($str)) {return '';} @@ -1993,10 +2461,30 @@ function toTimeStamp($str) { return $timeStamp; } - #:::::::::::::::::::::::::::::::::::::::: - # Added By: Raymond Irving - MODx - # - + /** + * Get the TVs of a document's children. Returns an array where each element represents one child doc. + * + * Ignores deleted children. Gets all children - there is no where clause available. + * + * @param int $parentid The parent docid + * Default: 0 (site root) + * @param array $tvidnames. Which TVs to fetch - Can relate to the TV ids in the db (array elements should be numeric only) + * or the TV names (array elements should be names only) + * Default: Empty array + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @param string $docsort How to sort the result array (field) + * Default: menuindex + * @param ASC $docsortdir How to sort the result array (direction) + * Default: ASC + * @param string $tvfields Fields to fetch from site_tmplvars, default '*' + * Default: * + * @param string $tvsort How to sort each element of the result array i.e. how to sort the TVs (field) + * Default: rank + * @param string $tvsortdir How to sort each element of the result array i.e. how to sort the TVs (direction) + * Default: ASC + * @return boolean|array + */ function getDocumentChildrenTVars($parentid= 0, $tvidnames= array (), $published= 1, $docsort= "menuindex", $docsortdir= "ASC", $tvfields= "*", $tvsort= "rank", $tvsortdir= "ASC") { $docs= $this->getDocumentChildren($parentid, $published, 0, '*', '', $docsort, $docsortdir); if (!$docs) @@ -2050,6 +2538,25 @@ function getDocumentChildrenTVars($parentid= 0, $tvidnames= array (), $published } } + /** + * Get the TV outputs of a document's children. + * + * Returns an array where each element represents one child doc and contains the result from getTemplateVarOutput() + * + * Ignores deleted children. Gets all children - there is no where clause available. + * + * @param int $parentid The parent docid + * Default: 0 (site root) + * @param array $tvidnames. Which TVs to fetch. In the form expected by getTemplateVarOutput(). + * Default: Empty array + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @param string $docsort How to sort the result array (field) + * Default: menuindex + * @param ASC $docsortdir How to sort the result array (direction) + * Default: ASC + * @return boolean|array + */ function getDocumentChildrenTVarOutput($parentid= 0, $tvidnames= array (), $published= 1, $docsort= "menuindex", $docsortdir= "ASC") { $docs= $this->getDocumentChildren($parentid, $published, 0, '*', '', $docsort, $docsortdir); if (!$docs) @@ -2065,8 +2572,21 @@ function getDocumentChildrenTVarOutput($parentid= 0, $tvidnames= array (), $publ } } - // Modified by Raymond for TV - Orig Modified by Apodigm - DocVars - # returns a single TV record. $idnames - can be an id or name that belongs the template that the current document is using + /** + * Modified by Raymond for TV - Orig Modified by Apodigm - DocVars + * Returns a single site_content field or TV record from the db. + * + * If a site content field the result is an associative array of 'name' and 'value'. + * + * If a TV the result is an array representing a db row including the fields specified in $fields. + * + * @param string $idname Can be a TV id or name + * @param string $fields Fields to fetch from site_tmplvars. Default: * + * @param type $docid Docid. Defaults to empty string which indicates the current document. + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @return boolean + */ function getTemplateVar($idname= "", $fields= "*", $docid= "", $published= 1) { if ($idname == "") { return false; @@ -2076,7 +2596,27 @@ function getTemplateVar($idname= "", $fields= "*", $docid= "", $published= 1) { } } - # returns an array of TV records. $idnames - can be an id or name that belongs the template that the current document is using + /** + * Returns an array of site_content field fields and/or TV records from the db + * + * Elements representing a site content field consist of an associative array of 'name' and 'value'. + * + * Elements representing a TV consist of an array representing a db row including the fields specified in $fields. + * + * @param array $idnames Which TVs to fetch - Can relate to the TV ids in the db (array elements should be numeric only) + * or the TV names (array elements should be names only) + * Default: Empty array + * @param string $fields Fields to fetch from site_tmplvars. + * Default: * + * @param string $docid Docid. Defaults to empty string which indicates the current document. + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @param string $sort How to sort the result array (field) + * Default: rank + * @param string $dir How to sort the result array (direction) + * Default: ASC + * @return boolean|array + */ function getTemplateVars($idnames= array (), $fields= "*", $docid= "", $published= 1, $sort= "rank", $dir= "ASC") { if (($idnames != '*' && !is_array($idnames)) || count($idnames) == 0) { return false; @@ -2126,7 +2666,18 @@ function getTemplateVars($idnames= array (), $fields= "*", $docid= "", $publishe } } - # returns an associative array containing TV rendered output values. $idnames - can be an id or name that belongs the template that the current document is using + /** + * Returns an associative array containing TV rendered output values. + * + * @param type $idnames Which TVs to fetch - Can relate to the TV ids in the db (array elements should be numeric only) + * or the TV names (array elements should be names only) + * Default: Empty array + * @param string $docid Docid. Defaults to empty string which indicates the current document. + * @param int $published Whether published or unpublished documents are in the result + * Default: 1 + * @param string $sep + * @return boolean|array + */ function getTemplateVarOutput($idnames= array (), $docid= "", $published= 1, $sep='') { if (count($idnames) == 0) { return false; @@ -2138,7 +2689,7 @@ function getTemplateVarOutput($idnames= array (), $docid= "", $published= 1, $se if ($result == false) return false; else { - $baspath= $this->config["base_path"] . "manager/includes"; + $baspath= MODX_MANAGER_PATH . "includes"; include_once $baspath . "/tmplvars.format.inc.php"; include_once $baspath . "/tmplvars.commands.inc.php"; for ($i= 0; $i < count($result); $i++) { @@ -2152,22 +2703,42 @@ function getTemplateVarOutput($idnames= array (), $docid= "", $published= 1, $se } } - # returns the full table name based on db settings + /** + * Returns the full table name based on db settings + * + * @param string $tbl Table name + * @return string Table name with prefix + */ function getFullTableName($tbl) { return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`"; } - # return placeholder value + /** + * Returns the placeholder value + * + * @param string $name Placeholder name + * @return string Placeholder value + */ function getPlaceholder($name) { return $this->placeholders[$name]; } - # sets a value for a placeholder + /** + * Sets a value for a placeholder + * + * @param string $name The name of the placeholder + * @param string $value The value of the placeholder + */ function setPlaceholder($name, $value) { $this->placeholders[$name]= $value; } - # set arrays or object vars as placeholders + /** + * Set placeholders en masse via an array or object. + * + * @param object|array $subject + * @param string $prefix + */ function toPlaceholders($subject, $prefix= '') { if (is_object($subject)) { $subject= get_object_vars($subject); @@ -2179,6 +2750,13 @@ function toPlaceholders($subject, $prefix= '') { } } + /** + * For use by toPlaceholders(); For setting an array or object element as placeholder. + * + * @param string $key + * @param object|array $value + * @param string $prefix + */ function toPlaceholder($key, $value, $prefix= '') { if (is_array($value) || is_object($value)) { $this->toPlaceholders($value, "{$prefix}{$key}."); @@ -2187,21 +2765,39 @@ function toPlaceholder($key, $value, $prefix= '') { } } - # returns the virtual relative path to the manager folder + /** + * Returns the manager relative URL/path with respect to the site root. + * + * @global string $base_url + * @return string The complete URL to the manager folder + */ function getManagerPath() { - global $base_url; - $pth= $base_url . 'manager/'; - return $pth; + return MODX_MANAGER_URL; } - # returns the virtual relative path to the cache folder + /** + * Returns the cache relative URL/path with respect to the site root. + * + * @global string $base_url + * @return string The complete URL to the cache folder + */ function getCachePath() { global $base_url; $pth= $base_url . 'assets/cache/'; return $pth; } - # sends a message to a user's message box + /** + * Sends a message to a user's message box. + * + * @param string $type Type of the message + * @param string $to The recipient of the message + * @param string $from The sender of the message + * @param string $subject The subject of the message + * @param string $msg The message body + * @param int $private Whether it is a private message, or not + * Default : 0 + */ function sendAlert($type, $to, $from, $subject, $msg, $private= 0) { $private= ($private) ? 1 : 0; if (!is_numeric($to)) { @@ -2227,8 +2823,12 @@ function sendAlert($type, $to, $from, $subject, $msg, $private= 0) { $rs= $this->db->query($sql); } - # Returns true, install or interact when inside manager - // deprecated + /** + * Returns true, install or interact when inside manager. + * + * @deprecated + * @return string + */ function insideManager() { $m= false; if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE == 'true') { @@ -2242,7 +2842,12 @@ function insideManager() { return $m; } - # Returns current user id + /** + * Returns current user id. + * + * @param string $context. Default is an empty string which indicates the method should automatically pick 'web (frontend) or 'mgr' (backend) + * @return string + */ function getLoginUserID($context= '') { if ($context && isset ($_SESSION[$context . 'Validated'])) { return $_SESSION[$context . 'InternalKey']; @@ -2255,7 +2860,12 @@ function getLoginUserID($context= '') { } } - # Returns current user name + /** + * Returns current user name + * + * @param string $context. Default is an empty string which indicates the method should automatically pick 'web (frontend) or 'mgr' (backend) + * @return string + */ function getLoginUserName($context= '') { if (!empty($context) && isset ($_SESSION[$context . 'Validated'])) { return $_SESSION[$context . 'Shortname']; @@ -2268,7 +2878,11 @@ function getLoginUserName($context= '') { } } - # Returns current login user type - web or manager + /** + * Returns current login user type - web or manager + * + * @return string + */ function getLoginUserType() { if ($this->isFrontend() && isset ($_SESSION['webValidated'])) { return 'web'; @@ -2280,7 +2894,12 @@ function getLoginUserType() { } } - # Returns a record for the manager user + /** + * Returns a user info record for the given manager user + * + * @param int $uid + * @return boolean|string + */ function getUserInfo($uid) { $sql= " SELECT mu.username, mu.password, mua.* @@ -2298,7 +2917,12 @@ function getUserInfo($uid) { } } - # Returns a record for the web user + /** + * Returns a record for the web user + * + * @param int $uid + * @return boolean|string + */ function getWebUserInfo($uid) { $sql= " SELECT wu.username, wu.password, wua.* @@ -2316,9 +2940,15 @@ function getWebUserInfo($uid) { } } - # Returns an array of document groups that current user is assigned to. - # This function will first return the web user doc groups when running from frontend otherwise it will return manager user's docgroup - # Set $resolveIds to true to return the document group names + /** + * Returns an array of document groups that current user is assigned to. + * This function will first return the web user doc groups when running from + * frontend otherwise it will return manager user's docgroup. + * + * @param boolean $resolveIds Set to true to return the document group names + * Default: false + * @return string|array + */ function getUserDocGroups($resolveIds= false) { if ($this->isFrontend() && isset ($_SESSION['webDocgroups']) && isset ($_SESSION['webValidated'])) { $dg= $_SESSION['webDocgroups']; @@ -2351,11 +2981,28 @@ function getUserDocGroups($resolveIds= false) { return $dgn; } } + + /** + * Returns an array of document groups that current user is assigned to. + * This function will first return the web user doc groups when running from + * frontend otherwise it will return manager user's docgroup. + * + * @deprecated + * @return string|array + */ function getDocGroups() { return $this->getUserDocGroups(); } // deprecated - # Change current web user's password - returns true if successful, oterhwise return error message + /** + * Change current web user's password + * + * @todo Make password length configurable, allow rules for passwords and translation of messages + * @param string $oldPwd + * @param string $newPwd + * @return string|boolean Returns true if successful, oterhwise return error + * message + */ function changeWebUserPassword($oldPwd, $newPwd) { $rt= false; if ($_SESSION["webValidated"] == 1) { @@ -2386,11 +3033,25 @@ function changeWebUserPassword($oldPwd, $newPwd) { } } } + + /** + * Change current web user's password + * + * @deprecated + * @param string $o + * @param string $n + * @return string|boolean + */ function changePassword($o, $n) { return changeWebUserPassword($o, $n); } // deprecated - # returns true if the current web user is a member the specified groups + /** + * Returns true if the current web user is a member the specified groups + * + * @param array $groupNames + * @return boolean + */ function isMemberOfWebGroup($groupNames= array ()) { if (!is_array($groupNames)) return false; @@ -2412,7 +3073,13 @@ function isMemberOfWebGroup($groupNames= array ()) { return false; } - # Registers Client-side CSS scripts - these scripts are loaded at inside the tag + /** + * Registers Client-side CSS scripts - these scripts are loaded at inside + * the tag + * + * @param string $src + * @param string $media Default: Empty string + */ function regClientCSS($src, $media='') { if (empty($src) || isset ($this->loadedjscripts[$src])) return ''; @@ -2427,12 +3094,24 @@ function regClientCSS($src, $media='') { } } - # Registers Startup Client-side JavaScript - these scripts are loaded at inside the tag + /** + * Registers Startup Client-side JavaScript - these scripts are loaded at inside the tag + * + * @param string $src + * @param array $options Default: 'name'=>'', 'version'=>'0', 'plaintext'=>false + */ function regClientStartupScript($src, $options= array('name'=>'', 'version'=>'0', 'plaintext'=>false)) { $this->regClientScript($src, $options, true); } - # Registers Client-side JavaScript - these scripts are loaded at the end of the page unless $startup is true + /** + * Registers Client-side JavaScript these scripts are loaded at the end of the page unless $startup is true + * + * @param string $src + * @param array $options Default: 'name'=>'', 'version'=>'0', 'plaintext'=>false + * @param boolean $startup Default: false + * @return string + */ function regClientScript($src, $options= array('name'=>'', 'version'=>'0', 'plaintext'=>false), $startup= false) { if (empty($src)) return ''; // nothing to register @@ -2496,17 +3175,31 @@ function regClientScript($src, $options= array('name'=>'', 'version'=>'0', 'plai $this->loadedjscripts[$key]['pos']= $pos; } - # Registers Client-side Startup HTML block + /** + * Returns all registered JavaScripts + * + * @return string + */ function regClientStartupHTMLBlock($html) { $this->regClientScript($html, true, true); } - # Registers Client-side HTML block + /** + * Returns all registered startup scripts + * + * @return string + */ function regClientHTMLBlock($html) { $this->regClientScript($html, true); } - # Remove unwanted html tags and snippet, settings and tags + /** + * Remove unwanted html tags and snippet, settings and tags + * + * @param string $html + * @param string $allowed Default: Empty string + * @return string + */ function stripTags($html, $allowed= "") { $t= strip_tags($html, $allowed); $t= preg_replace('~\[\*(.*?)\*\]~', "", $t); //tv @@ -2532,8 +3225,13 @@ function jsonDecode($json, $assoc = false) { $json = str_replace($masked, $unmasked, $json); return json_decode($json, $assoc); } - - # add an event listner to a plugin - only for use within the current execution cycle + /** + * Add an event listner to a plugin - only for use within the current execution cycle + * + * @param string $evtName + * @param string $pluginName + * @return boolean|int + */ function addEventListener($evtName, $pluginName) { if (!$evtName || !$pluginName) return false; @@ -2542,20 +3240,33 @@ function addEventListener($evtName, $pluginName) { return array_push($this->pluginEvent[$evtName], $pluginName); // return array count } - # remove event listner - only for use within the current execution cycle + /** + * Remove event listner - only for use within the current execution cycle + * + * @param string $evtName + * @return boolean + */ function removeEventListener($evtName) { if (!$evtName) return false; unset ($this->pluginEvent[$evtName]); } - # remove all event listners - only for use within the current execution cycle + /** + * Remove all event listners - only for use within the current execution cycle + */ function removeAllEventListener() { unset ($this->pluginEvent); $this->pluginEvent= array (); } - # invoke an event. $extParams - hash array: name=>value + /** + * Invoke an event. + * + * @param string $evtName + * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value. + * @return boolean|array + */ function invokeEvent($evtName, $extParams= array ()) { if (!$evtName) return false; @@ -2607,7 +3318,12 @@ function invokeEvent($evtName, $extParams= array ()) { return $results; } - # parses a resource property string and returns the result as an array + /** + * Parses a resource property string and returns the result as an array + * + * @param string $propertyString + * @return array Associative array in the form property name => property value + */ function parseProperties($propertyString) { $parameter= array (); if (!empty ($propertyString)) { @@ -2634,6 +3350,10 @@ function parseProperties($propertyString) { Etomite ID: rad14701 See documentation for usage details ############################################*/ + + /** + * @depracted Etomite db method + */ function getIntTableRows($fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to get rows from ANY internal database table if ($from == "") { @@ -2653,6 +3373,9 @@ function getIntTableRows($fields= "*", $from= "", $where= "", $sort= "", $dir= " } } + /** + * @depracted Etomite db method + */ function putIntTableRow($fields= "", $into= "") { // function to put a row into ANY internal database table if (($fields == "") || ($into == "")) { @@ -2674,6 +3397,9 @@ function putIntTableRow($fields= "", $into= "") { } } + /** + * @depracted Etomite db method + */ function updIntTableRow($fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to update a row into ANY internal database table if (($fields == "") || ($into == "")) { @@ -2698,6 +3424,9 @@ function updIntTableRow($fields= "", $into= "", $where= "", $sort= "", $dir= "AS } } + /** + * @depracted Etomite db method + */ function getExtTableRows($host= "", $user= "", $pass= "", $dbase= "", $fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to get table rows from an external MySQL database if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($from == "")) { @@ -2718,6 +3447,9 @@ function getExtTableRows($host= "", $user= "", $pass= "", $dbase= "", $fields= " } } + /** + * @depracted Etomite db method + */ function putExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "") { // function to put a row into an external database table if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($fields == "") || ($into == "")) { @@ -2740,6 +3472,9 @@ function putExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "" } } + /** + * @depracted Etomite db method + */ function updExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to update a row into an external database table if (($fields == "") || ($into == "")) { @@ -2765,6 +3500,9 @@ function updExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "" } } + /** + * @depracted Etomite db method + */ function dbExtConnect($host, $user, $pass, $dbase) { // function to connect to external database $tstart= $this->getMicroTime(); @@ -2781,6 +3519,9 @@ function dbExtConnect($host, $user, $pass, $dbase) { } } + /** + * @depracted Etomite db method + */ function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) { // function to retrieve form results into an associative array $results= array (); @@ -2811,10 +3552,20 @@ function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) { // END New database functions - rad14701 ######################################## - /***************************************************************************************/ - /* End of API functions */ - /***************************************************************************************/ - + /** + * PHP error handler set by http://www.php.net/manual/en/function.set-error-handler.php + * + * Checks the PHP error and calls messageQuit() unless: + * - error_reporting() returns 0, or + * - the PHP error level is 0, or + * - the PHP error level is 8 (E_NOTICE) and stopOnNotice is false + * + * @param int $nr The PHP error level as per http://www.php.net/manual/en/errorfunc.constants.php + * @param string $text Error message + * @param string $file File where the error was detected + * @param string $line Line number within $file + * @return boolean + */ function phpError($nr, $text, $file, $line) { if (error_reporting() == 0 || $nr == 0) { return true; @@ -3030,7 +3781,7 @@ function messageQuit($msg= 'unspecified error', $query= '', $is_error= true, $nr { echo 'MODX Content Manager ' . $version . ' » ' . $release_date . ' - + ' . $str . ''; @@ -3114,7 +3865,9 @@ function nicesize($size) { } -// SystemEvent Class +/** + * System Event Class + */ class SystemEvent { var $name; var $_propagate; @@ -3127,7 +3880,12 @@ function SystemEvent($name= "") { $this->name= $name; } - // used for displaying a message to the user + /** + * Display a message to the user + * + * @global array $SystemAlertMsgQueque + * @param string $msg The message + */ function alert($msg) { global $SystemAlertMsgQueque; if ($msg == "") @@ -3139,11 +3897,18 @@ function alert($msg) { } } - // used for rendering an out on the screen + /** + * Output + * + * @param string $msg + */ function output($msg) { $this->_output .= $msg; } + /** + * Stop event propogation + */ function stopPropagation() { $this->_propagate= false; } From 0116b5a17c6c6387df33e291561b03dccd45a51b Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 28 Apr 2013 23:46:26 +0300 Subject: [PATCH 012/530] Revert "add php doc and manager path constant" This reverts commit 29b19cb2a493c5d30880c44398306f14061e6f9d. --- .../includes/document.parser.class.inc.php | 947 ++---------------- 1 file changed, 91 insertions(+), 856 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index e3bb64019c..97ef7d0b5a 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -50,11 +50,7 @@ class DocumentParser { var $error_reporting; private $version=array(); - /** - * Document constructor - * - * @return DocumentParser - */ + // constructor function DocumentParser() { global $database_server; if(substr(PHP_OS,0,3) === 'WIN' && $database_server==='localhost') $database_server = '127.0.0.1'; @@ -72,21 +68,14 @@ function DocumentParser() { $this->error_reporting = 1; } - /** - * Loads an extension from the extenders folder. - * Currently of limited use - can only load the DBAPI and ManagerAPI. - * - * @global string $database_type - * @param string $extnamegetAllChildren - * @return boolean - */ + // loads an extension from the extenders folder function loadExtension($extname) { global $database_type; switch ($extname) { // Database API case 'DBAPI' : - if (!include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php') + if (!include_once MODX_BASE_PATH . 'manager/includes/extenders/dbapi.' . $database_type . '.class.inc.php') return false; $this->db= new DBAPI; return true; @@ -94,7 +83,7 @@ function loadExtension($extname) { // Manager API case 'ManagerAPI' : - if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php') + if (!include_once MODX_BASE_PATH . 'manager/includes/extenders/manager.api.class.inc.php') return false; $this->manager= new ManagerAPI; return true; @@ -105,27 +94,11 @@ function loadExtension($extname) { } } - /** - * Returns the current micro time - * - * @return float - */ function getMicroTime() { list ($usec, $sec)= explode(' ', microtime()); return ((float) $usec + (float) $sec); } - /** - * Redirect - * - * @global string $base_url - * @global string $site_url - * @param string $url - * @param int $count_attempts - * @param type $type - * @param type $responseCode - * @return boolean - */ function sendRedirect($url, $count_attempts= 0, $type= '', $responseCode= '') { if (empty ($url)) { return false; @@ -173,12 +146,6 @@ function sendRedirect($url, $count_attempts= 0, $type= '', $responseCode= '') { } } - /** - * Forward to another page - * - * @param int $id - * @param string $responseCode - */ function sendForward($id, $responseCode= '') { if ($this->forwards > 0) { $this->forwards= $this->forwards - 1; @@ -196,9 +163,6 @@ function sendForward($id, $responseCode= '') { } } - /** - * Redirect to the error page, by calling sendForward(). This is called for example when the page was not found. - */ function sendErrorPage() { // invoke OnPageNotFound event $this->invokeEvent('OnPageNotFound'); @@ -222,93 +186,54 @@ function sendUnauthorizedPage() { exit(); } - /** - * Connect to the database - * - * @deprecated use $modx->db->connect() - */ + // function to connect to the database + // - deprecated use $modx->db->connect() function dbConnect() { $this->db->connect(); $this->rs= $this->db->conn; // for compatibility } - /** - * Query the database - * - * @deprecated use $modx->db->query() - * @param string $sql The SQL statement to execute - * @return resource|bool - */ + // function to query the database + // - deprecated use $modx->db->query() function dbQuery($sql) { return $this->db->query($sql); } - /** - * Count the number of rows in a record set - * - * @deprecated use $modx->db->getRecordCount($rs) - * @param resource - * @return int - */ + // function to count the number of rows in a record set function recordCount($rs) { return $this->db->getRecordCount($rs); } - /** - * Get a result row - * - * @deprecated use $modx->db->getRow() - * @param array $rs - * @param string $mode - * @return array - */ + // - deprecated, use $modx->db->getRow() function fetchRow($rs, $mode= 'assoc') { return $this->db->getRow($rs, $mode); } - /** - * Get the number of rows affected in the last db operation - * - * @deprecated use $modx->db->getAffectedRows() - * @param array $rs - * @return int - */ + // - deprecated, use $modx->db->getAffectedRows() function affectedRows($rs) { return $this->db->getAffectedRows($rs); } - /** - * Get the ID generated in the last query - * - * @deprecated use $modx->db->getInsertId() - * @param array $rs - * @return int - */ + // - deprecated, use $modx->db->getInsertId() function insertId($rs) { return $this->db->getInsertId($rs); } - /** - * Close a database connection - * - * @deprecated use $modx->db->disconnect() - */ + // function to close a database connection + // - deprecated, use $modx->db->disconnect() function dbClose() { $this->db->disconnect(); } - /** - * Get MODx settings including, but not limited to, the system_settings table - */ function getSettings() { if (!is_array($this->config) || empty ($this->config)) { if ($included= file_exists(MODX_BASE_PATH . 'assets/cache/siteCache.idx.php')) { $included= include_once (MODX_BASE_PATH . 'assets/cache/siteCache.idx.php'); } if (!$included || !is_array($this->config) || empty ($this->config)) { - include_once MODX_MANAGER_PATH . "processors/cache_sync.class.processor.php"; + include_once MODX_BASE_PATH . "/manager/processors/cache_sync.class.processor.php"; $cache = new synccache(); - $cache->setCachepath(MODX_BASE_PATH . "assets/cache/"); + $cache->setCachepath(MODX_BASE_PATH . "/assets/cache/"); $cache->setReport(false); $rebuilt = $cache->buildCache($this); $included = false; @@ -330,8 +255,6 @@ function getSettings() { $this->config['base_url']= MODX_BASE_URL; $this->config['base_path']= MODX_BASE_PATH; $this->config['site_url']= MODX_SITE_URL; - $this->config['site_manager_url']=MODX_MANAGER_URL; - $this->config['site_manager_path']=MODX_MANAGER_PATH; // load user setting if user is logged in $usrSettings= array (); @@ -381,11 +304,6 @@ function getSettings() { } } - /** - * Get the method by which the current document/resource was requested - * - * @return string 'alias' (friendly url alias) or 'id' - */ function getDocumentMethod() { // function to test the query and find the retrieval method if (isset ($_REQUEST['q'])) { @@ -398,12 +316,6 @@ function getDocumentMethod() { } } - /** - * Returns the document identifier of the current request - * - * @param string $method id and alias are allowed - * @return int - */ function getDocumentIdentifier($method) { // function to test the query and find the retrieval method $docIdentifier= $this->config['site_start']; @@ -422,11 +334,7 @@ function getDocumentIdentifier($method) { return $docIdentifier; } - /** - * Check for manager login session - * - * @return boolean - */ + // check for manager login session function checkSession() { if (isset ($_SESSION['mgrValidated'])) { return true; @@ -435,11 +343,6 @@ function checkSession() { } } - /** - * Checks, if a the result is a preview - * - * @return boolean - */ function checkPreview() { if ($this->checkSession() == true) { if (isset ($_REQUEST['z']) && $_REQUEST['z'] == 'manprev') { @@ -452,11 +355,7 @@ function checkPreview() { } } - /** - * check if site is offline - * - * @return boolean - */ + // check if site is offline function checkSiteStatus() { $siteStatus= $this->config['site_status']; if ($siteStatus == 1) { @@ -472,12 +371,6 @@ function checkSiteStatus() { } } - /** - * Create a 'clean' document identifier with path information, friendly URL suffix and prefix. - * - * @param string $qOrig - * @return string - */ function cleanDocumentIdentifier($qOrig) { (!empty($qOrig)) or $qOrig = $this->config['site_start']; $q= $qOrig; @@ -520,12 +413,6 @@ function cleanDocumentIdentifier($qOrig) { } } - /** - * Check the cache for a specific document/resource - * - * @param int $id - * @return string - */ function checkCache($id) { $cacheFile= "assets/cache/docid_" . $id . ".pageCache.php"; if (file_exists($cacheFile)) { @@ -586,16 +473,6 @@ function checkCache($id) { } } - /** - * Final processing and output of the document/resource. - * - * - runs uncached snippets - * - add javascript to - * - removes unused placeholders - * - converts URL tags [~...~] to URLs - * - * @param boolean $noEvent Default: false - */ function outputContent($noEvent= false) { $this->documentOutput= $this->documentContent; @@ -695,9 +572,6 @@ function outputContent($noEvent= false) { ob_end_flush(); } - /** - * Checks the publish state of page - */ function checkPublishStatus() { $cacheRefreshTime= 0; @include $this->config["base_path"] . "assets/cache/sitePublishing.idx.php"; @@ -771,11 +645,6 @@ function checkPublishStatus() { } } - /** - * Final jobs. - * - * - cache page - */ function postProcess() { // if the current document was generated, cache it! if ($this->documentGenerated == 1 && $this->documentObject['cacheable'] == 1 && $this->documentObject['type'] == 'document' && $this->documentObject['published'] == 1) { @@ -803,12 +672,6 @@ function postProcess() { // end post processing } - /** - * Merge meta tags - * - * @param string $template - * @return string - */ function mergeDocumentMETATags($template) { if ($this->documentObject['haskeywords'] == 1) { // insert keywords @@ -838,17 +701,12 @@ function mergeDocumentMETATags($template) { return $template; } - /** - * Merge content fields and TVs - * - * @param string $template - * @return string - */ + // mod by Raymond function mergeDocumentContent($template) { $replace= array (); preg_match_all('~\[\*(.*?)\*\]~', $template, $matches); $variableCount= count($matches[1]); - $basepath= MODX_MANAGER_PATH . "includes"; + $basepath= $this->config["base_path"] . "manager/includes"; for ($i= 0; $i < $variableCount; $i++) { $key= $matches[1][$i]; $key= substr($key, 0, 1) == '#' ? substr($key, 1) : $key; // remove # for QuickEdit format @@ -867,12 +725,6 @@ function mergeDocumentContent($template) { return $template; } - /** - * Merge system settings - * - * @param string $template - * @return string - */ function mergeSettingsContent($template) { $replace= array (); $matches= array (); @@ -888,12 +740,6 @@ function mergeSettingsContent($template) { return $template; } - /** - * Merge chunks - * - * @param string $content - * @return string - */ function mergeChunkContent($content) { $replace= array (); $matches= array (); @@ -921,12 +767,7 @@ function mergeChunkContent($content) { return $content; } - /** - * Merge placeholder values - * - * @param string $content - * @return string - */ + // Added by Raymond function mergePlaceholderContent($content) { $replace= array (); $matches= array (); @@ -947,12 +788,7 @@ function mergePlaceholderContent($content) { return $content; } - /** - * Run a plugin - * - * @param string $pluginCode Code to run - * @param array $params - */ + // evalPlugin function evalPlugin($pluginCode, $params) { $etomite= $modx= & $this; $modx->event->params= & $params; // store params inside event object @@ -981,13 +817,6 @@ function evalPlugin($pluginCode, $params) { unset ($modx->event->params); } - /** - * Run a snippet - * - * @param string $snippet Code to run - * @param array $params - * @return string - */ function evalSnippet($snippet, $params) { $etomite= $modx= & $this; @@ -1020,12 +849,6 @@ function evalSnippet($snippet, $params) { return $msg . $snip; } - /** - * Run snippets as per the tags in $documentSource and replace the tags with the returned values. - * - * @param string $documentSource - * @return string - */ function evalSnippets($documentSource) { $etomite= & $this; @@ -1213,15 +1036,7 @@ private function _get_snip_properties($snip_call) } return $snippetObject; } - - /** - * Create a friendly URL - * - * @param string $pre - * @param string $suff - * @param string $alias - * @return string - */ + function makeFriendlyURL($pre, $suff, $alias, $isfolder=0) { $Alias = explode('/',$alias); $alias = array_pop($Alias); @@ -1231,12 +1046,6 @@ function makeFriendlyURL($pre, $suff, $alias, $isfolder=0) { return ($dir != '' ? "$dir/" : '') . $pre . $alias . $suff; } - /** - * Convert URL tags [~...~] to URLs - * - * @param string $documentSource - * @return string - */ function rewriteUrls($documentSource) { // rewrite the urls if ($this->config['friendly_urls'] == 1) { @@ -1264,11 +1073,8 @@ function rewriteUrls($documentSource) { } /** - * Get all db fields and TVs for a document/resource - * - * @param type $method - * @param type $identifier - * @return array + * name: getDocumentObject - used by parser + * desc: returns a document object - $method: alias, id */ function getDocumentObject($method, $identifier) { $tblsc= $this->getFullTableName("site_content"); @@ -1347,14 +1153,8 @@ function getDocumentObject($method, $identifier) { } /** - * Parse a source string. - * - * Handles most MODx tags. Exceptions include: - * - uncached snippet tags [!...!] - * - URL tags [~...~] - * - * @param string $source - * @return string + * name: parseDocumentSource - used by parser + * desc: return document source aftering parsing tvs, snippets, chunks, etc. */ function parseDocumentSource($source) { // set the number of times we are to parse the document source @@ -1399,14 +1199,6 @@ function parseDocumentSource($source) { return $source; } - /** - * Starts the parsing operations. - * - * - connects to the db - * - gets the settings (including system_settings) - * - gets the document/resource identifier as in the query string - * - finally calls prepareResponse() - */ function executeParser() { //error_reporting(0); if (version_compare(phpversion(), "5.0.0", ">=")) @@ -1502,15 +1294,6 @@ function executeParser() { $this->prepareResponse(); } - /** - * The next step called at the end of executeParser() - * - * - checks cache - * - checks if document/resource is deleted/unpublished - * - checks if resource is a weblink and redirects if so - * - gets template and parses it - * - ensures that postProcess is called when PHP is finished - */ function prepareResponse() { // we now know the method and identifier, let's check the cache $this->documentContent= $this->checkCache($this->documentIdentifier); @@ -1536,7 +1319,7 @@ function prepareResponse() { $this->sendErrorPage(); } else { // Inculde the necessary files to check document permissions - include_once ($this->config['site_manager_path'] . 'processors/user_documents_permissions.class.php'); + include_once ($this->config['base_path'] . '/manager/processors/user_documents_permissions.class.php'); $udperms= new udperms(); $udperms->user= $this->getLoginUserID(); $udperms->document= $this->documentIdentifier; @@ -1603,13 +1386,10 @@ function prepareResponse() { //$this->postProcess(); } - /** - * Returns an array of all parent record IDs for the id passed. - * - * @param int $id Docid to get parents for. - * @param int $height The maximum number of levels to go up, default 10. - * @return array - */ + /***************************************************************************************/ + /* API functions / + /***************************************************************************************/ + function getParentIds($id, $height= 10) { $parents= array (); while ( $id && $height-- ) { @@ -1623,14 +1403,6 @@ function getParentIds($id, $height= 10) { return $parents; } - /** - * Returns an array of child IDs belonging to the specified parent. - * - * @param int $id The parent resource/document to start from - * @param int $depth How many levels deep to search for children, default: 10 - * @param array $children Optional array of docids to merge with the result. - * @return array Contains the document Listing (tree) like the sitemap - */ function getChildIds($id, $depth= 10, $children= array ()) { // Initialise a static array to index parents->children @@ -1660,12 +1432,7 @@ function getChildIds($id, $depth= 10, $children= array ()) { return $children; } - /** - * Displays a javascript alert message in the web browser - * - * @param string $msg Message to show - * @param string $url URL to redirect to - */ + # Displays a javascript alert message in the web browser function webAlert($msg, $url= "") { $msg= addslashes($this->db->escape($msg)); if (substr(strtolower($url), 0, 11) == "javascript:") { @@ -1682,12 +1449,7 @@ function webAlert($msg, $url= "") { } } - /** - * Returns true if user has the currect permission - * - * @param string $pm Permission name - * @return int - */ + # Returns true if user has the currect permission function hasPermission($pm) { $state= false; $pms= $_SESSION['mgrPermissions']; @@ -1696,15 +1458,7 @@ function hasPermission($pm) { return $state; } - /** - * Add an a alert message to the system event log - * - * @param int $evtid Event ID - * @param int $type Types: 1 = information, 2 = warning, 3 = error - * @param string $msg Message to be logged - * @param string $source source of the event (module, snippet name, etc.) - * Default: Parser - */ + # Add an a alert message to the system event log function logEvent($evtid, $type, $msg, $source= 'Parser') { $msg= $this->db->escape($msg); $source= $this->db->escape($source); @@ -1732,35 +1486,16 @@ function logEvent($evtid, $type, $msg, $source= 'Parser') { } } - /** - * Returns true if we are currently in the manager/backend - * - * @return boolean - */ + # Returns true if parser is executed in backend (manager) mode function isBackend() { return $this->insideManager() ? true : false; } - /** - * Returns true if we are currently in the frontend - * - * @return boolean - */ + # Returns true if parser is executed in frontend mode function isFrontend() { return !$this->insideManager() ? true : false; } - /** - * Gets all child documents of the specified document, including those which are unpublished or deleted. - * - * @param int $id The Document identifier to start with - * @param string $sort Sort field - * Default: menuindex - * @param string $dir Sort direction, ASC and DESC is possible - * Default: ASC - * @param string $fields Default: id, pagetitle, description, parent, alias, menutitle - * @return array - */ function getAllChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id, pagetitle, description, parent, alias, menutitle') { $tblsc= $this->getFullTableName("site_content"); $tbldg= $this->getFullTableName("document_groups"); @@ -1787,17 +1522,6 @@ function getAllChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id, p return $resourceArray; } - /** - * Gets all active child documents of the specified document, i.e. those which published and not deleted. - * - * @param int $id The Document identifier to start with - * @param string $sort Sort field - * Default: menuindex - * @param string $dir Sort direction, ASC and DESC is possible - * Default: ASC - * @param string $fields Default: id, pagetitle, description, parent, alias, menutitle - * @return array - */ function getActiveChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id, pagetitle, description, parent, alias, menutitle') { $tblsc= $this->getFullTableName("site_content"); $tbldg= $this->getFullTableName("document_groups"); @@ -1825,27 +1549,6 @@ function getActiveChildren($id= 0, $sort= 'menuindex', $dir= 'ASC', $fields= 'id return $resourceArray; } - /** - * Returns the children of the selected document/folder. - * - * @param int $parentid The parent document identifier - * Default: 0 (site root) - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @param int $deleted Whether deleted or undeleted documents are in the result - * Default: 0 (undeleted) - * @param string $fields List of fields - * Default: * (all fields) - * @param string $where Where condition in SQL style. Should include a leading 'AND ' - * Default: Empty string - * @param type $sort Should be a comma-separated list of field names on which to sort - * Default: menuindex - * @param string $dir Sort direction, ASC and DESC is possible - * Default: ASC - * @param string|int $limit Should be a valid SQL LIMIT clause without the 'LIMIT' i.e. just include the numbers as a string. - * Default: Empty string (no limit) - * @return array - */ function getDocumentChildren($parentid= 0, $published= 1, $deleted= 0, $fields= "*", $where= '', $sort= "menuindex", $dir= "ASC", $limit= "") { $limit= ($limit != "") ? "LIMIT $limit" : ""; $tblsc= $this->getFullTableName("site_content"); @@ -1876,28 +1579,6 @@ function getDocumentChildren($parentid= 0, $published= 1, $deleted= 0, $fields= return $resourceArray; } - /** - * Returns multiple documents/resources - * - * @category API-Function - * @param array $ids Documents to fetch by docid - * Default: Empty array - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @param int $deleted Whether deleted or undeleted documents are in the result - * Default: 0 (undeleted) - * @param string $fields List of fields - * Default: * (all fields) - * @param string $where Where condition in SQL style. Should include a leading 'AND '. - * Default: Empty string - * @param type $sort Should be a comma-separated list of field names on which to sort - * Default: menuindex - * @param string $dir Sort direction, ASC and DESC is possible - * Default: ASC - * @param string|int $limit Should be a valid SQL LIMIT clause without the 'LIMIT' i.e. just include the numbers as a string. - * Default: Empty string (no limit) - * @return array|boolean Result array with documents, or false - */ function getDocuments($ids= array (), $published= 1, $deleted= 0, $fields= "*", $where= '', $sort= "menuindex", $dir= "ASC", $limit= "") { if (count($ids) == 0) { return false; @@ -1930,20 +1611,6 @@ function getDocuments($ids= array (), $published= 1, $deleted= 0, $fields= "*", } } - /** - * Returns one document/resource - * - * @category API-Function - * @param int $id docid - * Default: 0 (no documents) - * @param string $fields List of fields - * Default: * (all fields) - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @param int $deleted Whether deleted or undeleted documents are in the result - * Default: 0 (undeleted) - * @return boolean|string - */ function getDocument($id= 0, $fields= "*", $published= 1, $deleted= 0) { if ($id == 0) { return false; @@ -1958,19 +1625,6 @@ function getDocument($id= 0, $fields= "*", $published= 1, $deleted= 0) { } } - /** - * Returns the page information as database row, the type of result is - * defined with the parameter $rowMode - * - * @param int $pageid The parent document identifier - * Default: -1 (no result) - * @param int $active Should we fetch only published and undeleted documents/resources? - * 1 = yes, 0 = no - * Default: 1 - * @param string $fields List of fields - * Default: id, pagetitle, description, alias - * @return boolean|array - */ function getPageInfo($pageid= -1, $active= 1, $fields= 'id, pagetitle, description, alias') { if ($pageid == 0) { return false; @@ -1997,18 +1651,6 @@ function getPageInfo($pageid= -1, $active= 1, $fields= 'id, pagetitle, descripti } } - /** - * Returns the parent document/resource of the given docid - * - * @param int $pid The parent docid. If -1, then fetch the current document/resource's parent - * Default: -1 - * @param int $active Should we fetch only published and undeleted documents/resources? - * 1 = yes, 0 = no - * Default: 1 - * @param string $fields List of fields - * Default: id, pagetitle, description, alias - * @return boolean|array - */ function getParent($pid= -1, $active= 1, $fields= 'id, pagetitle, description, alias, parent') { if ($pid == -1) { $pid= $this->documentObject['parent']; @@ -2025,11 +1667,6 @@ function getParent($pid= -1, $active= 1, $fields= 'id, pagetitle, description, a } } - /** - * Returns the id of the current snippet. - * - * @return int - */ function getSnippetId() { if ($this->currentSnippet) { $tbl= $this->getFullTableName("site_snippets"); @@ -2041,20 +1678,10 @@ function getSnippetId() { return 0; } - /** - * Returns the name of the current snippet. - * - * @return string - */ function getSnippetName() { return $this->currentSnippet; } - /** - * Clear the cache of MODX. - * - * @return boolean - */ function clearCache() { $basepath= $this->config["base_path"] . "assets/cache"; if (@ $handle= opendir($basepath)) { @@ -2076,20 +1703,6 @@ function clearCache() { } } - /** - * Create an URL for the given document identifier. The url prefix and - * postfix are used, when friendly_url is active. - * - * @param int $id The document identifier - * @param string $alias The alias name for the document - * Default: Empty string - * @param string $args The paramaters to add to the URL - * Default: Empty string - * @param string $scheme With full as valus, the site url configuration is - * used - * Default: Empty string - * @return string - */ function makeUrl($id, $alias= '', $args= '', $scheme= '') { $url= ''; $virtualDir= ''; @@ -2156,13 +1769,6 @@ function makeUrl($id, $alias= '', $args= '', $scheme= '') { } } - /** - * Returns an entry from the config - * - * Note: most code accesses the config array directly and we will continue to support this. - * - * @return boolean|string - */ function getConfig($name= '') { if (!empty ($this->config[$name])) { return $this->config[$name]; @@ -2171,17 +1777,11 @@ function getConfig($name= '') { } } - /** - * Returns the ClipperCMS version information as version, branch, release date and full application name. - * - * @return array - */ - function getVersionData($data=null) { $out=array(); if(empty($this->version) || !is_array($this->version)){ //include for compatibility modx version < 1.0.10 - include MODX_MANAGER_PATH . "includes/version.inc.php"; + include $this->config["base_path"] . "manager/includes/version.inc.php"; $this->version=array(); $this->version['version']= isset($modx_version) ? $modx_version : ''; $this->version['branch']= isset($modx_branch) ? $modx_branch : ''; @@ -2192,17 +1792,6 @@ function getVersionData($data=null) { return (!is_null($data) && is_array($this->version) && isset($this->version[$data])) ? $this->version[$data] : $this->version; } - /** - * Returns an ordered or unordered HTML list. - * - * @param array $array - * @param string $ulroot Default: root - * @param string $ulprefix Default: sub_ - * @param string $type Default: Empty string - * @param boolean $ordered Default: false - * @param int $tablevel Default: 0 - * @return string - */ function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) { // first find out whether the value passed is an array if (!is_array($array)) { @@ -2229,11 +1818,6 @@ function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordere return $listhtml; } - /** - * Returns user login information, as loggedIn (true or false), internal key, username and usertype (web or manager). - * - * @return boolean|array - */ function userLoggedIn() { $userdetails= array (); if ($this->isFrontend() && isset ($_SESSION['webValidated'])) { @@ -2256,13 +1840,6 @@ function userLoggedIn() { } } - /** - * Returns an array with keywords for the current document, or a document with a given docid - * - * @param int $id The docid, 0 means the current document - * Default: 0 - * @return array - */ function getKeywords($id= 0) { if ($id == 0) { $id= $this->documentObject['id']; @@ -2282,13 +1859,6 @@ function getKeywords($id= 0) { return $keywords; } - /** - * Returns an array with meta tags for the current document, or a document with a given docid. - * - * @param int $id The document identifier, 0 means the current document - * Default: 0 - * @return array - */ function getMETATags($id= 0) { if ($id == 0) { $id= $this->documentObject['id']; @@ -2313,13 +1883,6 @@ function getMETATags($id= 0) { return $metatags; } - /** - * Executes a snippet. - * - * @param string $snippetName - * @param array $params Default: Empty array - * @return string - */ function runSnippet($snippetName, $params= array ()) { if (isset ($this->snippetCache[$snippetName])) { $snippet= $this->snippetCache[$snippetName]; @@ -2343,24 +1906,12 @@ function runSnippet($snippetName, $params= array ()) { return $this->evalSnippet($snippet, $parameters); } - /** - * Returns the chunk content for the given chunk name - * - * @param string $chunkName - * @return boolean|string - */ function getChunk($chunkName) { $t= $this->chunkCache[$chunkName]; return $t; } - /** - * Old method that just calls getChunk() - * - * @deprecated Use getChunk - * @param string $chunkName - * @return boolean|string - */ + // deprecated function putChunk($chunkName) { // alias name >.< return $this->getChunk($chunkName); } @@ -2376,24 +1927,11 @@ function parseChunk($chunkName, $chunkArr, $prefix= "{", $suffix= "}") { return $chunk; } - /** - * Get data from phpSniff - * - * @category API-Function - * @return array - */ function getUserData() { - include MODX_MANAGER_PATH . "includes/extenders/getUserData.extender.php"; + include $this->config["base_path"] . "manager/includes/extenders/getUserData.extender.php"; return $tmpArray; } - /** - * Returns the timestamp in the date format defined in $this->config['datetime_format'] - * - * @param int $timestamp Default: 0 - * @param string $mode Default: Empty string (adds the time as below). Can also be 'dateOnly' for no time or 'formatOnly' to get the datetime_format string. - * @return string - */ function toDateFormat($timestamp = 0, $mode = '') { $timestamp = trim($timestamp); $timestamp = intval($timestamp); @@ -2425,12 +1963,6 @@ function toDateFormat($timestamp = 0, $mode = '') { return $strTime; } - /** - * Make a timestamp from a string corresponding to the format in $this->config['datetime_format'] - * - * @param string $str - * @return string - */ function toTimeStamp($str) { $str = trim($str); if (empty($str)) {return '';} @@ -2461,30 +1993,10 @@ function toTimeStamp($str) { return $timeStamp; } - /** - * Get the TVs of a document's children. Returns an array where each element represents one child doc. - * - * Ignores deleted children. Gets all children - there is no where clause available. - * - * @param int $parentid The parent docid - * Default: 0 (site root) - * @param array $tvidnames. Which TVs to fetch - Can relate to the TV ids in the db (array elements should be numeric only) - * or the TV names (array elements should be names only) - * Default: Empty array - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @param string $docsort How to sort the result array (field) - * Default: menuindex - * @param ASC $docsortdir How to sort the result array (direction) - * Default: ASC - * @param string $tvfields Fields to fetch from site_tmplvars, default '*' - * Default: * - * @param string $tvsort How to sort each element of the result array i.e. how to sort the TVs (field) - * Default: rank - * @param string $tvsortdir How to sort each element of the result array i.e. how to sort the TVs (direction) - * Default: ASC - * @return boolean|array - */ + #:::::::::::::::::::::::::::::::::::::::: + # Added By: Raymond Irving - MODx + # + function getDocumentChildrenTVars($parentid= 0, $tvidnames= array (), $published= 1, $docsort= "menuindex", $docsortdir= "ASC", $tvfields= "*", $tvsort= "rank", $tvsortdir= "ASC") { $docs= $this->getDocumentChildren($parentid, $published, 0, '*', '', $docsort, $docsortdir); if (!$docs) @@ -2538,25 +2050,6 @@ function getDocumentChildrenTVars($parentid= 0, $tvidnames= array (), $published } } - /** - * Get the TV outputs of a document's children. - * - * Returns an array where each element represents one child doc and contains the result from getTemplateVarOutput() - * - * Ignores deleted children. Gets all children - there is no where clause available. - * - * @param int $parentid The parent docid - * Default: 0 (site root) - * @param array $tvidnames. Which TVs to fetch. In the form expected by getTemplateVarOutput(). - * Default: Empty array - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @param string $docsort How to sort the result array (field) - * Default: menuindex - * @param ASC $docsortdir How to sort the result array (direction) - * Default: ASC - * @return boolean|array - */ function getDocumentChildrenTVarOutput($parentid= 0, $tvidnames= array (), $published= 1, $docsort= "menuindex", $docsortdir= "ASC") { $docs= $this->getDocumentChildren($parentid, $published, 0, '*', '', $docsort, $docsortdir); if (!$docs) @@ -2572,21 +2065,8 @@ function getDocumentChildrenTVarOutput($parentid= 0, $tvidnames= array (), $publ } } - /** - * Modified by Raymond for TV - Orig Modified by Apodigm - DocVars - * Returns a single site_content field or TV record from the db. - * - * If a site content field the result is an associative array of 'name' and 'value'. - * - * If a TV the result is an array representing a db row including the fields specified in $fields. - * - * @param string $idname Can be a TV id or name - * @param string $fields Fields to fetch from site_tmplvars. Default: * - * @param type $docid Docid. Defaults to empty string which indicates the current document. - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @return boolean - */ + // Modified by Raymond for TV - Orig Modified by Apodigm - DocVars + # returns a single TV record. $idnames - can be an id or name that belongs the template that the current document is using function getTemplateVar($idname= "", $fields= "*", $docid= "", $published= 1) { if ($idname == "") { return false; @@ -2596,27 +2076,7 @@ function getTemplateVar($idname= "", $fields= "*", $docid= "", $published= 1) { } } - /** - * Returns an array of site_content field fields and/or TV records from the db - * - * Elements representing a site content field consist of an associative array of 'name' and 'value'. - * - * Elements representing a TV consist of an array representing a db row including the fields specified in $fields. - * - * @param array $idnames Which TVs to fetch - Can relate to the TV ids in the db (array elements should be numeric only) - * or the TV names (array elements should be names only) - * Default: Empty array - * @param string $fields Fields to fetch from site_tmplvars. - * Default: * - * @param string $docid Docid. Defaults to empty string which indicates the current document. - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @param string $sort How to sort the result array (field) - * Default: rank - * @param string $dir How to sort the result array (direction) - * Default: ASC - * @return boolean|array - */ + # returns an array of TV records. $idnames - can be an id or name that belongs the template that the current document is using function getTemplateVars($idnames= array (), $fields= "*", $docid= "", $published= 1, $sort= "rank", $dir= "ASC") { if (($idnames != '*' && !is_array($idnames)) || count($idnames) == 0) { return false; @@ -2666,18 +2126,7 @@ function getTemplateVars($idnames= array (), $fields= "*", $docid= "", $publishe } } - /** - * Returns an associative array containing TV rendered output values. - * - * @param type $idnames Which TVs to fetch - Can relate to the TV ids in the db (array elements should be numeric only) - * or the TV names (array elements should be names only) - * Default: Empty array - * @param string $docid Docid. Defaults to empty string which indicates the current document. - * @param int $published Whether published or unpublished documents are in the result - * Default: 1 - * @param string $sep - * @return boolean|array - */ + # returns an associative array containing TV rendered output values. $idnames - can be an id or name that belongs the template that the current document is using function getTemplateVarOutput($idnames= array (), $docid= "", $published= 1, $sep='') { if (count($idnames) == 0) { return false; @@ -2689,7 +2138,7 @@ function getTemplateVarOutput($idnames= array (), $docid= "", $published= 1, $se if ($result == false) return false; else { - $baspath= MODX_MANAGER_PATH . "includes"; + $baspath= $this->config["base_path"] . "manager/includes"; include_once $baspath . "/tmplvars.format.inc.php"; include_once $baspath . "/tmplvars.commands.inc.php"; for ($i= 0; $i < count($result); $i++) { @@ -2703,42 +2152,22 @@ function getTemplateVarOutput($idnames= array (), $docid= "", $published= 1, $se } } - /** - * Returns the full table name based on db settings - * - * @param string $tbl Table name - * @return string Table name with prefix - */ + # returns the full table name based on db settings function getFullTableName($tbl) { return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`"; } - /** - * Returns the placeholder value - * - * @param string $name Placeholder name - * @return string Placeholder value - */ + # return placeholder value function getPlaceholder($name) { return $this->placeholders[$name]; } - /** - * Sets a value for a placeholder - * - * @param string $name The name of the placeholder - * @param string $value The value of the placeholder - */ + # sets a value for a placeholder function setPlaceholder($name, $value) { $this->placeholders[$name]= $value; } - /** - * Set placeholders en masse via an array or object. - * - * @param object|array $subject - * @param string $prefix - */ + # set arrays or object vars as placeholders function toPlaceholders($subject, $prefix= '') { if (is_object($subject)) { $subject= get_object_vars($subject); @@ -2750,13 +2179,6 @@ function toPlaceholders($subject, $prefix= '') { } } - /** - * For use by toPlaceholders(); For setting an array or object element as placeholder. - * - * @param string $key - * @param object|array $value - * @param string $prefix - */ function toPlaceholder($key, $value, $prefix= '') { if (is_array($value) || is_object($value)) { $this->toPlaceholders($value, "{$prefix}{$key}."); @@ -2765,39 +2187,21 @@ function toPlaceholder($key, $value, $prefix= '') { } } - /** - * Returns the manager relative URL/path with respect to the site root. - * - * @global string $base_url - * @return string The complete URL to the manager folder - */ + # returns the virtual relative path to the manager folder function getManagerPath() { - return MODX_MANAGER_URL; + global $base_url; + $pth= $base_url . 'manager/'; + return $pth; } - /** - * Returns the cache relative URL/path with respect to the site root. - * - * @global string $base_url - * @return string The complete URL to the cache folder - */ + # returns the virtual relative path to the cache folder function getCachePath() { global $base_url; $pth= $base_url . 'assets/cache/'; return $pth; } - /** - * Sends a message to a user's message box. - * - * @param string $type Type of the message - * @param string $to The recipient of the message - * @param string $from The sender of the message - * @param string $subject The subject of the message - * @param string $msg The message body - * @param int $private Whether it is a private message, or not - * Default : 0 - */ + # sends a message to a user's message box function sendAlert($type, $to, $from, $subject, $msg, $private= 0) { $private= ($private) ? 1 : 0; if (!is_numeric($to)) { @@ -2823,12 +2227,8 @@ function sendAlert($type, $to, $from, $subject, $msg, $private= 0) { $rs= $this->db->query($sql); } - /** - * Returns true, install or interact when inside manager. - * - * @deprecated - * @return string - */ + # Returns true, install or interact when inside manager + // deprecated function insideManager() { $m= false; if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE == 'true') { @@ -2842,12 +2242,7 @@ function insideManager() { return $m; } - /** - * Returns current user id. - * - * @param string $context. Default is an empty string which indicates the method should automatically pick 'web (frontend) or 'mgr' (backend) - * @return string - */ + # Returns current user id function getLoginUserID($context= '') { if ($context && isset ($_SESSION[$context . 'Validated'])) { return $_SESSION[$context . 'InternalKey']; @@ -2860,12 +2255,7 @@ function getLoginUserID($context= '') { } } - /** - * Returns current user name - * - * @param string $context. Default is an empty string which indicates the method should automatically pick 'web (frontend) or 'mgr' (backend) - * @return string - */ + # Returns current user name function getLoginUserName($context= '') { if (!empty($context) && isset ($_SESSION[$context . 'Validated'])) { return $_SESSION[$context . 'Shortname']; @@ -2878,11 +2268,7 @@ function getLoginUserName($context= '') { } } - /** - * Returns current login user type - web or manager - * - * @return string - */ + # Returns current login user type - web or manager function getLoginUserType() { if ($this->isFrontend() && isset ($_SESSION['webValidated'])) { return 'web'; @@ -2894,12 +2280,7 @@ function getLoginUserType() { } } - /** - * Returns a user info record for the given manager user - * - * @param int $uid - * @return boolean|string - */ + # Returns a record for the manager user function getUserInfo($uid) { $sql= " SELECT mu.username, mu.password, mua.* @@ -2917,12 +2298,7 @@ function getUserInfo($uid) { } } - /** - * Returns a record for the web user - * - * @param int $uid - * @return boolean|string - */ + # Returns a record for the web user function getWebUserInfo($uid) { $sql= " SELECT wu.username, wu.password, wua.* @@ -2940,15 +2316,9 @@ function getWebUserInfo($uid) { } } - /** - * Returns an array of document groups that current user is assigned to. - * This function will first return the web user doc groups when running from - * frontend otherwise it will return manager user's docgroup. - * - * @param boolean $resolveIds Set to true to return the document group names - * Default: false - * @return string|array - */ + # Returns an array of document groups that current user is assigned to. + # This function will first return the web user doc groups when running from frontend otherwise it will return manager user's docgroup + # Set $resolveIds to true to return the document group names function getUserDocGroups($resolveIds= false) { if ($this->isFrontend() && isset ($_SESSION['webDocgroups']) && isset ($_SESSION['webValidated'])) { $dg= $_SESSION['webDocgroups']; @@ -2981,28 +2351,11 @@ function getUserDocGroups($resolveIds= false) { return $dgn; } } - - /** - * Returns an array of document groups that current user is assigned to. - * This function will first return the web user doc groups when running from - * frontend otherwise it will return manager user's docgroup. - * - * @deprecated - * @return string|array - */ function getDocGroups() { return $this->getUserDocGroups(); } // deprecated - /** - * Change current web user's password - * - * @todo Make password length configurable, allow rules for passwords and translation of messages - * @param string $oldPwd - * @param string $newPwd - * @return string|boolean Returns true if successful, oterhwise return error - * message - */ + # Change current web user's password - returns true if successful, oterhwise return error message function changeWebUserPassword($oldPwd, $newPwd) { $rt= false; if ($_SESSION["webValidated"] == 1) { @@ -3033,25 +2386,11 @@ function changeWebUserPassword($oldPwd, $newPwd) { } } } - - /** - * Change current web user's password - * - * @deprecated - * @param string $o - * @param string $n - * @return string|boolean - */ function changePassword($o, $n) { return changeWebUserPassword($o, $n); } // deprecated - /** - * Returns true if the current web user is a member the specified groups - * - * @param array $groupNames - * @return boolean - */ + # returns true if the current web user is a member the specified groups function isMemberOfWebGroup($groupNames= array ()) { if (!is_array($groupNames)) return false; @@ -3073,13 +2412,7 @@ function isMemberOfWebGroup($groupNames= array ()) { return false; } - /** - * Registers Client-side CSS scripts - these scripts are loaded at inside - * the tag - * - * @param string $src - * @param string $media Default: Empty string - */ + # Registers Client-side CSS scripts - these scripts are loaded at inside the tag function regClientCSS($src, $media='') { if (empty($src) || isset ($this->loadedjscripts[$src])) return ''; @@ -3094,24 +2427,12 @@ function regClientCSS($src, $media='') { } } - /** - * Registers Startup Client-side JavaScript - these scripts are loaded at inside the tag - * - * @param string $src - * @param array $options Default: 'name'=>'', 'version'=>'0', 'plaintext'=>false - */ + # Registers Startup Client-side JavaScript - these scripts are loaded at inside the tag function regClientStartupScript($src, $options= array('name'=>'', 'version'=>'0', 'plaintext'=>false)) { $this->regClientScript($src, $options, true); } - /** - * Registers Client-side JavaScript these scripts are loaded at the end of the page unless $startup is true - * - * @param string $src - * @param array $options Default: 'name'=>'', 'version'=>'0', 'plaintext'=>false - * @param boolean $startup Default: false - * @return string - */ + # Registers Client-side JavaScript - these scripts are loaded at the end of the page unless $startup is true function regClientScript($src, $options= array('name'=>'', 'version'=>'0', 'plaintext'=>false), $startup= false) { if (empty($src)) return ''; // nothing to register @@ -3175,31 +2496,17 @@ function regClientScript($src, $options= array('name'=>'', 'version'=>'0', 'plai $this->loadedjscripts[$key]['pos']= $pos; } - /** - * Returns all registered JavaScripts - * - * @return string - */ + # Registers Client-side Startup HTML block function regClientStartupHTMLBlock($html) { $this->regClientScript($html, true, true); } - /** - * Returns all registered startup scripts - * - * @return string - */ + # Registers Client-side HTML block function regClientHTMLBlock($html) { $this->regClientScript($html, true); } - /** - * Remove unwanted html tags and snippet, settings and tags - * - * @param string $html - * @param string $allowed Default: Empty string - * @return string - */ + # Remove unwanted html tags and snippet, settings and tags function stripTags($html, $allowed= "") { $t= strip_tags($html, $allowed); $t= preg_replace('~\[\*(.*?)\*\]~', "", $t); //tv @@ -3225,13 +2532,8 @@ function jsonDecode($json, $assoc = false) { $json = str_replace($masked, $unmasked, $json); return json_decode($json, $assoc); } - /** - * Add an event listner to a plugin - only for use within the current execution cycle - * - * @param string $evtName - * @param string $pluginName - * @return boolean|int - */ + + # add an event listner to a plugin - only for use within the current execution cycle function addEventListener($evtName, $pluginName) { if (!$evtName || !$pluginName) return false; @@ -3240,33 +2542,20 @@ function addEventListener($evtName, $pluginName) { return array_push($this->pluginEvent[$evtName], $pluginName); // return array count } - /** - * Remove event listner - only for use within the current execution cycle - * - * @param string $evtName - * @return boolean - */ + # remove event listner - only for use within the current execution cycle function removeEventListener($evtName) { if (!$evtName) return false; unset ($this->pluginEvent[$evtName]); } - /** - * Remove all event listners - only for use within the current execution cycle - */ + # remove all event listners - only for use within the current execution cycle function removeAllEventListener() { unset ($this->pluginEvent); $this->pluginEvent= array (); } - /** - * Invoke an event. - * - * @param string $evtName - * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value. - * @return boolean|array - */ + # invoke an event. $extParams - hash array: name=>value function invokeEvent($evtName, $extParams= array ()) { if (!$evtName) return false; @@ -3318,12 +2607,7 @@ function invokeEvent($evtName, $extParams= array ()) { return $results; } - /** - * Parses a resource property string and returns the result as an array - * - * @param string $propertyString - * @return array Associative array in the form property name => property value - */ + # parses a resource property string and returns the result as an array function parseProperties($propertyString) { $parameter= array (); if (!empty ($propertyString)) { @@ -3350,10 +2634,6 @@ function parseProperties($propertyString) { Etomite ID: rad14701 See documentation for usage details ############################################*/ - - /** - * @depracted Etomite db method - */ function getIntTableRows($fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to get rows from ANY internal database table if ($from == "") { @@ -3373,9 +2653,6 @@ function getIntTableRows($fields= "*", $from= "", $where= "", $sort= "", $dir= " } } - /** - * @depracted Etomite db method - */ function putIntTableRow($fields= "", $into= "") { // function to put a row into ANY internal database table if (($fields == "") || ($into == "")) { @@ -3397,9 +2674,6 @@ function putIntTableRow($fields= "", $into= "") { } } - /** - * @depracted Etomite db method - */ function updIntTableRow($fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to update a row into ANY internal database table if (($fields == "") || ($into == "")) { @@ -3424,9 +2698,6 @@ function updIntTableRow($fields= "", $into= "", $where= "", $sort= "", $dir= "AS } } - /** - * @depracted Etomite db method - */ function getExtTableRows($host= "", $user= "", $pass= "", $dbase= "", $fields= "*", $from= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to get table rows from an external MySQL database if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($from == "")) { @@ -3447,9 +2718,6 @@ function getExtTableRows($host= "", $user= "", $pass= "", $dbase= "", $fields= " } } - /** - * @depracted Etomite db method - */ function putExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "") { // function to put a row into an external database table if (($host == "") || ($user == "") || ($pass == "") || ($dbase == "") || ($fields == "") || ($into == "")) { @@ -3472,9 +2740,6 @@ function putExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "" } } - /** - * @depracted Etomite db method - */ function updExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "", $into= "", $where= "", $sort= "", $dir= "ASC", $limit= "") { // function to update a row into an external database table if (($fields == "") || ($into == "")) { @@ -3500,9 +2765,6 @@ function updExtTableRow($host= "", $user= "", $pass= "", $dbase= "", $fields= "" } } - /** - * @depracted Etomite db method - */ function dbExtConnect($host, $user, $pass, $dbase) { // function to connect to external database $tstart= $this->getMicroTime(); @@ -3519,9 +2781,6 @@ function dbExtConnect($host, $user, $pass, $dbase) { } } - /** - * @depracted Etomite db method - */ function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) { // function to retrieve form results into an associative array $results= array (); @@ -3552,20 +2811,10 @@ function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) { // END New database functions - rad14701 ######################################## - /** - * PHP error handler set by http://www.php.net/manual/en/function.set-error-handler.php - * - * Checks the PHP error and calls messageQuit() unless: - * - error_reporting() returns 0, or - * - the PHP error level is 0, or - * - the PHP error level is 8 (E_NOTICE) and stopOnNotice is false - * - * @param int $nr The PHP error level as per http://www.php.net/manual/en/errorfunc.constants.php - * @param string $text Error message - * @param string $file File where the error was detected - * @param string $line Line number within $file - * @return boolean - */ + /***************************************************************************************/ + /* End of API functions */ + /***************************************************************************************/ + function phpError($nr, $text, $file, $line) { if (error_reporting() == 0 || $nr == 0) { return true; @@ -3781,7 +3030,7 @@ function messageQuit($msg= 'unspecified error', $query= '', $is_error= true, $nr { echo 'MODX Content Manager ' . $version . ' » ' . $release_date . ' - + ' . $str . ''; @@ -3865,9 +3114,7 @@ function nicesize($size) { } -/** - * System Event Class - */ +// SystemEvent Class class SystemEvent { var $name; var $_propagate; @@ -3880,12 +3127,7 @@ function SystemEvent($name= "") { $this->name= $name; } - /** - * Display a message to the user - * - * @global array $SystemAlertMsgQueque - * @param string $msg The message - */ + // used for displaying a message to the user function alert($msg) { global $SystemAlertMsgQueque; if ($msg == "") @@ -3897,18 +3139,11 @@ function alert($msg) { } } - /** - * Output - * - * @param string $msg - */ + // used for rendering an out on the screen function output($msg) { $this->_output .= $msg; } - /** - * Stop event propogation - */ function stopPropagation() { $this->_propagate= false; } From 603d0355a5936c7fa7abb690c02cfda9779cea5b Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Thu, 2 May 2013 20:50:44 +0300 Subject: [PATCH 013/530] fill guid --- install/assets/modules/docmanager.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/modules/docmanager.tpl b/install/assets/modules/docmanager.tpl index 70026951d4..7f860b8f5d 100644 --- a/install/assets/modules/docmanager.tpl +++ b/install/assets/modules/docmanager.tpl @@ -8,7 +8,7 @@ * @version 1.1 * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) * @internal @properties - * @internal @guid + * @internal @guid docman435243542tf542t5t * @internal @shareparams 1 * @internal @dependencies requires files located at /assets/modules/docmanager/ * @internal @modx_category Manager and Admin From 2e72869eaf98801b047cd04329b5cc5c9e433dce Mon Sep 17 00:00:00 2001 From: Thomas Jakobi Date: Tue, 7 May 2013 15:34:57 +0200 Subject: [PATCH 014/530] Refactor #9911: Update AjaxSearch to 1.9.3b --- .../snippets/ajaxSearch/ajaxSearchPopup.php | 11 +- .../snippets/ajaxSearch/ajaxSearch_readme.txt | 17 +- ...on_192.txt => ajaxSearch_version_193b.txt} | 990 +++++++++--------- .../classes/ajaxSearch.class.inc.php | 8 +- .../classes/ajaxSearchConfig.class.inc.php | 10 +- .../classes/ajaxSearchCtrl.class.inc.php | 6 +- .../classes/ajaxSearchInput.class.inc.php | 7 +- .../classes/ajaxSearchLog.class.inc.php | 6 +- .../classes/ajaxSearchOutput.class.inc.php | 8 +- .../classes/ajaxSearchRequest.class.inc.php | 71 +- .../classes/ajaxSearchResults.class.inc.php | 6 +- .../classes/ajaxSearchUtil.class.inc.php | 6 +- .../classes/asPhxParser.class.inc.php | 38 +- .../ajaxSearch/configs/default.config.php | 4 +- .../documentation/AjaxSearch192_v2.pdf | Bin 123617 -> 0 bytes .../documentation/AjaxSearch193_v1.pdf | Bin 0 -> 122853 bytes .../documentation/migrationFrom185To190.txt | 0 .../ajaxSearch/documentation/readme.txt | 0 .../someConfigsExamples/custom1.config.php | 0 .../someConfigsExamples/custom2.config.php | 0 .../documentation/someCssExamples/search.css | 0 .../imgAjaxResult.tpl.html | 0 .../someTemplatesExamples/imgResult.tpl.html | 0 .../someTemplatesExamples/rankResult.tpl.html | 0 assets/snippets/ajaxSearch/images/asnext.png | Bin assets/snippets/ajaxSearch/images/asprev.png | Bin assets/snippets/ajaxSearch/images/close.png | Bin assets/snippets/ajaxSearch/images/cross.png | Bin .../ajaxSearch/images/indicator.black.gif | Bin .../ajaxSearch/images/indicator.white.gif | Bin assets/snippets/ajaxSearch/images/readme.txt | 0 .../js/ajaxSearch1/ajaxSearch-jquery.js | 6 +- .../js/ajaxSearch1/ajaxSearch-mootools2.js | 6 +- .../ajaxSearch/js/ajaxSearch1/ajaxSearch.js | 6 +- .../js/clearDefault/clearDefault.js | 4 +- .../ajaxSearch/js/comment/ajaxSearchCmt.js | 4 +- .../js/mootools2/mootools-1.2.4-core.js.txt | 0 .../js/mootools2/mootools-1.2.4.4-more.js.txt | 0 .../ajaxSearch/js/mootools2/mootools-1.2.4.js | 0 .../ajaxSearch/js/mootools2/readme.txt | 0 .../ajaxSearch/lang/arabic-utf8.inc.php | 0 .../snippets/ajaxSearch/lang/chinese.inc.php | 0 .../lang/chinese_simplified-utf8.inc.php | 0 .../lang/chinese_simplified.inc.php | 0 .../lang/chinese_traditional-utf8.inc.php | 0 .../lang/chinese_traditional.inc.php | 0 assets/snippets/ajaxSearch/lang/czech.inc.php | 0 .../snippets/ajaxSearch/lang/danish.inc.php | 0 .../ajaxSearch/lang/english-utf8.inc.php | 0 .../snippets/ajaxSearch/lang/english.inc.php | 0 .../ajaxSearch/lang/estonian-utf8.inc.php | 0 .../snippets/ajaxSearch/lang/estonian.inc.php | 0 .../snippets/ajaxSearch/lang/finnish.inc.php | 0 .../ajaxSearch/lang/francais-utf8.inc.php | 0 .../snippets/ajaxSearch/lang/francais.inc.php | 0 .../snippets/ajaxSearch/lang/german.inc.php | 0 .../snippets/ajaxSearch/lang/hebrew.inc.php | 0 .../ajaxSearch/lang/icelandic-utf8.inc.php | 0 .../ajaxSearch/lang/indonesia.inc.php | 0 .../snippets/ajaxSearch/lang/italian.inc.php | 0 .../ajaxSearch/lang/japanese-utf8.inc.php | 0 .../ajaxSearch/lang/nederlands.inc.php | 0 .../ajaxSearch/lang/norsk-utf8.inc.php | 0 assets/snippets/ajaxSearch/lang/norsk.inc.php | 0 .../snippets/ajaxSearch/lang/persian.inc.php | 0 .../ajaxSearch/lang/polish-utf8.inc.php | 0 .../ajaxSearch/lang/portuguese-br.inc.php | 0 .../ajaxSearch/lang/portuguese.inc.php | 0 .../ajaxSearch/lang/russian-UTF8.inc.php | 0 .../snippets/ajaxSearch/lang/russian.inc.php | 0 .../ajaxSearch/lang/slovak-utf8.inc.php | 0 .../snippets/ajaxSearch/lang/slovak.inc.php | 0 .../ajaxSearch/lang/spanish-utf8.inc.php | 0 .../snippets/ajaxSearch/lang/spanish.inc.php | 0 .../ajaxSearch/lang/svenska-utf8.inc.php | 0 .../snippets/ajaxSearch/lang/svenska.inc.php | 0 .../module.ajaxSearchLogManager.txt | 6 +- .../ajaxSearch/plugin.advSearchHighlight.tpl | 2 +- .../ajaxSearch/plugin.searchHighlight.tpl | 2 +- .../ajaxSearch/snippet.ajaxSearch.txt | 14 +- install/assets/plugins/searchhighlight.tpl | 2 +- install/assets/snippets/ajaxSearch.tpl | 13 +- 82 files changed, 645 insertions(+), 608 deletions(-) mode change 100644 => 100755 assets/snippets/ajaxSearch/ajaxSearchPopup.php mode change 100644 => 100755 assets/snippets/ajaxSearch/ajaxSearch_readme.txt rename assets/snippets/ajaxSearch/{ajaxSearch_version_192.txt => ajaxSearch_version_193b.txt} (92%) mode change 100644 => 100755 mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearch.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchConfig.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchCtrl.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchInput.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchOutput.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchRequest.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchResults.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/configs/default.config.php delete mode 100644 assets/snippets/ajaxSearch/documentation/AjaxSearch192_v2.pdf create mode 100755 assets/snippets/ajaxSearch/documentation/AjaxSearch193_v1.pdf mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/migrationFrom185To190.txt mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/readme.txt mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/someConfigsExamples/custom1.config.php mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/someConfigsExamples/custom2.config.php mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/someCssExamples/search.css mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/someTemplatesExamples/imgAjaxResult.tpl.html mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/someTemplatesExamples/imgResult.tpl.html mode change 100644 => 100755 assets/snippets/ajaxSearch/documentation/someTemplatesExamples/rankResult.tpl.html mode change 100644 => 100755 assets/snippets/ajaxSearch/images/asnext.png mode change 100644 => 100755 assets/snippets/ajaxSearch/images/asprev.png mode change 100644 => 100755 assets/snippets/ajaxSearch/images/close.png mode change 100644 => 100755 assets/snippets/ajaxSearch/images/cross.png mode change 100644 => 100755 assets/snippets/ajaxSearch/images/indicator.black.gif mode change 100644 => 100755 assets/snippets/ajaxSearch/images/indicator.white.gif mode change 100644 => 100755 assets/snippets/ajaxSearch/images/readme.txt mode change 100644 => 100755 assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-jquery.js mode change 100644 => 100755 assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-mootools2.js mode change 100644 => 100755 assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch.js mode change 100644 => 100755 assets/snippets/ajaxSearch/js/clearDefault/clearDefault.js mode change 100644 => 100755 assets/snippets/ajaxSearch/js/comment/ajaxSearchCmt.js mode change 100644 => 100755 assets/snippets/ajaxSearch/js/mootools2/mootools-1.2.4-core.js.txt mode change 100644 => 100755 assets/snippets/ajaxSearch/js/mootools2/mootools-1.2.4.4-more.js.txt mode change 100644 => 100755 assets/snippets/ajaxSearch/js/mootools2/mootools-1.2.4.js mode change 100644 => 100755 assets/snippets/ajaxSearch/js/mootools2/readme.txt mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/arabic-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/chinese.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/chinese_simplified-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/chinese_simplified.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/chinese_traditional-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/chinese_traditional.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/czech.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/danish.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/english-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/english.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/estonian-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/estonian.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/finnish.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/francais-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/francais.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/german.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/hebrew.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/icelandic-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/indonesia.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/italian.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/japanese-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/nederlands.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/norsk-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/norsk.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/persian.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/polish-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/portuguese-br.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/portuguese.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/russian-UTF8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/russian.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/slovak-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/slovak.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/spanish-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/spanish.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/svenska-utf8.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/lang/svenska.inc.php mode change 100644 => 100755 assets/snippets/ajaxSearch/module.ajaxSearchLogManager.txt mode change 100644 => 100755 assets/snippets/ajaxSearch/plugin.advSearchHighlight.tpl mode change 100644 => 100755 assets/snippets/ajaxSearch/plugin.searchHighlight.tpl mode change 100644 => 100755 assets/snippets/ajaxSearch/snippet.ajaxSearch.txt diff --git a/assets/snippets/ajaxSearch/ajaxSearchPopup.php b/assets/snippets/ajaxSearch/ajaxSearchPopup.php old mode 100644 new mode 100755 index ac05ecd2a8..6a485f8b48 --- a/assets/snippets/ajaxSearch/ajaxSearchPopup.php +++ b/assets/snippets/ajaxSearch/ajaxSearchPopup.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * ajaxSearchPopup.php * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3b +* @date 20/11/2012 * */ @@ -22,7 +22,7 @@ function parseUserConfig($ucfg) { if (isset($_POST['search'])) { - define('AS_VERSION', '1.9.2'); + define('AS_VERSION', '1.9.3'); define('AS_SPATH', 'assets/snippets/ajaxSearch/'); define('AS_PATH', MODX_BASE_PATH . AS_SPATH); @@ -48,7 +48,8 @@ function parseUserConfig($ucfg) { $config = parseUserConfig((strip_tags($_POST['ucfg']))); // Load the custom functions of the custom configuration file if needed if ($config) { - $lconfig = (substr($config, 0, 6) != "@FILE:") ? AS_PATH . "configs/$config.config.php" : $modx->config['base_path'] . trim(substr($config, 6, strlen($config)-6)); + if (substr($config, 0, 6) != "@FILE:") $lconfig = AS_PATH . "configs/{$config}.config.php"; + else return "

AjaxSearch error: @FILE: prefix not allowed !
Check your config parameter or your config file name!

"; if (file_exists($lconfig)) include $lconfig; else return "

AjaxSearch error: " . $lconfig . " not found !
Check your config parameter or your config file name!

"; } diff --git a/assets/snippets/ajaxSearch/ajaxSearch_readme.txt b/assets/snippets/ajaxSearch/ajaxSearch_readme.txt old mode 100644 new mode 100755 index 4800e60e4d..227ff5e2e1 --- a/assets/snippets/ajaxSearch/ajaxSearch_readme.txt +++ b/assets/snippets/ajaxSearch/ajaxSearch_readme.txt @@ -1,5 +1,5 @@ -AjaxSearch Readme version 1.9.2 +AjaxSearch Readme version 1.9.3b --------------------------------------------------------------- :: Snippet: AjaxSearch @@ -8,7 +8,7 @@ AjaxSearch Readme version 1.9.2 Ajax-driven & Flexible Search form Version: - 1.9.2 - 05/12/2010 + 1.9.3b - 20/11/2012 Created by: Coroico - (coroico@wangba.fr) @@ -43,10 +43,16 @@ Many fixes/additions were contributed by mikkelwe/identity/Perrine Originally based on the FlexSearchForm snippet created by jaredc (jaredc@honeydewdesign.com) ---------------------------------------------------------------- -:: Changelog: for more details see www.modx.wangba.fr +:: Changelog: for more details see www.evo.wangba.fr ---------------------------------------------------------------- + 26-september-12 (1.9.3) + -- Bug fixing + -- Removed ajaxsearch's own striptags functions and substituted the use of $modx->stripTags + -- minimum chars allowed to 2 + 05-december-10 (1.9.2) -- Bug fixing + 30-august-10 (1.9.2) -- Bug fixing @@ -457,10 +463,11 @@ The simplest snippet call is [!Ajaxsearch!] without any parameters. Maximum number of words for searching - Default: 5 ----- &minChars [ 2 < int < 100 ] (optional) +---- &minChars [ 1 < int < 100 ] (optional) Minimum number of characters to require for a word to be valid for searching. Length of each word with $advSearch = 'allwords', 'oneword' or 'nowords' Length of the search string with possible spaces with $advSearch = 'exactphrase' + Default is 3. ---- &showInputForm [1 | 0] (optional) @@ -1681,7 +1688,7 @@ Install it as the search highlight plugin. 2. Documentation : http://wiki.modxcms.com/index.php/AjaxSearch -3. Demo site : http://www.modx.wangba.fr +3. Demo site : http://www.evo.wangba.fr 4. Bugs & features : http://svn.modxcms.com/jira/browse/AJAXSEARCH Don't hesitate to signup for an account to post an issue or a new feature diff --git a/assets/snippets/ajaxSearch/ajaxSearch_version_192.txt b/assets/snippets/ajaxSearch/ajaxSearch_version_193b.txt old mode 100644 new mode 100755 similarity index 92% rename from assets/snippets/ajaxSearch/ajaxSearch_version_192.txt rename to assets/snippets/ajaxSearch/ajaxSearch_version_193b.txt index 75d1d43a2e..1ad9345f89 --- a/assets/snippets/ajaxSearch/ajaxSearch_version_192.txt +++ b/assets/snippets/ajaxSearch/ajaxSearch_version_193b.txt @@ -1,502 +1,488 @@ - - AjaxSearch - version 1.9.2 - - Coroico - http://www.modx.wangba.fr - - 05th of December 2010 - -The release 1.9.2 provide the correction of the following issues: - -==== AJAXSEARCH-75 : exactphrase doesn't work when the value is passed thru snippet call -See http://modxcms.com/forums/index.php/topic,55236.0.html - - -==== AJAXSEARCH-76 : TV names not protected in sql request -See http://modxcms.com/forums/index.php/topic,56696.msg330844.html#msg330844l - - -==== AJAXSEARCH-77 : where clause for search terms restriction when the searchstring is empty - - -==== AJAXSEARCH-78 : failed searched never logged -See http://modxcms.com/forums/index.php/topic,53897.msg331714.html#msg331714 - - -==== AJAXSEARCH-79 : tag list now interpreted as tv input list - - -==== AJAXSEARCH-80 : Incorrect strip function for MODx tags -See http://modxcms.com/forums/index.php/topic,57332.msg331855.html#msg331855 - - -==== AJAXSEARCH-81 : orderBy issue when orderBy field not in sc.content table - - -==== AJAXSEARCH-82 : can't define configuration file name with "@FILE:" prefix - - -==== AJAXSEARCH-83 : Searchstring not escaped when logging search request and results -See http://modxcms.com/forums/index.php/topic,57916.0.html - - -No new features are provided with this release. - -===================================================================================== - -Previous versions : - - 1.9.1 delivered the 30th of August 2010 - - 1.9.0 delivered the 18th of May 2010 (provided with MODx 1.0.4) - - 1.8.5 delivered the 20th of March 2010 (provided with MODx 1.0.3) - - 1.8.4 delivered the 20th of October 2009 (provided with MODx1.0.1) - - 1.8.3a delivered the 12th of July 2009 (provided with MODx1.0.0) - - 1.8.3 delivered the 08th June 2009 - - 1.8.2 delivered the 21th April 2009 - - 1.8.1 delivered the 13th October 2008 (provided with MODx0.9.6.3) - - -======================= CHANGES (since 1.8.5) ================================== - - -==== Renaming of some parameters - - For a better and a simpler undertstanding some parameters have been renamed - - AS_showForm => showInputForm - AS_landing => landingPage - AS_showResults => showResults - - -==== Renaming of some $_POST and $_GET variables - - AS_search => search - - -==== Some $_GET variables are now deprecated - - FSF_search is now non interpreted - - -==== &searchWordList deprecated - - The option is now set un the input template - - -==== &resultsPage deprecated - - use landingPage rather this deprecated parameter - - -==== &showMoreResults deprecated - - use moreResultsPage rather this deprecated parameter - - -==== Firebug mode for the debug is deprecated - - Usage of the firebug mode for the debug is deprecated - Negatives values : -1, -2, -3 are now unterstood as 1, 2, 3 - - - -====================== NEW FEATURES (since 1.8.5) ============================== - - -==== Accented characters - search html entities too - - The html entity version of the search terms are also searched. - e.g: "ph&eactute;nomène" and "phnomne" are searched when "phnomne" is searched. - - -==== advSearch - exactphrase - - The search with the advSearch parameter set to "exactphrase" returns only results which - exactly match to the searched terms. - e.g: search "and" doesn't return "band" or "land" just "and" terms. - As this search option use REGEXP, the search could be longer than for the other options. - - -==== Use Google Analytics to track AjaxSearch - - AjaxSearch forms could now use $_POST or $_GET - with $_GET, the query parameter in the URL after you search allow you to track the site - search with Google Analytics. - To do this, simply replace method="post" by method="get" in the input template used - by your ajaxSearch calls. - - -==== timeLimit - increase the allowed execution time of your script - - &timeLimit = [ int | 60 ] - Max execution time in seconds for the AjaxSearch script - 0 - If set to zero, no time limit is imposed - Default: 60 - 1 minute. - - -==== withTvs Define which Template Variables will be used for the search and display of results. - - &withTvs [ [ + | - ] [ : tvlist] ] - by default '' - - The parameter withTvs define which Tv will be added as field result for displaying - and in which tv the search will occur. Only text type TV are enabled - - e.g: - - &withTvs=`tv1,tv2,tv3` - tv1, tv2, Tv3 are added - &withTvs=`+:tv1,tv2,tv3` - tv1, tv2, Tv3 are added - &withTvs=`+` - all tvs of the site are added - - &withTvs=`-` - all tvs of the site are added - &withTvs=`-:tv1,tv2,tv3` - all tvs of the site except tv1, tv2, Tv3 are added - - &withTvs=`` - no tv added - - If &whereSearch contains 'tv' then a tv_value field which contain the concatened - values of all tv of the document is added - - So the tv added could be used for filtering with the filter parameter (see &filter) - - Like the default site content parameters (pagetitle, longtitle, ...) the - Tvs added are available with the following placeholders: - - [+as.tvname+], [+as.tvnameShow+], [+as.tvnameClass+] - - Where tvname is the MODx name of a TV - - [+as.tvname+] is the HTML output of your TV - [+as.tvnameShow+] = 1 if the TV is not NULL - [+as.tvnameClass+] : - - ajaxSearch_resultTvname for the non ajax results (&tplResult) - - AS_ajax_resultTvname for the ajax window (&tplAjaxResult) - - -==== Append the content of some Tvs to your search results with the "tvPhx" parameter - - &tvPhx [ [ + | - ] [ : tvlist] ] - by default '' - - The parameter tvPhx define which additional tv will be added as placeholder. - - e.g: - - &tvPhx=`tv1,tv2,tv3` - tv1, tv2, Tv3 are added as placeholders - &tvPhx=`+:tv1,tv2,tv3` - tv1, tv2, Tv3 are added as placeholders - &tvPhx=`+` - all tvs of the site are added as placeholders - - &tvPhx=`-` - all tvs of the site are added as placeholders - &tvPhx=`-:tv1,tv2,tv3` - all tvs of the site except tv1, tv2, Tv3 are added as placeholders - - &tvPhx=`` - no tv defined as placeholders. - - The following placeholders are anabled with the tv: - - [+as.tvname+], [+as.tvnameShow+], [+as.tvnameClass+] - - Where tvname is the MODx name of a TV - - [+as.tvname+] is the HTML output of your TV - [+as.tvnameShow+] = 1 if the TV is not NULL - [+as.tvnameClass+] : - - ajaxSearch_resultTvname for the non ajax results (&tplResult) - - AS_ajax_resultTvname for the ajax window (&tplAjaxResult) - - The tv value could be used with the filter parameter (see &filter) - - As withTvs includes the TV as a new field in the select clause of the mysql query, - tvPhx append the content of the selected tv after the search and before filer. - - -==== filter - to exclude unwanted documents of the search - - filtering by tv name is now possible - - e.g: &filter=`articleTags,volcano,7` display only documents related to volcanoes. - Documents are filtered by the TV 'articleTags'. - - IMPORTANT : here the tv should be allowed as result with the withTvs or tvPhx - parameters - - -==== Show introduction message under the input form - - &showIntro [ 0 | 1 ] - - To show or hide the introduction message displayed with the input form - Default: 1 (show) - - -==== 2 new paging type added - - &pagingType [ 0 | 1 | 2 | 3 ] : type of pagination - - Default: 1 - - 0: Results Pages 1 | 2 | 3 - 1: Previous - X-Y /Z - Next - 2: X-Y /Z - Show more 10 results - - Type 0 for non-ajax mode only - Type 1 for non-ajax and ajax mode - Type 2 for ajax mode (Jquery only) - - &tplPaging0 - Chunk to style the paging links - type 0 - - &tplPaging1 - Chunk to style the paging links - type 1 - - &tplPaging2 - Chunk to style the paging links - type 2 - - IMPORTANT: - arrow button images are provided with the images folder. - use asprev.png, asnext.png or your own images to define your previous and next buttons. - - e.g: - .paging1Prev{ width:16px; margin:0 3px 0 0;display:block; float:left; text-indent:-3000px; background:url(images/asprev.png) 0 center no-repeat; } - .paging1Next{ width:16px;display:inline-block;text-indent:-3000px; background:url(images/asnext.png) 0 center no-repeat; } - - .paging2More{ margin:10px 10px; padding:8px;background:url(images/asnext.png) 0 center no-repeat;} - - -==== Custom output - - &output [ 0 | 1 ] - - 0 - by default the results are listed below the input form - 1 - custom layout: - - To place the different AjaxSearch elements where you want, use the following placeholders - - [+as.inputForm+] : the input form with the intro message - [+as.results+] : the search results - - The parameter &tplLayout is now deprecated - - The parameter &tplInput is now used to style the ajaxSearch input form - - -==== New modifiers for the ajaxSearch Phx parser - - to include images in your templates, uses the possible following phx modifiers: - - imgwidth : image width - e.g: - provide the image width - - imgheigth : image heigth - e.g: - provide the image height - - imgattr : image attributs - e.g: - provide the image attributes as height="xxx" width="yyy" - - imgmaxwidth=`length` : image max width - e.g: - limit the width of the image to a maximum. Under this limit, keep the true width - - imgmaxheight=`length` : image max height - e.g: - limit the height of the image to a maximum. Under this limit, keep the true height - - These modifiers are particularly usefull with the ajax mode to help html to determine the height of the AjaxSearch pop-up window - - -==== Unique id for AjaxSearch instance - - &asId [ string | ''] - Any combination of characters a-z, underscores, and numbers 0-9 - This is case sensitive. Default = empty string - - This parameter allow distinguish several Ajaxsearch instances on the same page - The id is used to link the snippet calls between them - Choose a short name. eg: "as2" - - -==== Define categories - - &category [ tv_name | ''] - Any combination of characters a-z, underscores, and numbers 0-9 - This is case sensitive. Default = empty string - Name of a TV. The category of a MODx document is provided by this TV content - - e.g: &category=`category` - And the "category" tv value of a document could contain for instance Music, Arts, ... - Then the categConfig function should be defined like that: - - /* - * categConfig : To define the display of categories (output) - * Add a category as a switch item. 'uncategorized' item describe the results outside of any category - * Add a switch for a new site. The default site is named 'defsite'. - * Allowed config parameters : grpLabel, tplResult, tplAjaxResult, display, extract, rank ... - */ - if(!function_exists('categConfig')) { - function categConfig($site='defsite',$category){ - $config = array(); - $site = strtolower($site); - $category = strtolower($category); - switch($site) { - case 'defsite': - switch($category){ - case 'arts': - $config['grpLabel'] = 'Arts'; - $config['tplAjaxResult'] = 'imgResult'; // allow the display of an image - break; - case 'music': - $config['grpLabel'] = 'Music'; - $config['tplAjaxResult'] = 'imgAjaxResult'; // allow the display of an image - break; - case 'geography': - $config['grpLabel'] = 'Geography'; - $config['tplAjaxResult'] = 'imgAjaxResult'; - break; - case '': - $config['grpLabel'] = 'Site wide'; - break; - } - } - return $config; - } - } - - -==== Display the results - - &display [ 'mixed' | 'unmixed' ] - - When results comes from differents subsites (categories), you could choose to display the results mixed or unmixed. - Default: unmixed - Unmixed mode display the results grouped by site or subsite. Each group of results could be paginated. - Mixed mode mixes all the results coming from the differents sites or subsites. - With unmixed mode, results are ordered by the field provided by the first field of the order parameter - e.g: if the subsite "products" has been defined with "product_name, supplier" as order parameter and - the site "employees" has been defined with "job" as order parameter, then the results will be ordered by - "using product_name" value for products and "job" value for "employees". - - -==== GrpResult & AjaxGrpResult templates - - &tplGrpResult - Chunk to style the non-ajax output group result outer - &tplAjaxGrpResult - Chunk to style each output group result outer - - -==== Label for a group of results - - in the configuration file a label could be defined to be be linked with the group of results. - This isn't a snippet parameter. Only a variable of configuration file. - This variable shouldn't contain a comma (",") - - $config['grpLabel'] = 'Arts (Painting)'; - - -==== parents ( in / not in) - - &parents [ [ in | not in ] : comma separated list of Ids | '' ] - - e.g: - &parents=`in:24,25` - do the search in the children documents of documents 24 and 25 - - &parents=`not in:24,10` - do the search in all documents except in the children documents of documents 24 and 10 documents - - &parents=`24,25` means &parents=`in:24,25` (compatible with the 1.8.4 release) - &depth [ 0 < int ] Number of levels deep to retrieve documents - - -==== documents ( in / not in) - - &documents [ [ in | not in ] : comma separated list of Ids | '' ] - - e.g: - &documents=`in:28,29,30,31` - do the search in the documents 28,29,30,31 - - &documents=`not in:28,29,30,31` - do the search in all documents except in documents 28,29,30,31 - - &documents=`28,29,30,31` means &documents=`in:28,29,30,31` (compatible with the 1.8.4 release) - - -==== extracts - - Optimization of the extract algorithm. - - -==== Introduction of the document - - The first characters of the document are displayed when the search occurs with the "nowords" advSearch parameters - or when a filter is applied without any search term. - - The length of the indroduction is provided by extractLength parameter (200 characters by default). - The text displayed is the text defined by the extract parameter (content,description,introtext,tv_value by default) - Obviously without any search term highligthed. - - -==== JQuery & mootools libraries updated with the last versions - - Jquery 1.4.2 & mootools 1.2.4 released with ajaxSearch 1.9.0 - - -==== Javscript disabled - - define the css class "init" to mask the ajaxSearch_output div when javascript is disabled - - e.g: - - #ajaxSearch_output.init { - border: none; - background-color: #FFF; - } - - #ajaxSearch_output { - font-size:90%; - background-color:#EFEFEF; - border:1px solid #6F9303; - color:black; - width:550px; - z-index:1; - padding:5px; - margin:10px 0 15px 0; - } - - -==== pcre_backtrack limit - - The backtrack_limit setting sets the maximum number of bytes preg is allowed - to search over before it gives up. This limit is automatically set to 1600000 - at the beginning of the script and then restored to the initial value at the - end of the script. - - -==== Language files updated - - Six labels have been added for english & french language files. - Thanks to post the missing labels on the ajaxSearch forum board - - Used to display the number of results found: - $_lang['as_resultsTextSingle'] = '%d result found.'; - $_lang['as_resultsTextMultiple'] = '%d results found.'; - - Used to display the total number of results displayed: - $_lang['as_resultsDisplayed'] = 'Displayed: %d'; - - Used to display the number of results displayed by group: - $_lang['as_grpResultsDisplayedText'] = '(Displaying %d - %d of %d)'; - - Used by pagingType 1: - $_lang['as_paging1Text'] = '%d - %d / %d'; - - Used by pagingType 2: - $_lang['as_paging2Text'] = 'Show more %d results'; - - -==== AjaxSearch Logs manager - Follow up the searches of your users ! - - A simple module is provided to display in the manager the last searches run by your - users. This requires to use the asLog parameter. - Use the file module.ajaxSearchLogManager.txt to set a new module. - - -==== Documentation folder - - in the documentation folder, the cheatSheet ajaxSearch192.pdf give a quick - overview of AjaxSearch parameters. Thanks to Goldsky for this contribution. - - The someCssExamples folder give the search.css file used on the demo site to - style ajaxSearch. - - The someConfigsExamples folder provide the configs folder used on the demo - site. - - The someTemplatesExamples folder provide some templates used on the demo site. - - - + + AjaxSearch - version 1.9.3b + + Coroico - http://www.evo.wangba.fr + + 20th of november 2012 + +The release 1.9.3 provide the correction of the following issues: + +==== AJAXSEARCH-82 : can't define configuration file name with "@FILE:" prefix +See http://bugs.modx.com/issues/3533 + + +==== AJAXSEARCH-84 : Unquoted field name in orderby clause +See http://bugs.modx.com/issues/3697 + + +==== AJAXSEARCH-85 : Wrong URL construction when using an array of values (checkboxes) +See http://bugs.modx.com/issues/3698 + + +==== AJAXSEARCH-86 : number of characters not checked when a form with filters is submitted + + +&minChars=2 (less than the default) is now allowed for the search. + + +===================================================================================== + +Previous versions : + - 1.9.3 delivered the 26th of september 2012 + - 1.9.2 delivered the 5th of December 2010 (provided with MODx 1.0.4) + - 1.9.1 delivered the 30th of August 2010 + - 1.9.0 delivered the 18th of May 2010 (provided with MODx 1.0.4) + - 1.8.5 delivered the 20th of March 2010 (provided with MODx 1.0.3) + - 1.8.4 delivered the 20th of October 2009 (provided with MODx1.0.1) + - 1.8.3a delivered the 12th of July 2009 (provided with MODx1.0.0) + - 1.8.3 delivered the 08th June 2009 + - 1.8.2 delivered the 21th April 2009 + - 1.8.1 delivered the 13th October 2008 (provided with MODx0.9.6.3) + + +======================= CHANGES (since 1.8.5) ================================== + + +==== Renaming of some parameters + + For a better and a simpler undertstanding some parameters have been renamed + + AS_showForm => showInputForm + AS_landing => landingPage + AS_showResults => showResults + + +==== Renaming of some $_POST and $_GET variables + + AS_search => search + + +==== Some $_GET variables are now deprecated + + FSF_search is now non interpreted + + +==== &searchWordList deprecated + + The option is now set un the input template + + +==== &resultsPage deprecated + + use landingPage rather this deprecated parameter + + +==== &showMoreResults deprecated + + use moreResultsPage rather this deprecated parameter + + +==== Firebug mode for the debug is deprecated + + Usage of the firebug mode for the debug is deprecated + Negatives values : -1, -2, -3 are now unterstood as 1, 2, 3 + + + +====================== NEW FEATURES (since 1.8.5) ============================== + + +==== Accented characters - search html entities too + + The html entity version of the search terms are also searched. + e.g: "ph&eactute;nomène" and "phnomne" are searched when "phnomne" is searched. + + +==== advSearch - exactphrase + + The search with the advSearch parameter set to "exactphrase" returns only results which + exactly match to the searched terms. + e.g: search "and" doesn't return "band" or "land" just "and" terms. + As this search option use REGEXP, the search could be longer than for the other options. + + +==== Use Google Analytics to track AjaxSearch + + AjaxSearch forms could now use $_POST or $_GET + with $_GET, the query parameter in the URL after you search allow you to track the site + search with Google Analytics. + To do this, simply replace method="post" by method="get" in the input template used + by your ajaxSearch calls. + + +==== timeLimit - increase the allowed execution time of your script + + &timeLimit = [ int | 60 ] + Max execution time in seconds for the AjaxSearch script + 0 - If set to zero, no time limit is imposed + Default: 60 - 1 minute. + + +==== withTvs Define which Template Variables will be used for the search and display of results. + + &withTvs [ [ + | - ] [ : tvlist] ] - by default '' + + The parameter withTvs define which Tv will be added as field result for displaying + and in which tv the search will occur. Only text type TV are enabled + + e.g: + + &withTvs=`tv1,tv2,tv3` - tv1, tv2, Tv3 are added + &withTvs=`+:tv1,tv2,tv3` - tv1, tv2, Tv3 are added + &withTvs=`+` - all tvs of the site are added + + &withTvs=`-` - all tvs of the site are added + &withTvs=`-:tv1,tv2,tv3` - all tvs of the site except tv1, tv2, Tv3 are added + + &withTvs=`` - no tv added + + If &whereSearch contains 'tv' then a tv_value field which contain the concatened + values of all tv of the document is added + + So the tv added could be used for filtering with the filter parameter (see &filter) + + Like the default site content parameters (pagetitle, longtitle, ...) the + Tvs added are available with the following placeholders: + + [+as.tvname+], [+as.tvnameShow+], [+as.tvnameClass+] + + Where tvname is the MODx name of a TV + + [+as.tvname+] is the HTML output of your TV + [+as.tvnameShow+] = 1 if the TV is not NULL + [+as.tvnameClass+] : + - ajaxSearch_resultTvname for the non ajax results (&tplResult) + - AS_ajax_resultTvname for the ajax window (&tplAjaxResult) + + +==== Append the content of some Tvs to your search results with the "tvPhx" parameter + + &tvPhx [ [ + | - ] [ : tvlist] ] - by default '' + + The parameter tvPhx define which additional tv will be added as placeholder. + + e.g: + + &tvPhx=`tv1,tv2,tv3` - tv1, tv2, Tv3 are added as placeholders + &tvPhx=`+:tv1,tv2,tv3` - tv1, tv2, Tv3 are added as placeholders + &tvPhx=`+` - all tvs of the site are added as placeholders + + &tvPhx=`-` - all tvs of the site are added as placeholders + &tvPhx=`-:tv1,tv2,tv3` - all tvs of the site except tv1, tv2, Tv3 are added as placeholders + + &tvPhx=`` - no tv defined as placeholders. + + The following placeholders are anabled with the tv: + + [+as.tvname+], [+as.tvnameShow+], [+as.tvnameClass+] + + Where tvname is the MODx name of a TV + + [+as.tvname+] is the HTML output of your TV + [+as.tvnameShow+] = 1 if the TV is not NULL + [+as.tvnameClass+] : + - ajaxSearch_resultTvname for the non ajax results (&tplResult) + - AS_ajax_resultTvname for the ajax window (&tplAjaxResult) + + The tv value could be used with the filter parameter (see &filter) + + As withTvs includes the TV as a new field in the select clause of the mysql query, + tvPhx append the content of the selected tv after the search and before filer. + + +==== filter - to exclude unwanted documents of the search + + filtering by tv name is now possible + + e.g: &filter=`articleTags,volcano,7` display only documents related to volcanoes. + Documents are filtered by the TV 'articleTags'. + + IMPORTANT : here the tv should be allowed as result with the withTvs or tvPhx + parameters + + +==== Show introduction message under the input form + + &showIntro [ 0 | 1 ] + + To show or hide the introduction message displayed with the input form + Default: 1 (show) + + +==== 2 new paging type added + + &pagingType [ 0 | 1 | 2 | 3 ] : type of pagination + + Default: 1 + + 0: Results Pages 1 | 2 | 3 + 1: Previous - X-Y /Z - Next + 2: X-Y /Z - Show more 10 results + + Type 0 for non-ajax mode only + Type 1 for non-ajax and ajax mode + Type 2 for ajax mode (Jquery only) + + &tplPaging0 - Chunk to style the paging links - type 0 + + &tplPaging1 - Chunk to style the paging links - type 1 + + &tplPaging2 - Chunk to style the paging links - type 2 + + IMPORTANT: + arrow button images are provided with the images folder. + use asprev.png, asnext.png or your own images to define your previous and next buttons. + + e.g: + .paging1Prev{ width:16px; margin:0 3px 0 0;display:block; float:left; text-indent:-3000px; background:url(images/asprev.png) 0 center no-repeat; } + .paging1Next{ width:16px;display:inline-block;text-indent:-3000px; background:url(images/asnext.png) 0 center no-repeat; } + + .paging2More{ margin:10px 10px; padding:8px;background:url(images/asnext.png) 0 center no-repeat;} + + +==== Custom output + + &output [ 0 | 1 ] + + 0 - by default the results are listed below the input form + 1 - custom layout: + + To place the different AjaxSearch elements where you want, use the following placeholders + + [+as.inputForm+] : the input form with the intro message + [+as.results+] : the search results + + The parameter &tplLayout is now deprecated + + The parameter &tplInput is now used to style the ajaxSearch input form + + +==== New modifiers for the ajaxSearch Phx parser + + to include images in your templates, uses the possible following phx modifiers: + + imgwidth : image width - e.g: + provide the image width + + imgheigth : image heigth - e.g: + provide the image height + + imgattr : image attributs - e.g: + provide the image attributes as height="xxx" width="yyy" + + imgmaxwidth=`length` : image max width - e.g: + limit the width of the image to a maximum. Under this limit, keep the true width + + imgmaxheight=`length` : image max height - e.g: + limit the height of the image to a maximum. Under this limit, keep the true height + + These modifiers are particularly usefull with the ajax mode to help html to determine the height of the AjaxSearch pop-up window + + +==== Unique id for AjaxSearch instance + + &asId [ string | ''] + Any combination of characters a-z, underscores, and numbers 0-9 + This is case sensitive. Default = empty string + + This parameter allow distinguish several Ajaxsearch instances on the same page + The id is used to link the snippet calls between them + Choose a short name. eg: "as2" + + +==== Define categories + + &category [ tv_name | ''] + Any combination of characters a-z, underscores, and numbers 0-9 + This is case sensitive. Default = empty string + Name of a TV. The category of a MODx document is provided by this TV content + + e.g: &category=`category` + And the "category" tv value of a document could contain for instance Music, Arts, ... + Then the categConfig function should be defined like that: + + /* + * categConfig : To define the display of categories (output) + * Add a category as a switch item. 'uncategorized' item describe the results outside of any category + * Add a switch for a new site. The default site is named 'defsite'. + * Allowed config parameters : grpLabel, tplResult, tplAjaxResult, display, extract, rank ... + */ + if(!function_exists('categConfig')) { + function categConfig($site='defsite',$category){ + $config = array(); + $site = strtolower($site); + $category = strtolower($category); + switch($site) { + case 'defsite': + switch($category){ + case 'arts': + $config['grpLabel'] = 'Arts'; + $config['tplAjaxResult'] = 'imgResult'; // allow the display of an image + break; + case 'music': + $config['grpLabel'] = 'Music'; + $config['tplAjaxResult'] = 'imgAjaxResult'; // allow the display of an image + break; + case 'geography': + $config['grpLabel'] = 'Geography'; + $config['tplAjaxResult'] = 'imgAjaxResult'; + break; + case '': + $config['grpLabel'] = 'Site wide'; + break; + } + } + return $config; + } + } + + +==== Display the results + + &display [ 'mixed' | 'unmixed' ] + + When results comes from differents subsites (categories), you could choose to display the results mixed or unmixed. + Default: unmixed + Unmixed mode display the results grouped by site or subsite. Each group of results could be paginated. + Mixed mode mixes all the results coming from the differents sites or subsites. + With unmixed mode, results are ordered by the field provided by the first field of the order parameter + e.g: if the subsite "products" has been defined with "product_name, supplier" as order parameter and + the site "employees" has been defined with "job" as order parameter, then the results will be ordered by + "using product_name" value for products and "job" value for "employees". + + +==== GrpResult & AjaxGrpResult templates + + &tplGrpResult - Chunk to style the non-ajax output group result outer + &tplAjaxGrpResult - Chunk to style each output group result outer + + +==== Label for a group of results + + in the configuration file a label could be defined to be be linked with the group of results. + This isn't a snippet parameter. Only a variable of configuration file. + This variable shouldn't contain a comma (",") + + $config['grpLabel'] = 'Arts (Painting)'; + + +==== parents ( in / not in) + + &parents [ [ in | not in ] : comma separated list of Ids | '' ] + + e.g: + &parents=`in:24,25` - do the search in the children documents of documents 24 and 25 + + &parents=`not in:24,10` - do the search in all documents except in the children documents of documents 24 and 10 documents + + &parents=`24,25` means &parents=`in:24,25` (compatible with the 1.8.4 release) + &depth [ 0 < int ] Number of levels deep to retrieve documents + + +==== documents ( in / not in) + + &documents [ [ in | not in ] : comma separated list of Ids | '' ] + + e.g: + &documents=`in:28,29,30,31` - do the search in the documents 28,29,30,31 + + &documents=`not in:28,29,30,31` - do the search in all documents except in documents 28,29,30,31 + + &documents=`28,29,30,31` means &documents=`in:28,29,30,31` (compatible with the 1.8.4 release) + + +==== extracts + + Optimization of the extract algorithm. + + +==== Introduction of the document + + The first characters of the document are displayed when the search occurs with the "nowords" advSearch parameters + or when a filter is applied without any search term. + + The length of the indroduction is provided by extractLength parameter (200 characters by default). + The text displayed is the text defined by the extract parameter (content,description,introtext,tv_value by default) + Obviously without any search term highligthed. + + +==== JQuery & mootools libraries updated with the last versions + + Jquery 1.4.2 & mootools 1.2.4 released with ajaxSearch 1.9.0 + + +==== Javscript disabled + + define the css class "init" to mask the ajaxSearch_output div when javascript is disabled + + e.g: + + #ajaxSearch_output.init { + border: none; + background-color: #FFF; + } + + #ajaxSearch_output { + font-size:90%; + background-color:#EFEFEF; + border:1px solid #6F9303; + color:black; + width:550px; + z-index:1; + padding:5px; + margin:10px 0 15px 0; + } + + +==== pcre_backtrack limit + + The backtrack_limit setting sets the maximum number of bytes preg is allowed + to search over before it gives up. This limit is automatically set to 1600000 + at the beginning of the script and then restored to the initial value at the + end of the script. + + +==== Language files updated + + Six labels have been added for english & french language files. + Thanks to post the missing labels on the ajaxSearch forum board + + Used to display the number of results found: + $_lang['as_resultsTextSingle'] = '%d result found.'; + $_lang['as_resultsTextMultiple'] = '%d results found.'; + + Used to display the total number of results displayed: + $_lang['as_resultsDisplayed'] = 'Displayed: %d'; + + Used to display the number of results displayed by group: + $_lang['as_grpResultsDisplayedText'] = '(Displaying %d - %d of %d)'; + + Used by pagingType 1: + $_lang['as_paging1Text'] = '%d - %d / %d'; + + Used by pagingType 2: + $_lang['as_paging2Text'] = 'Show more %d results'; + + +==== AjaxSearch Logs manager - Follow up the searches of your users ! + + A simple module is provided to display in the manager the last searches run by your + users. This requires to use the asLog parameter. + Use the file module.ajaxSearchLogManager.txt to set a new module. + + +==== Documentation folder + + in the documentation folder, the cheatSheet ajaxSearch192.pdf give a quick + overview of AjaxSearch parameters. Thanks to Goldsky for this contribution. + + The someCssExamples folder give the search.css file used on the demo site to + style ajaxSearch. + + The someConfigsExamples folder provide the configs folder used on the demo + site. + + The someTemplatesExamples folder provide some templates used on the demo site. + + + diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearch.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearch.class.inc.php old mode 100644 new mode 100755 index 6f834adcd6..4aba5da270 --- a/assets/snippets/ajaxSearch/classes/ajaxSearch.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearch.class.inc.php @@ -4,16 +4,16 @@ * ----------------------------------------------------------------------------- * @package AjaxSearch * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearch class contains all functions and data used to manage AjaxSearch * */ -define('MIN_CHARS', 3); // minimum number of characters +define('MIN_CHARS', 2); // minimum number of characters define('MAX_CHARS', 30); // maximum number of characters define('MIN_WORDS', 1); // minimum number of words define('MAX_WORDS', 10); // maximum number of words diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchConfig.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchConfig.class.inc.php old mode 100644 new mode 100755 index 4551f21109..b0836be275 --- a/assets/snippets/ajaxSearch/classes/ajaxSearchConfig.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchConfig.class.inc.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * @package AjaxSearchConfig * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchConfig class contains all functions and data used to manage configuration context @@ -191,11 +191,11 @@ function setAsCall($ucfg) { */ function readConfigFile($config) { global $modx; - $configFile = (substr($config, 0, 5) != "@FILE") ? AS_PATH . "configs/$config.config.php" : $modx->config['base_path'] . trim(trim(substr($config, 5), ':')); + $configFile = (substr($config, 0, 6) != "@FILE:") ? AS_PATH . "configs/$config.config.php" : $modx->config['base_path'] . trim(substr($config, 6, strlen($config)-6)); $fh = fopen($configFile, 'r'); $output = fread($fh, filesize($configFile)); fclose($fh); return "\n" . $output; } } -?> +?> \ No newline at end of file diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchCtrl.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchCtrl.class.inc.php old mode 100644 new mode 100755 index 0f97ffc081..fd49251453 --- a/assets/snippets/ajaxSearch/classes/ajaxSearchCtrl.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchCtrl.class.inc.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * @package AjaxSearchCtrl * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchCtrl class contains the logic and synchronisation between model and views diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchInput.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchInput.class.inc.php old mode 100644 new mode 100755 index 41048141ce..805b69c2c7 --- a/assets/snippets/ajaxSearch/classes/ajaxSearchInput.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchInput.class.inc.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * @package AjaxSearchInput * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchInput class contains all functions and data used to manage Input form @@ -129,6 +129,7 @@ function _checkSearchString(&$searchString, $advSearch, &$msgErr) { } else { // check the empty input field => error message (At least 3 characters) $searchString = ''; + if ($asfSubmitted) $checkString = false; // no check if a filter is submitted } } else if (($searchString == '') && ($this->asCfg->cfg['init'] == 'all')) { diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php old mode 100644 new mode 100755 index edf6e7b461..5aa6527ca6 --- a/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * @package AjaxSearchLog * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchLog class contains all functions used to Log AjaxSearch requests diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchOutput.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchOutput.class.inc.php old mode 100644 new mode 100755 index 5366a8f22f..e6bec0b1b3 --- a/assets/snippets/ajaxSearch/classes/ajaxSearchOutput.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchOutput.class.inc.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * @package AjaxSearchOutput * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchOutput class contains all functions and data used to display output @@ -1087,4 +1087,4 @@ function _getJson($pairs) { return $json; } } -?> +?> \ No newline at end of file diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchRequest.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchRequest.class.inc.php old mode 100644 new mode 100755 index a6fdf47ca7..2516000a66 --- a/assets/snippets/ajaxSearch/classes/ajaxSearchRequest.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchRequest.class.inc.php @@ -4,9 +4,9 @@ * ------------------------------------------------------------------------------ * @package AjaxSearchRequest * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchRequest class contains all functions and data used to manage the search SQL Request @@ -403,7 +403,7 @@ function _getHaving($searchString, $advSearch, $fClause) { if ($advSearch != NOWORDS) { if (isset($this->scJoined)) foreach ($this->scJoined as $joined) { $jpref = $joined['tb_alias']; - foreach ($joined['searchable'] as $searchable) $hvg[] = '(' . $jpref . '_' . $searchable . $like . ')'; + if (isset($joined['searchable'])) foreach ($joined['searchable'] as $searchable) $hvg[] = '(' . $jpref . '_' . $searchable . $like . ')'; } if (isset($this->scTvs['tvs'])) foreach ($this->scTvs['tvs'] as $scTv) { $jpref = $scTv['tb_alias']; @@ -413,7 +413,7 @@ function _getHaving($searchString, $advSearch, $fClause) { if (isset($this->scJoined)) foreach ($this->scJoined as $joined) { $jpref = $joined['tb_alias']; - foreach ($joined['searchable'] as $searchable) { + if (isset($joined['searchable'])) foreach ($joined['searchable'] as $searchable) { $hvg[] = '((' . $jpref . '_' . $searchable . $like . ') OR (' . $jpref . '_' . $searchable . ' IS NULL))'; } } @@ -455,8 +455,13 @@ function _getOrderBy() { if (isset($this->scCateg)) $orderFields[] = 'category ASC'; if ($this->cfg['order']) { $order = array_map('trim',explode(',', $this->cfg['order'])); - foreach ($order as $ord) $orderBy[] = $ord; - $orderFields[] = implode(',', $orderBy); + foreach ($order as $ord) { + $ordElt = explode(' ',$ord); + $ordby = '`' . $ordElt[0] . '`'; + if (isset($ordElt[1]) && ($ordElt[1] == 'ASC' || $ordElt[1] == 'DESC')) $ordby .= ' ' . $ordElt[1]; + $orderBy[] = $ordby; + } + $orderFields[] = implode(',', $orderBy); } if (count($orderFields) > 0) $orderByClause = implode(', ', $orderFields); else $orderByClause = '1'; @@ -498,10 +503,16 @@ function _getSubSelect($joined, $searchString, $advSearch) { $whl[] = implode(' AND ', $where); } - if (($joined['tb_alias'] != 'tv') && ($searchString)) { - $whl[] = '(' . $this->_getSearchTermsWhere($joined,$searchString,$advSearch). ')'; - $whereClause = '(' . implode(' AND ',$whl). ')'; - $subSelect = 'SELECT DISTINCT ' . $fieldsClause . ' FROM ' . $fromClause . ' WHERE ' . $whereClause; + if (($joined['tb_alias'] != 'tv')) { + if ($searchString) { + $stw = $this->_getSearchTermsWhere($joined,$searchString,$advSearch); + if (!empty($stw)) $whl[] = '(' . $stw . ')'; + } + if (count($whl)) { + $whereClause = '(' . implode(' AND ',$whl). ')'; + $subSelect = 'SELECT DISTINCT ' . $fieldsClause . ' FROM ' . $fromClause . ' WHERE ' . $whereClause; + } + else $subSelect = 'SELECT DISTINCT ' . $fieldsClause . ' FROM ' . $fromClause; } else { $subSelect = 'SELECT DISTINCT ' . $fieldsClause . ' FROM ' . $fromClause; @@ -544,24 +555,26 @@ function _getSubFilter($alias, $filter) { return $where; } function _getSearchTermsWhere($joined,$searchString,$advSearch){ - - $like = $this->_getWhereForm($advSearch); - $whereOper = $this->_getWhereOper($advSearch); - $type = ($advSearch == 'allwords') ? 'oneword' : $advSearch; - $whereStringOper = $this->_getWhereStringOper($type); - - if (isset($joined['searchable'])) - foreach($joined['searchable'] as $searchable) $whsc[] = '(' . $joined['tb_alias'] . '.' . $searchable . $like .')'; - if (count($whsc)) $whereSubClause = implode($whereOper,$whsc); - else $whereSubClause = ''; - - $search = array(); - if ($advSearch == 'exactphrase') $search[] = $searchString; - else $search = explode(' ',$searchString); - - foreach($search as $searchTerm) $where[]= preg_replace('/word/', preg_quote($searchTerm), $whereSubClause); - - $whereClause = implode($whereStringOper,$where); + $whereClause = ''; + if (!empty($joined['searchable'])) { + $like = $this->_getWhereForm($advSearch); + $whereOper = $this->_getWhereOper($advSearch); + $type = ($advSearch == 'allwords') ? 'oneword' : $advSearch; + $whereStringOper = $this->_getWhereStringOper($type); + + foreach($joined['searchable'] as $searchable) $whsc[] = '(' . $joined['tb_alias'] . '.' . $searchable . $like .')'; + if (count($whsc)) { + $whereSubClause = implode($whereOper,$whsc); + + $search = array(); + if ($advSearch == 'exactphrase') $search[] = $searchString; + else $search = explode(' ',$searchString); + + foreach($search as $searchTerm) $where[]= preg_replace('/word/', preg_quote($searchTerm), $whereSubClause); + + $whereClause = implode($whereStringOper,$where); + } + } return $whereClause; } function _getWhereForm($advSearch) { diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchResults.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchResults.class.inc.php old mode 100644 new mode 100755 index bba8304d31..9e5e3f87a5 --- a/assets/snippets/ajaxSearch/classes/ajaxSearchResults.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchResults.class.inc.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * @package AjaxSearchResults * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/10/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchResults class contains all functions and data used to manage Results diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php old mode 100644 new mode 100755 index 58133dd104..9ead73799b --- a/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php @@ -4,9 +4,9 @@ * ----------------------------------------------------------------------------- * @package AjaxSearchUtil * -* @author Coroico - www.modx.wangba.fr -* @version 1.9.2 -* @date 05/12/2010 +* @author Coroico - www.evo.wangba.fr +* @version 1.9.3 +* @date 26/09/2012 * * Purpose: * The AjaxSearchUtil class contains some util methods diff --git a/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php b/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php old mode 100644 new mode 100755 index e0ddba660e..e01f3497c2 --- a/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php +++ b/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php @@ -242,16 +242,40 @@ function Filter($input, $modifiers) { ##### Special functions // img modifiers added by coroico - case "imgwidth": list($width, $height, $type, $attr) = getimagesize($output); $output = $width; break; - case "imgheight": list($width, $height, $type, $attr) = getimagesize($output); $output = $height; break; - case "imgattr": list($width, $height, $type, $attr) = getimagesize($output); $output = $attr; break; + case "imgwidth": + if (@file_exists($output)) { + list($width, $height, $type, $attr) = getimagesize($output); + $output = $width; + } + else $output = 0; + break; + case "imgheight": + if (@file_exists($output)) { + list($width, $height, $type, $attr) = getimagesize($output); + $output = $height; + } + else $output = 0; + break; + case "imgattr": + if (@file_exists($output)) { + list($width, $height, $type, $attr) = getimagesize($output); + $output = $attr; + } + else $output = ''; + break; case "imgmaxwidth": - list($width, $height, $type, $attr) = getimagesize($output); - $output = ($width < intval($modifier_value[$i])) ? $width : intval($modifier_value[$i]); + if (@file_exists($output)) { + list($width, $height, $type, $attr) = getimagesize($output); + $output = ($width < intval($modifier_value[$i])) ? $width : intval($modifier_value[$i]); + } + else $output = intval($modifier_value[$i]); break; case "imgmaxheight": - list($width, $height, $type, $attr) = getimagesize($output); - $output = ($height < intval($modifier_value[$i])) ? $height : intval($modifier_value[$i]); + if (@file_exists($output)) { + list($width, $height, $type, $attr) = getimagesize($output); + $output = ($height < intval($modifier_value[$i])) ? $height : intval($modifier_value[$i]); + } + else $output = intval($modifier_value[$i]); break; case "math": $filter = preg_replace("~([a-zA-Z\n\r\t\s])~","",$modifier_value[$i]); diff --git a/assets/snippets/ajaxSearch/configs/default.config.php b/assets/snippets/ajaxSearch/configs/default.config.php old mode 100644 new mode 100755 index 6aa88b15c5..062bd2a22c --- a/assets/snippets/ajaxSearch/configs/default.config.php +++ b/assets/snippets/ajaxSearch/configs/default.config.php @@ -1,9 +1,9 @@ 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%0AQ0X~O<2ycH+C(8?y{qu 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 DI;m>T diff --git a/assets/snippets/ajaxSearch/documentation/AjaxSearch193_v1.pdf b/assets/snippets/ajaxSearch/documentation/AjaxSearch193_v1.pdf new file mode 100755 index 0000000000000000000000000000000000000000..57d00a92417403c3978b8bfda46d4eefdfaeeecb GIT binary patch literal 122853 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 LDJVqc#Ss4=mR;*j literal 0 HcmV?d00001 diff --git a/assets/snippets/ajaxSearch/documentation/migrationFrom185To190.txt b/assets/snippets/ajaxSearch/documentation/migrationFrom185To190.txt old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/documentation/readme.txt b/assets/snippets/ajaxSearch/documentation/readme.txt old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/documentation/someConfigsExamples/custom1.config.php b/assets/snippets/ajaxSearch/documentation/someConfigsExamples/custom1.config.php old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/documentation/someConfigsExamples/custom2.config.php b/assets/snippets/ajaxSearch/documentation/someConfigsExamples/custom2.config.php old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/documentation/someCssExamples/search.css b/assets/snippets/ajaxSearch/documentation/someCssExamples/search.css old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/documentation/someTemplatesExamples/imgAjaxResult.tpl.html b/assets/snippets/ajaxSearch/documentation/someTemplatesExamples/imgAjaxResult.tpl.html old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/documentation/someTemplatesExamples/imgResult.tpl.html b/assets/snippets/ajaxSearch/documentation/someTemplatesExamples/imgResult.tpl.html old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/documentation/someTemplatesExamples/rankResult.tpl.html b/assets/snippets/ajaxSearch/documentation/someTemplatesExamples/rankResult.tpl.html old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/images/asnext.png b/assets/snippets/ajaxSearch/images/asnext.png old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/images/asprev.png b/assets/snippets/ajaxSearch/images/asprev.png old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/images/close.png b/assets/snippets/ajaxSearch/images/close.png old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/images/cross.png b/assets/snippets/ajaxSearch/images/cross.png old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/images/indicator.black.gif b/assets/snippets/ajaxSearch/images/indicator.black.gif old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/images/indicator.white.gif b/assets/snippets/ajaxSearch/images/indicator.white.gif old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/images/readme.txt b/assets/snippets/ajaxSearch/images/readme.txt old mode 100644 new mode 100755 diff --git a/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-jquery.js b/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-jquery.js old mode 100644 new mode 100755 index bce39d4416..00d560e710 --- a/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-jquery.js +++ b/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-jquery.js @@ -1,6 +1,6 @@ /* - * AjaxSearch 1.9.2 - package AjaxSearch 1 - JQuery 1.4.2 - * author: Coroico - www.modx.wangba.fr - 05/12/2010 + * AjaxSearch 1.9.3 - package AjaxSearch 1 - JQuery 1.4.2 + * author: Coroico - www.evo.wangba.fr - 26/09/2012 * * Licensed under the GPL license: http://www.gnu.org/copyleft/gpl.html */ @@ -14,7 +14,7 @@ var _closeAlt='close search'; var _load=_base + 'images/indicator.white.gif'; // loading image var _loadAlt='loading'; -var _version='1.9.2';var _opacity=1.;var _liveSearch=0;var _minChars=3;var _init='none';var _pagingType=1;jQuery(function($){function activateSearch(){for(ias=0;ias').appendTo(sf).hide();as['sl']=$(''+_loadAlt+'').appendTo(sf).hide();as['sr']=$('#'+p+'ajaxSearch_output').hide().removeClass('init');as['si']=$('#'+p+'ajaxSearch_input');as['se']=$('#'+p+'ajaxSearch_select');if(!as['lvs'])as['ss']=$('#'+p+'ajaxSearch_form input:submit');as['sc'].click(function(){closeSearch(as);return false;});if(!as['lvs'])as['ss'].click(function(){doSearch(as);return false;});else as['si'].keyup(function(){doLiveSearch(as);});if(as['si'].length)as['si'].keypress(function(e){var keyCode=e.keyCode||e.which;if(keyCode==13){doSearch(as);return false;}});doSearch(as);} function doLiveSearch(as){if(as['lt']){window.clearTimeout(as['lt']);} diff --git a/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-mootools2.js b/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-mootools2.js old mode 100644 new mode 100755 index 0c157ff7b6..9740739283 --- a/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-mootools2.js +++ b/assets/snippets/ajaxSearch/js/ajaxSearch1/ajaxSearch-mootools2.js @@ -1,6 +1,6 @@ /* - * AjaxSearch 1.9.2 - package AjaxSearch 1 - Mootools 1.2.4 - * author: Coroico - www.modx.wangba.fr - 05/12/2010 + * AjaxSearch 1.9.3 - package AjaxSearch 1 - Mootools 1.2.4 + * author: Coroico - www.evo.wangba.fr - 26/09/2012 * * Licensed under the GPL license: http://www.gnu.org/copyleft/gpl.html */ @@ -14,7 +14,7 @@ var _closeAlt='close search'; var _load=_base + 'images/indicator.white.gif'; // loading image var _loadAlt='loading'; -var _version='1.9.2';var _opacity=1;var _liveSearch=0;var _minChars=3;var _init='none';var _pagingType=1;function activateSearch(){for(ias=0;ias - * @date 05/12/2010 + * @date 20/11/2012 * ----------------------------------------------------------------------------- */ /** @@ -71,7 +70,7 @@ MORE : See the ajaxSearch.readme.txt file for more informations. ----------------------------------------------------------------------------- */ // ajaxSearch version being executed -define('AS_VERSION', '1.9.2'); +define('AS_VERSION', '1.9.3'); // Path where ajaxSearch is installed define('AS_SPATH', 'assets/snippets/ajaxSearch/'); //include snippet file @@ -95,7 +94,7 @@ if (!isset($dcfg)) return "

AjaxSearch error: default configuration array not if ($dcfg['version'] != AS_VERSION) return "

AjaxSearch error: Version number mismatch. Check the content of the default configuration file!

"; // check the possible use of deprecated parameters (since 1.8.5) -$readme = "ajaxSearch_version_192.txt"; +$readme = "ajaxSearch_version_193.txt"; if (isset($searchWordList)) return "

AjaxSearch error: searchWordList is a deprecated parameter. Read " . $readme . " file.

"; if (isset($resultsPage)) return "

AjaxSearch error: resultsPage is a deprecated parameter. Read " . $readme . " file.

"; if (isset($AS_showForm)) return "

AjaxSearch error: AS_showForm parameter has been renamed showInputForm. Read " . $readme . " file.

"; @@ -134,6 +133,9 @@ $cfg['language'] = isset($language) ? $language : (isset($__language) ? $__langu // Use this to display the search results using ajax You must include the Mootools library in your template // Default: 1 - ajax mode selected $cfg['ajaxSearch'] = isset($ajaxSearch) ? $ajaxSearch : (isset($__ajaxSearch) ? $__ajaxSearch : $dcfg['ajaxSearch']); +// avoid the use of @FILE: prefix with ajax mode +if ((substr($cfg['config'], 0, 6) == "@FILE:") && $cfg['ajaxSearch']) + return "

AjaxSearch error: @FILE: prefix not allowed !
Check your config parameter or your config file name!

"; // &advSearch [ 'exactphrase' | 'allwords' | 'nowords' | 'oneword' ] // Advanced search: diff --git a/install/assets/plugins/searchhighlight.tpl b/install/assets/plugins/searchhighlight.tpl index cd4dd2cebd..eb447d76cb 100644 --- a/install/assets/plugins/searchhighlight.tpl +++ b/install/assets/plugins/searchhighlight.tpl @@ -34,7 +34,7 @@ Created By: Susan Ottwell (sottwell@sottwell.com) Kyle Jaebker (kjaebker@muddydogpaws.com) - Refactored by Coroico (www.modx.wangba.fr) and TS + Refactored by Coroico (www.evo.wangba.fr) and TS ------------------------------------------------------------------------ Based off the the code by Susan Ottwell (www.sottwell.com) http://modxcms.com/forums/index.php/topic,1237.0.html diff --git a/install/assets/snippets/ajaxSearch.tpl b/install/assets/snippets/ajaxSearch.tpl index 2b7aa6e13e..62d2e0a067 100755 --- a/install/assets/snippets/ajaxSearch.tpl +++ b/install/assets/snippets/ajaxSearch.tpl @@ -4,14 +4,14 @@ * Ajax and non-Ajax search that supports results highlighting * * @category snippet - * @version 1.9.2 + * @version 1.9.3b * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) * @internal @properties * @internal @modx_category Search * @internal @installset base, sample * * @author Coroico - * @date 05/12/2010 + * @date 20/11/2012 * ----------------------------------------------------------------------------- */ /** @@ -66,12 +66,12 @@ What AjaxSearch don't : - search in dynamic content. AjaxSearch could retreive only data stored in database. It can't find something stored in a chunk or generated by a snippet. -MORE : See the ajaxSearch.readme.txt file for more informations. +MORE : See the ajaxSearch.readme.txt file for more informations. ----------------------------------------------------------------------------- */ // ajaxSearch version being executed -define('AS_VERSION', '1.9.2'); +define('AS_VERSION', '1.9.3'); // Path where ajaxSearch is installed define('AS_SPATH', 'assets/snippets/ajaxSearch/'); //include snippet file @@ -95,7 +95,7 @@ if (!isset($dcfg)) return "

AjaxSearch error: default configuration array not if ($dcfg['version'] != AS_VERSION) return "

AjaxSearch error: Version number mismatch. Check the content of the default configuration file!

"; // check the possible use of deprecated parameters (since 1.8.5) -$readme = "ajaxSearch_version_192.txt"; +$readme = "ajaxSearch_version_193.txt"; if (isset($searchWordList)) return "

AjaxSearch error: searchWordList is a deprecated parameter. Read " . $readme . " file.

"; if (isset($resultsPage)) return "

AjaxSearch error: resultsPage is a deprecated parameter. Read " . $readme . " file.

"; if (isset($AS_showForm)) return "

AjaxSearch error: AS_showForm parameter has been renamed showInputForm. Read " . $readme . " file.

"; @@ -134,6 +134,9 @@ $cfg['language'] = isset($language) ? $language : (isset($__language) ? $__langu // Use this to display the search results using ajax You must include the Mootools library in your template // Default: 1 - ajax mode selected $cfg['ajaxSearch'] = isset($ajaxSearch) ? $ajaxSearch : (isset($__ajaxSearch) ? $__ajaxSearch : $dcfg['ajaxSearch']); +// avoid the use of @FILE: prefix with ajax mode +if ((substr($cfg['config'], 0, 6) == "@FILE:") && $cfg['ajaxSearch']) + return "

AjaxSearch error: @FILE: prefix not allowed !
Check your config parameter or your config file name!

"; // &advSearch [ 'exactphrase' | 'allwords' | 'nowords' | 'oneword' ] // Advanced search: From 6195adca692ce9cc928f3af34b22153370161161 Mon Sep 17 00:00:00 2001 From: yama Date: Sun, 12 May 2013 02:48:19 +0900 Subject: [PATCH 015/530] Refactor #9891 Delete phpSniff http://tracker.modx.com/issues/9891 --- assets/snippets/jot/jot.class.inc.php | 7 +- manager/actions/mutate_settings.dynamic.php | 2 +- manager/actions/mutate_user.dynamic.php | 2 +- manager/actions/resource_selector.static.php | 6 +- manager/frames/1.php | 6 +- manager/includes/accesscontrol.inc.php | 2 - manager/includes/browsercheck.inc.php | 49 -- .../extenders/deprecated.functions.inc.php | 6 +- .../extenders/getUserData.extender.php | 57 +- manager/includes/sniff/index.html | 2 - manager/includes/sniff/phpSniff.class.php | 197 ------- manager/includes/sniff/phpSniff.core.php | 548 ------------------ manager/includes/tmplvars.format.inc.php | 7 +- 13 files changed, 18 insertions(+), 873 deletions(-) delete mode 100755 manager/includes/browsercheck.inc.php delete mode 100755 manager/includes/sniff/index.html delete mode 100755 manager/includes/sniff/phpSniff.class.php delete mode 100755 manager/includes/sniff/phpSniff.core.php diff --git a/assets/snippets/jot/jot.class.inc.php b/assets/snippets/jot/jot.class.inc.php index efc5cdc96b..d6f03bb4d3 100644 --- a/assets/snippets/jot/jot.class.inc.php +++ b/assets/snippets/jot/jot.class.inc.php @@ -32,7 +32,6 @@ function CJot() { $this->name = $this->config["snippet"]["name"] = "Jot"; $this->version = $this->config["snippet"]["version"] = "1.1.4"; // $this->config["snippet"]["versioncheck"] = "Unknown"; - $this->client = $modx->getUserData(); $this->_ctime = time(); $this->_check = 0; $this->provider = new CJotDataDb; @@ -107,9 +106,9 @@ function Run() { $this->config["user"]["usrid"] = intval($_SESSION['webInternalKey']); $this->config["user"]["id"] = ( $this->config["user"]["usrid"] > 0 ) ? (-$this->config["user"]["usrid"]) : $this->config["user"]["mgrid"]; - $this->config["user"]["host"] = $this->client['ip']; - $this->config["user"]["ip"] = $this->client['ip']; - $this->config["user"]["agent"] = $this->client['ua']; + $this->config["user"]["host"] = $_SERVER['REMOTE_ADDR']; + $this->config["user"]["ip"] = $_SERVER['REMOTE_ADDR']; + $this->config["user"]["agent"] = $_SERVER['HTTP_USER_AGENT']; $this->config["user"]["sechash"] = md5($this->config["user"]["id"].$this->config["user"]["host"].$this->config["user"]["ip"].$this->config["user"]["agent"]); // Automatic settings diff --git a/manager/actions/mutate_settings.dynamic.php b/manager/actions/mutate_settings.dynamic.php index 7e7aee37a7..ce252a825c 100644 --- a/manager/actions/mutate_settings.dynamic.php +++ b/manager/actions/mutate_settings.dynamic.php @@ -30,7 +30,7 @@ while ($row = mysql_fetch_assoc($rs)) $settings[$row['setting_name']] = $row['setting_value']; extract($settings, EXTR_OVERWRITE); -$displayStyle = ( ($_SESSION['browser']=='mz') || ($_SESSION['browser']=='op') || ($_SESSION['browser']=='sf') ) ? "table-row" : "block" ; +$displayStyle = ($_SESSION['browser']!=='ie') ? 'table-row' : 'block' ; // load languages and keys $lang_keys = array(); diff --git a/manager/actions/mutate_user.dynamic.php b/manager/actions/mutate_user.dynamic.php index e899e20433..1488f48cdc 100644 --- a/manager/actions/mutate_user.dynamic.php +++ b/manager/actions/mutate_user.dynamic.php @@ -114,7 +114,7 @@ function ConvertDate($date) { include_once "lang/country/".$manager_language."_country.inc.php"; } -$displayStyle = (($_SESSION['browser'] == 'mz') || ($_SESSION['browser'] == 'op') || ($_SESSION['browser'] == 'sf')) ? "table-row" : "block"; +$displayStyle = ($_SESSION['browser']!=='ie') ? 'table-row' : 'block' ; ?> - -

[*longtitle*]

[*#content*]
-
- -
- -
- -
- -
- - -
-
-
- - \ No newline at end of file + [(site_name)] | [*pagetitle*]

[*longtitle*]

[*#content*]

\ No newline at end of file diff --git a/index-ajax.php b/index-ajax.php index aa109967b3..18a56fbeaf 100644 --- a/index-ajax.php +++ b/index-ajax.php @@ -4,8 +4,9 @@ // Any PHP files in these directories can be executed by any user. $allowed_dirs = array('assets/snippets/ajaxSearch/'); +define("MGR_DIR", "manager"); // harden it -require_once('./manager/includes/protect.inc.php'); +require_once('./'.MGR_DIR.'/includes/protect.inc.php'); // initialize the variables prior to grabbing the config file $database_type = ""; @@ -19,7 +20,7 @@ // get the required includes if($database_user=='') { - if (!$rt = @include_once "manager/includes/config.inc.php") { + if (!$rt = @include_once MGR_DIR."/includes/config.inc.php") { exit('Could not load MODx configuration file!'); } } diff --git a/index.php b/index.php index ea46221a88..7167989e36 100644 --- a/index.php +++ b/index.php @@ -51,7 +51,7 @@ $mstart = memory_get_usage(); // harden it -require_once(dirname(__FILE__).'/manager/includes/protect.inc.php'); +require_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/protect.inc.php'); // set some settings, and address some IE issues @ini_set('url_rewriter.tags', ''); @@ -88,7 +88,7 @@ // get the required includes if($database_user=="") { - $rt = @include_once(dirname(__FILE__).'/manager/includes/config.inc.php'); + $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php'); // Be sure config.inc.php is there and that it contains some important values if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) { echo " diff --git a/manager/actions/files.dynamic.php b/manager/actions/files.dynamic.php index b4c88f297e..8ae1a6ced4 100644 --- a/manager/actions/files.dynamic.php +++ b/manager/actions/files.dynamic.php @@ -8,7 +8,7 @@ $newToken = makeToken(); // settings -$theme_image_path = $modx->config['site_url'] . 'manager/media/style/' . $modx->config['manager_theme'] . '/images/'; +$theme_image_path = $modx->config['site_manager_url'] . 'media/style/' . $modx->config['manager_theme'] . '/images/'; $excludes = array('.', '..', '.svn'); $alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix,'.') : ''; $editablefiles = explode(',', 'txt,php,shtml,html,htm,xml,js,css,pageCache,htaccess'.$alias_suffix); @@ -612,7 +612,7 @@ function logFileChange($type, $filename) $log->initAndWriteLog($string, '', '', '', $type, $filename); // HACK: change the global action to prevent double logging - // @see manager/index.php @ 915 + // @see index.php @ 915 global $action; $action = 1; } diff --git a/manager/actions/logging.static.php b/manager/actions/logging.static.php index ec4f3650bd..c53ea2071d 100644 --- a/manager/actions/logging.static.php +++ b/manager/actions/logging.static.php @@ -289,7 +289,7 @@ function convertdate($date) { getFullTableName("site_metatags")." st ". "ORDER BY name"; $ds = mysql_query($sql); - include_once $base_path."manager/includes/controls/datagrid.class.php"; + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; $grd = new DataGrid('',$ds,$number_of_results); // set page size to 0 t show all items $grd->noRecordMsg = $_lang["no_records_found"]; $grd->cssClass="grid"; diff --git a/manager/actions/modules.static.php b/manager/actions/modules.static.php index 1a19ab8aac..4c10821095 100644 --- a/manager/actions/modules.static.php +++ b/manager/actions/modules.static.php @@ -27,7 +27,7 @@ // context menu -include_once $base_path."manager/includes/controls/contextmenu.php"; +include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php"; $cm = new ContextMenu("cntxm", 150); $cm->addItem($_lang["run_module"],"js:menuAction(1)",$_style['icons_save'],(!$modx->hasPermission('exec_module') ? 1:0)); $cm->addSeparator(); @@ -97,7 +97,7 @@ function menuAction(a) { (!empty($sqlQuery) ? " WHERE (name LIKE '%$sqlQuery%') OR (description LIKE '%$sqlQuery%')":"")." ". "ORDER BY name"; $ds = mysql_query($sql); - include_once $base_path."manager/includes/controls/datagrid.class.php"; + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; $grd = new DataGrid('',$ds,$number_of_results); // set page size to 0 t show all items $grd->noRecordMsg = $_lang["no_records_found"]; $grd->cssClass="grid"; diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index 337dec344b..d456960a75 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -308,7 +308,7 @@ function OpenServerBrowser(url, width, height ) { function BrowseServer() { var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser("manager/media/browser/mcpuk/browser.html?Type=images&Connector=manager/media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); + OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); } function SetUrl(url, width, height, alt) { @@ -463,7 +463,7 @@ function SetUrl(url, width, height, alt) { if (!$ds) { echo "An error occured while loading module dependencies."; } else { - include_once $base_path."manager/includes/controls/datagrid.class.php"; + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; $grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items $grd->noRecordMsg = $_lang['no_records_found']; $grd->cssClass = 'grid'; diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php index dbb15da656..4e3941c9be 100644 --- a/manager/actions/mutate_module_resources.dynamic.php +++ b/manager/actions/mutate_module_resources.dynamic.php @@ -104,7 +104,7 @@ if ($cp) $modx->dbQuery('UPDATE '.$tbl_site_plugins.' SET moduleguid=\'\' WHERE id IN ('.implode(',', $plids).') AND moduleguid=\''.$guid.'\''); if ($cs) $modx->dbQuery('UPDATE '.$tbl_site_snippets.' SET moduleguid=\'\' WHERE id IN ('.implode(',', $snids).') AND moduleguid=\''.$guid.'\''); // reset cache - include_once $base_path."/manager/processors/cache_sync.class.processor.php"; + include_once MODX_MANAGER_PATH."processors/cache_sync.class.processor.php"; $sync = new synccache(); $sync->setCachepath("../assets/cache/"); $sync->setReport(false); @@ -241,7 +241,7 @@ function openSelector(resource,mode,callback,w,h){ echo "An error occured while loading module dependencies."; } else { - include_once $base_path."manager/includes/controls/datagrid.class.php"; + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; $grd = new DataGrid('',$ds,0); // set page size to 0 t show all items $grd->noRecordMsg = $_lang["no_records_found"]; $grd->cssClass="grid"; diff --git a/manager/actions/mutate_plugin_priority.dynamic.php b/manager/actions/mutate_plugin_priority.dynamic.php index 2be5c67976..9f66cf7d5e 100644 --- a/manager/actions/mutate_plugin_priority.dynamic.php +++ b/manager/actions/mutate_plugin_priority.dynamic.php @@ -34,7 +34,7 @@ } } // empty cache - include_once ($basePath.'manager/processors/cache_sync.class.processor.php'); + include_once (MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php'); $sync = new synccache(); $sync->setCachepath($basePath.'/assets/cache/'); $sync->setReport(false); diff --git a/manager/actions/mutate_template_tv_rank.dynamic.php b/manager/actions/mutate_template_tv_rank.dynamic.php index bb4ff2b524..960572d9ae 100644 --- a/manager/actions/mutate_template_tv_rank.dynamic.php +++ b/manager/actions/mutate_template_tv_rank.dynamic.php @@ -38,7 +38,7 @@ } } // empty cache - include_once ($basePath.'manager/processors/cache_sync.class.processor.php'); + include_once (MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php'); $sync = new synccache(); $sync->setCachepath($basePath.'/assets/cache/'); $sync->setReport(false); diff --git a/manager/actions/mutate_user.dynamic.php b/manager/actions/mutate_user.dynamic.php index 1488f48cdc..ef64e660d1 100644 --- a/manager/actions/mutate_user.dynamic.php +++ b/manager/actions/mutate_user.dynamic.php @@ -110,7 +110,7 @@ function ConvertDate($date) { // include the country list language file $_country_lang = array(); include_once "lang/country/english_country.inc.php"; -if($manager_language!="english" && file_exists($modx->config['base_path']."manager/includes/lang/country/".$manager_language."_country.inc.php")){ +if($manager_language!="english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")){ include_once "lang/country/".$manager_language."_country.inc.php"; } @@ -765,7 +765,7 @@ function OpenServerBrowser(url, width, height ) { function BrowseServer() { var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser("manager/media/browser/mcpuk/browser.html?Type=images&Connector=manager/media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); + OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); } function SetUrl(url, width, height, alt){ document.userform.photo.value = url; diff --git a/manager/actions/mutate_web_user.dynamic.php b/manager/actions/mutate_web_user.dynamic.php index 40cbee74ba..63a6c59142 100644 --- a/manager/actions/mutate_web_user.dynamic.php +++ b/manager/actions/mutate_web_user.dynamic.php @@ -105,7 +105,7 @@ function ConvertDate($date) { // include the country list language file $_country_lang = array(); -if($manager_language!="english" && file_exists($modx->config['base_path']."manager/includes/lang/country/".$manager_language."_country.inc.php")){ +if($manager_language!="english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")){ include_once "lang/country/".$manager_language."_country.inc.php"; } else { include_once "lang/country/english_country.inc.php"; @@ -233,10 +233,10 @@ function showHide(what, onoff){
  • " /> +
  • " />
    • @@ -492,7 +492,7 @@ function OpenServerBrowser(url, width, height ) { function BrowseServer() { var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser("manager/media/browser/mcpuk/browser.html?Type=images&Connector=manager/media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); + OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); } function SetUrl(url, width, height, alt){ document.userform.photo.value = url; diff --git a/manager/actions/resource_selector.static.php b/manager/actions/resource_selector.static.php index 876576fd0c..6ecb19de18 100644 --- a/manager/actions/resource_selector.static.php +++ b/manager/actions/resource_selector.static.php @@ -191,7 +191,7 @@ function setCheckbox(chk){ exit; } else { - include_once $base_path."manager/includes/controls/datagrid.class.php"; + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; $grd = new DataGrid('',$ds,$number_of_results); // set page size to 0 t show all items $grd->noRecordMsg = $_lang["no_records_found"]; $grd->cssClass="grid"; diff --git a/manager/actions/user_management.static.php b/manager/actions/user_management.static.php index 7695252c3e..4fedd40ccf 100644 --- a/manager/actions/user_management.static.php +++ b/manager/actions/user_management.static.php @@ -27,7 +27,7 @@ // context menu -include_once $base_path."manager/includes/controls/contextmenu.php"; +include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php"; $cm = new ContextMenu("cntxm", 150); $cm->addItem($_lang["edit"],"js:menuAction(1)","media/style/$manager_theme/images/icons/logging.gif",(!$modx->hasPermission('edit_user') ? 1:0)); $cm->addItem($_lang["delete"], "js:menuAction(2)","media/style/$manager_theme/images/icons/delete.gif",(!$modx->hasPermission('delete_user') ? 1:0)); @@ -133,7 +133,7 @@ function menuAction(a) { $sql .= "ORDER BY username"; $ds = mysql_query($sql); - include_once $base_path."manager/includes/controls/datagrid.class.php"; + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; $grd = new DataGrid('',$ds,$number_of_results); // set page size to 0 t show all items $grd->noRecordMsg = $_lang["no_records_found"]; $grd->cssClass="grid"; diff --git a/manager/actions/web_user_management.static.php b/manager/actions/web_user_management.static.php index 23fe5b7d66..957d7707d0 100644 --- a/manager/actions/web_user_management.static.php +++ b/manager/actions/web_user_management.static.php @@ -26,7 +26,7 @@ // context menu -include_once $base_path."manager/includes/controls/contextmenu.php"; +include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php"; $cm = new ContextMenu("cntxm", 150); $cm->addItem($_lang["edit"],"js:menuAction(1)","media/style/$manager_theme/images/icons/logging.gif",(!$modx->hasPermission('edit_user') ? 1:0)); $cm->addItem($_lang["delete"], "js:menuAction(2)","media/style/$manager_theme/images/icons/delete.gif",(!$modx->hasPermission('delete_user') ? 1:0)); @@ -115,7 +115,7 @@ function menuAction(a) { ($sqlQuery ? " WHERE (wu.username LIKE '$sqlQuery%') OR (wua.fullname LIKE '%$sqlQuery%') OR (wua.email LIKE '$sqlQuery%')":"")." ". "ORDER BY username"; $ds = mysql_query($sql); - include_once $base_path."manager/includes/controls/datagrid.class.php"; + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; $grd = new DataGrid('',$ds,$number_of_results); // set page size to 0 t show all items $grd->noRecordMsg = $_lang["no_records_found"]; $grd->cssClass="grid"; diff --git a/manager/includes/extenders/dbapi.mysql.class.inc.php b/manager/includes/extenders/dbapi.mysql.class.inc.php index 38a2710ee3..b9db3f5ec2 100644 --- a/manager/includes/extenders/dbapi.mysql.class.inc.php +++ b/manager/includes/extenders/dbapi.mysql.class.inc.php @@ -462,7 +462,7 @@ function getHTMLGrid($dsq, $params) { if (!is_resource($dsq)) $dsq = $this->query($dsq); if ($dsq) { - include_once MODX_BASE_PATH . '/manager/includes/controls/datagrid.class.php'; + include_once MODX_MANAGER_PATH . 'includes/controls/datagrid.class.php'; $grd = new DataGrid('', $dsq); $grd->noRecordMsg = $params['noRecordMsg']; diff --git a/manager/includes/rss.inc.php b/manager/includes/rss.inc.php index 645240b745..9e9b6f9bee 100644 --- a/manager/includes/rss.inc.php +++ b/manager/includes/rss.inc.php @@ -28,7 +28,7 @@ // include MagPieRSS $basePath = $modx->config['base_path']; -require_once($basePath.'manager/media/rss/rss_fetch.inc'); +require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc'); $feedData = array(); diff --git a/manager/includes/sysalert.display.inc.php b/manager/includes/sysalert.display.inc.php index 15f69ba20e..6ca21f4b0b 100755 --- a/manager/includes/sysalert.display.inc.php +++ b/manager/includes/sysalert.display.inc.php @@ -24,7 +24,7 @@ ?> config['base_url'].'manager/media/style/'.$manager_theme.'/style.css'.'" />'; + echo ''; ?> + + diff --git a/install/changelog.txt b/install/changelog.txt index d634bae795..95a849e476 100755 --- a/install/changelog.txt +++ b/install/changelog.txt @@ -116,14 +116,14 @@ Bugfixes: * [#5807] manager.lockout not styled properly * [#6119] sendMailMessage in save_web_user.processor.php * [#7204] eForm in eFormParseTemplate $formats and $labels are declared as string but they are used as array -* [#7459] Deprecated function 'split' used in manager/includes/datefunctions.inc.php +* [#7459] Deprecated function 'split' used in includes/datefunctions.inc.php * [#9398] eForm & php 5.3 * [#9547] ManagerManager Tv-transfer options with multiple choice in a new tab * [#9548] cant modify the customTV(multiTv or other without type input) with ManagerManager * [#9549] page not index in yandex if use FirstChildRedirect * [#9550] Breadcrumbs not have crumbSeparator * [#9563] onManagerMainFrameHeaderHTMLBlock event issue -* [#9580] Bug in manager/processors/delete_content.processor.php on line 40 +* [#9580] Bug in processors/delete_content.processor.php on line 40 * [#9586] Quick Manager and system setting Automatic Template Assignment * [#9620] Set Manager language in Create/Edit User @@ -363,7 +363,7 @@ Bugfixes: * [#MODX-1106] Change help icons on TV create/edit screen * [#MODX-1103] Element Selector, part of the letters hides in search box * [#MODX-1566] Fix problem with Forgot Password confirmation link in WebLogin -* [#MODX-1659] Stay option for adding another manager/web user not working correctly +* [#MODX-1659] Stay option for adding another manager web user not working correctly * [#MODX-1164] Unable to set cssStyle when using getHTMLGrid * [#MODX-1176] Correct the permissions check when duplicating chunks and plugins * [#MODX-1753] Fix help page layout in manager diff --git a/install/index.php b/install/index.php index 06922eea9f..74ed0dee09 100755 --- a/install/index.php +++ b/install/index.php @@ -17,7 +17,7 @@ define("MGR_DIR", "manager"); require_once("lang.php"); -require_once('../manager/includes/version.inc.php'); +require_once('../'.MGR_DIR.'/includes/version.inc.php'); // start session session_start(); diff --git a/install/instprocessor.php b/install/instprocessor.php index 9088b29426..498dfec2dc 100755 --- a/install/instprocessor.php +++ b/install/instprocessor.php @@ -1,4 +1,5 @@ ".$_lang['ok']."

    "; } } - +$mgrdir = 'define(\'MGR_DIR\', \'manager\');'; // write the config.inc.php file if new installation echo "

    " . $_lang['writing_config_file']; $configString = ' 1) array_pop($a); - $url= implode("manager", $a); + $url= implode(MGR_DIR, $a); reset($a); - $a= explode("manager", str_replace("\\\\", "/", dirname(__FILE__))); + $a= explode(MGR_DIR, str_replace("\\\\", "/", dirname(__FILE__))); if (count($a) > 1) array_pop($a); - $pth= implode("manager", $a); + $pth= implode(MGR_DIR, $a); unset ($a); $base_url= $url . (substr($url, -1) != "/" ? "/" : ""); $base_path= $pth . (substr($pth, -1) != "/" && substr($pth, -1) != "\\\\" ? "/" : ""); @@ -246,15 +247,15 @@ function parseProperties($propertyString) { $site_url= ((isset ($_SERVER[\'HTTPS\']) && strtolower($_SERVER[\'HTTPS\']) == \'on\') || $_SERVER[\'SERVER_PORT\'] == $https_port) ? \'https://\' : \'http://\'; $site_url .= $_SERVER[\'HTTP_HOST\']; if ($_SERVER[\'SERVER_PORT\'] != 80) - $site_url= str_replace(\':\' . $_SERVER[\'SERVER_PORT\'], \'\', $site_url); // remove port from HTTP_HOST + $site_url= str_replace(\':\' . $_SERVER[\'SERVER_PORT\'], \'\', $site_url); // remove port from HTTP_HOST   $site_url .= ($_SERVER[\'SERVER_PORT\'] == 80 || (isset ($_SERVER[\'HTTPS\']) && strtolower($_SERVER[\'HTTPS\']) == \'on\') || $_SERVER[\'SERVER_PORT\'] == $https_port) ? \'\' : \':\' . $_SERVER[\'SERVER_PORT\']; $site_url .= $base_url; if (!defined(\'MODX_BASE_PATH\')) define(\'MODX_BASE_PATH\', $base_path); if (!defined(\'MODX_BASE_URL\')) define(\'MODX_BASE_URL\', $base_url); if (!defined(\'MODX_SITE_URL\')) define(\'MODX_SITE_URL\', $site_url); -if (!defined(\'MODX_MANAGER_PATH\')) define(\'MODX_MANAGER_PATH\', $base_path.\'manager/\'); -if (!defined(\'MODX_MANAGER_URL\')) define(\'MODX_MANAGER_URL\', $site_url.\'manager/\'); +if (!defined(\'MODX_MANAGER_PATH\')) define(\'MODX_MANAGER_PATH\', $base_path.MGR_DIR.\'/\'); +if (!defined(\'MODX_MANAGER_URL\')) define(\'MODX_MANAGER_URL\', $site_url.MGR_DIR.\'/\'); // start cms session if(!function_exists(\'startCMSSession\')) { @@ -279,7 +280,7 @@ function startCMSSession(){ } }'; $configString .= "\n?>"; -$filename = '../manager/includes/config.inc.php'; +$filename = '../'.MGR_DIR.'/includes/config.inc.php'; $configFileFailed = false; if (@ !$handle = fopen($filename, 'w')) { $configFileFailed = true; @@ -298,7 +299,7 @@ function startCMSSession(){ echo "" . $_lang['failed'] . "

    "; $errors += 1; ?> -

    manager/includes/config.inc.php

    +

    /includes/config.inc.php

    @@ -700,13 +701,14 @@ function startCMSSession(){ // Setup the MODx API -- needed for the cache processor define('MODX_API_MODE', true); define('MODX_BASE_PATH', $base_path); +if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/'); $database_type = 'mysql'; // initiate a new document parser -include_once('../manager/includes/document.parser.class.inc.php'); +include_once('../'.MGR_DIR.'/includes/document.parser.class.inc.php'); $modx = new DocumentParser; $modx->db->connect(); // always empty cache after install -include_once "../manager/processors/cache_sync.class.processor.php"; +include_once "../".MGR_DIR."/processors/cache_sync.class.processor.php"; $sync = new synccache(); $sync->setCachepath("../assets/cache/"); $sync->setReport(false); diff --git a/install/lang/bulgarian.inc.php b/install/lang/bulgarian.inc.php index 97a3f841e5..37fdf55772 100644 --- a/install/lang/bulgarian.inc.php +++ b/install/lang/bulgarian.inc.php @@ -29,13 +29,13 @@ $_lang["btnclose_value"] = 'Затваряне'; $_lang["btnnext_value"] = 'Напред'; $_lang["cant_write_config_file"] = 'MODx не успя да запише конфигурационния файл. Моля, копирайте следното във файла '; -$_lang["cant_write_config_file_note"] = 'След като инсталацията завърши, можете да се логнете в Мениджъра на MODx, като напишете в браузера си YourSiteName.com/manager/.'; +$_lang["cant_write_config_file_note"] = 'След като инсталацията завърши, можете да се логнете в Мениджъра на MODx, като напишете в браузера си YourSiteName.com/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Опции:'; $_lang["checking_if_cache_exist"] = 'Проверка дали съществува директорията assets/cache : '; $_lang["checking_if_cache_file2_writable"] = 'Проверка дали може да се пише във файла assets/cache/sitePublishing.idx.php : '; $_lang["checking_if_cache_file_writable"] = 'Проверка дали може да се пише във файла assets/cache/siteCache.idx.php : '; $_lang["checking_if_cache_writable"] = 'Проверка дали в директорията assets/cache може да се пише: '; -$_lang["checking_if_config_exist_and_writable"] = 'Проверка дали manager/includes/config.inc.php съществува и може да се пише в него: '; +$_lang["checking_if_config_exist_and_writable"] = 'Проверка дали '.MGR_DIR.'/includes/config.inc.php съществува и може да се пише в него: '; $_lang["checking_if_export_exists"] = 'Проверка дали съществува директорията assets/export : '; $_lang["checking_if_export_writable"] = 'Проверка дали в директорията assets/export може да се пише: '; $_lang["checking_if_images_exist"] = 'Проверка дали съществува директорията assets/images : '; @@ -48,7 +48,7 @@ $_lang["checking_sessions"] = 'Проверка дали сесиите са правилно конфигурирани: '; $_lang["checking_table_prefix"] = 'Проверка на префикса на таблицата `'; $_lang["chunks"] = 'Чънкове'; -$_lang["config_permissions_note"] = 'За нови Linux/Unix инсталации, моля, създайте празен файл с име config.inc.php в директорията manager/includes/ и задайте права на файла 0666.'; +$_lang["config_permissions_note"] = 'За нови Linux/Unix инсталации, моля, създайте празен файл с име config.inc.php в директорията '.MGR_DIR.'/includes/ и задайте права на файла 0666.'; $_lang["connection_screen_collation"] = 'Колация:'; $_lang["connection_screen_connection_information"] = 'Информация за връзката'; $_lang["connection_screen_connection_method"] = 'Начин на свързване - метод:'; @@ -156,7 +156,7 @@ $_lang["table_prefix_not_exist"] = ' - Префиксът на таблицата не съществува в тази БД!'; $_lang["table_prefix_not_exist_note"] = 'Инсталаторът не може да инсталира в избраната БД, тъй като тя не съдържа таблици със зададения префикс, които да бъдат обновявени. Моля, изберете съществуващ префикс на таблица и стартирайте Инсталатора отново.'; $_lang["templates"] = 'Шаблони'; -$_lang["to_log_into_content_manager"] = 'За да се логнете в Мениджъра (manager/index.php) кликнете на бутона `Затваряне` .'; +$_lang["to_log_into_content_manager"] = 'За да се логнете в Мениджъра ('.MGR_DIR.'/index.php) кликнете на бутона `Затваряне` .'; $_lang["toggle"] = 'Включване'; $_lang["unable_install_chunk"] = 'Не успя да инсталира Чънк. Файл'; $_lang["unable_install_module"] = 'Не успя да инсталира Модул. Файл'; diff --git a/install/lang/czech.inc.php b/install/lang/czech.inc.php index a71d569849..d3f94c6be3 100644 --- a/install/lang/czech.inc.php +++ b/install/lang/czech.inc.php @@ -32,13 +32,13 @@ $_lang["btnclose_value"] = 'Zavřít'; $_lang["btnnext_value"] = 'Další'; $_lang["cant_write_config_file"] = 'MODx nemohl zapsat konfigurační soubor. Následující obsah vložte do souboru '; -$_lang["cant_write_config_file_note"] = 'Až bude tento obsah uložen v souboru, můžete se přihlásit do MODx správce obsahu na adrese AdresaVasichStranek.cz/manager/.'; +$_lang["cant_write_config_file_note"] = 'Až bude tento obsah uložen v souboru, můžete se přihlásit do MODx správce obsahu na adrese AdresaVasichStranek.cz/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Možnosti výběru zaškrtávacích polí:'; $_lang["checking_if_cache_exist"] = 'Kontrola existence adresářů /assets/cache a /assets/cache/rss: '; $_lang["checking_if_cache_file_writable"] = 'Kontrola zda lze zapisovat do souboru /assets/cache/siteCache.idx.php: '; $_lang["checking_if_cache_file2_writable"] = 'Kontrola zda lze zapisovat do souboru /assets/cache/sitePublishing.idx.php: '; $_lang["checking_if_cache_writable"] = 'Kontrola zda lze zapisovat do adresářů /assets/cache a /assets/cache/rss: '; -$_lang["checking_if_config_exist_and_writable"] = 'Kontrola zda existuje soubor /manager/includes/config.inc.php a lze do něj zapisovat: '; +$_lang["checking_if_config_exist_and_writable"] = 'Kontrola zda existuje soubor /'.MGR_DIR.'/includes/config.inc.php a lze do něj zapisovat: '; $_lang["checking_if_export_exists"] = 'Kontrola existence adresáře /assets/export: '; $_lang["checking_if_export_writable"] = 'Kontrola zda lze zapisovat do adresáře /assets/export: '; $_lang["checking_if_images_exist"] = 'Kontrola zda existují adresáře /assets/images, /assets/files, /assets/flash a /assets/media: '; @@ -51,7 +51,7 @@ $_lang["checking_sessions"] = 'Kontrola zda jsou správně nakonfigurovány session: '; $_lang["checking_table_prefix"] = 'Kontrola prefixů tabulek `'; $_lang["chunks"] = 'Chunky'; -$_lang["config_permissions_note"] = 'V nových instalacích Linux/Unix vytvořte prázdná soubor s názvem config.inc.php v adresáři /manager/includes/ s atributy 0666.'; +$_lang["config_permissions_note"] = 'V nových instalacích Linux/Unix vytvořte prázdná soubor s názvem config.inc.php v adresáři /'.MGR_DIR.'/includes/ s atributy 0666.'; $_lang["connection_screen_collation"] = 'Porovnání:'; $_lang["connection_screen_connection_method"] = 'Způsob připojení:'; $_lang["connection_screen_database_connection_information"] = 'Informace o databázi'; @@ -174,7 +174,7 @@ $_lang["table_prefix_not_exist"] = ' - Tabulky s daným prefixem v této databázi neexistují!'; $_lang["table_prefix_not_exist_note"] = 'Instalátor nemohl provést instalaci do vybrané databáze, neboť neobsahuje tabulky se zadaným prefixem. Vyberte existující prefix tabulek a spusťte instalátor znovu.'; $_lang["templates"] = 'Šablony'; -$_lang["to_log_into_content_manager"] = 'Pro přihlášení do správce obsahu (manager/index.php) klikněte na tlačítko "Zavřít".'; +$_lang["to_log_into_content_manager"] = 'Pro přihlášení do správce obsahu ('.MGR_DIR.'/index.php) klikněte na tlačítko "Zavřít".'; $_lang["toggle"] = 'Přepnutí'; $_lang['tvs'] = 'Template Variables'; $_lang["unable_install_chunk"] = 'Nepodařilo se nainstalovat chunk. Soubor'; diff --git a/install/lang/danish.inc.php b/install/lang/danish.inc.php index f71ec56a0a..8365350f12 100644 --- a/install/lang/danish.inc.php +++ b/install/lang/danish.inc.php @@ -31,13 +31,13 @@ $_lang["btnclose_value"] = 'Luk'; $_lang["btnnext_value"] = 'Næste'; $_lang["cant_write_config_file"] = 'MODx kunne ikke gemme konfigurationsfilen. Du skal kopiere nedenstående ind i filen '; -$_lang["cant_write_config_file_note"] = 'Når dette er gjort, kan du logge ind i MODx på adressen http://Ditdomænenavn.dk/manager/.'; +$_lang["cant_write_config_file_note"] = 'Når dette er gjort, kan du logge ind i MODx på adressen http://Ditdomænenavn.dk/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Valgmuligheder:'; $_lang["checking_if_cache_exist"] = 'Kontrollerer om /assets/cache og /assets/cache/rss mapperne er oprettet: '; $_lang["checking_if_cache_file_writable"] = 'Kontrollerer om /assets/cache/siteCache.idx.php filen er skrivbar: '; $_lang["checking_if_cache_file2_writable"] = 'Kontrollerer om /assets/cache/sitePublishing.idx.php filen er skrivbar: '; $_lang["checking_if_cache_writable"] = 'Kontrollerer om /assets/cache og /assets/cache/rss mapperne er skrivbare: '; -$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer om /manager/includes/config.inc.php er oprettet og er skrivbar: '; +$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer om /'.MGR_DIR.'/includes/config.inc.php er oprettet og er skrivbar: '; $_lang["checking_if_export_exists"] = 'Kontrollerer om /assets/export mappen er oprettet: '; $_lang["checking_if_export_writable"] = 'Kontrollerer om /assets/export mappen er skrivbar: '; $_lang["checking_if_images_exist"] = 'Kontrollerer om /assets/images, /assets/files, /assets/flash og /assets/media mapperne er oprettet: '; @@ -50,7 +50,7 @@ $_lang["checking_sessions"] = 'Kontrollerer om sessions er korrekt konfigureret: '; $_lang["checking_table_prefix"] = 'Kontrollerer database tabellernes præfiks `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Ved nyinstallation under Linux eller Unix, skal du oprette en tom fil, med navnet config.inc.php i /manager/includes/ mappen, med filrettighederne indstillet til 0666.'; +$_lang["config_permissions_note"] = 'Ved nyinstallation under Linux eller Unix, skal du oprette en tom fil, med navnet config.inc.php i /'.MGR_DIR.'/includes/ mappen, med filrettighederne indstillet til 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_method"] = 'Connection\'s metode:'; $_lang["connection_screen_database_connection_information"] = 'Database information'; @@ -173,7 +173,7 @@ $_lang["table_prefix_not_exist"] = ' - Tabellens præfiks eksisterer ikke i denne database!'; $_lang["table_prefix_not_exist_note"] = 'Installationsprogrammet kunne ikke installere i den valgte database, da de eksisterende tabeller du har valgt der skal opdateres, ikke indeholder det præfiks du har indtastet. Indtast et eksisterende tabel præfiks og prøv at køre installationsprogrammet igen.'; $_lang["templates"] = 'Skabeloner'; -$_lang["to_log_into_content_manager"] = 'For at logge ind i CMS\'et (manager/index.php) skal du klikke på `Luk` knappen.'; +$_lang["to_log_into_content_manager"] = 'For at logge ind i CMS\'et ('.MGR_DIR.'/index.php) skal du klikke på `Luk` knappen.'; $_lang["toggle"] = 'Byt om på det valgte'; $_lang['tvs'] = 'Skabelon variabler'; $_lang["unable_install_chunk"] = 'Kunne ikke installere chunk. Fil'; diff --git a/install/lang/english.inc.php b/install/lang/english.inc.php index 2d483e8ab0..2c23809eda 100644 --- a/install/lang/english.inc.php +++ b/install/lang/english.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Close'; $_lang["btnnext_value"] = 'Next'; $_lang["cant_write_config_file"] = 'MODX couldn\'t write the config file. Please copy the following into the file '; -$_lang["cant_write_config_file_note"] = 'Once that\'s been done, you can log into MODX Admin by pointing your browser at YourSiteName.com/manager/.'; +$_lang["cant_write_config_file_note"] = 'Once that\'s been done, you can log into MODX Admin by pointing your browser at YourSiteName.com/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Checkbox select options:'; $_lang["checking_if_cache_exist"] = 'Checking if /assets/cache and /assets/cache/rss directories exist: '; $_lang["checking_if_cache_file_writable"] = 'Checking if /assets/cache/siteCache.idx.php file is writable: '; $_lang["checking_if_cache_file2_writable"] = 'Checking if /assets/cache/sitePublishing.idx.php file is writable: '; $_lang["checking_if_cache_writable"] = 'Checking if /assets/cache and /assets/cache/rss directories are writable: '; -$_lang["checking_if_config_exist_and_writable"] = 'Checking if /manager/includes/config.inc.php exists and is writable: '; +$_lang["checking_if_config_exist_and_writable"] = 'Checking if /'.MGR_DIR.'/includes/config.inc.php exists and is writable: '; $_lang["checking_if_export_exists"] = 'Checking if /assets/export directory exists: '; $_lang["checking_if_export_writable"] = 'Checking if /assets/export directory is writable: '; $_lang["checking_if_images_exist"] = 'Checking if /assets/images, /assets/files, /assets/flash and /assets/media directories exists: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Checking if sessions are properly configured: '; $_lang["checking_table_prefix"] = 'Checking table prefix `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'For new Linux/Unix installs, please create a blank file named config.inc.php in the /manager/includes/ directory with file permissions set to 0666.'; +$_lang["config_permissions_note"] = 'For new Linux/Unix installs, please create a blank file named config.inc.php in the /'.MGR_DIR.'/includes/ directory with file permissions set to 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_method"] = 'Connection method:'; $_lang["connection_screen_database_connection_information"] = 'Database information'; @@ -172,7 +172,7 @@ $_lang["table_prefix_not_exist"] = ' - Table prefix does not exist in this database!'; $_lang["table_prefix_not_exist_note"] = 'Setup couldn\'t install into the selected database, as it does not contain existing tables with the prefix you specified to be upgraded. Please choose an existing table prefix, and run Setup again.'; $_lang["templates"] = 'Templates'; -$_lang["to_log_into_content_manager"] = 'To log into the Content Manager (manager/index.php) you can click on the `Close` button.'; +$_lang["to_log_into_content_manager"] = 'To log into the Content Manager ('.MGR_DIR.'/index.php) you can click on the `Close` button.'; $_lang["toggle"] = 'Toggle'; $_lang['tvs'] = 'Template Variables'; $_lang["unable_install_chunk"] = 'Unable to install chunk. File'; diff --git a/install/lang/finnish-utf8.inc.php b/install/lang/finnish-utf8.inc.php index 244f5cd3d0..6e9f534410 100644 --- a/install/lang/finnish-utf8.inc.php +++ b/install/lang/finnish-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Sulje'; $_lang["btnnext_value"] = 'Seuraava'; $_lang["cant_write_config_file"] = 'MODx ei voinut kirjoittaa asetukset tiedostoa. Ole hyvä ja kopioi seuraava asetustiedostoon '; -$_lang["cant_write_config_file_note"] = 'Kun tämä on tehty, voit kirjautua MODx hallintaan osoitteessa sinunosoite.fi/manager/.'; +$_lang["cant_write_config_file_note"] = 'Kun tämä on tehty, voit kirjautua MODx hallintaan osoitteessa sinunosoite.fi/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Valitse valintaruuduista:'; $_lang["checking_if_cache_exist"] = 'Tarkistetaan onko kansiot /assets/cache ja /assets/cache/rss olemassa: '; $_lang["checking_if_cache_file_writable"] = 'Tarkistetaan voiko tiedostoon /assets/cache/siteCache.idx.php kirjoittaa: '; $_lang["checking_if_cache_file2_writable"] = 'Tarkistetaan voiko tiedostoon /assets/cache/sitePublishing.idx.php kirjoittaa: '; $_lang["checking_if_cache_writable"] = 'Tarkistetaan voiko kansioihin /assets/cache ja /assets/cache/rss luoda uusia tiedostoja: '; -$_lang["checking_if_config_exist_and_writable"] = 'Tarkistetaan onko asetustiedosto manager/includes/config.inc.php olemassa ja voiko siihen kirjoittaa: '; +$_lang["checking_if_config_exist_and_writable"] = 'Tarkistetaan onko asetustiedosto '.MGR_DIR.'/includes/config.inc.php olemassa ja voiko siihen kirjoittaa: '; $_lang["checking_if_export_exists"] = 'Tarkistetaan onko kansio /assets/export olemassa: '; $_lang["checking_if_export_writable"] = 'Tarkistetaan voiko kansioon /assets/export luoda uusia tiedostoja: '; $_lang["checking_if_images_exist"] = 'Tarkistetaan onko kansiot /assets/images, /assets/files, /assets/flash ja /assets/media olemassa: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Tarkistetaan onko palvelinistunnot asetettu toimimaan oikein: '; $_lang["checking_table_prefix"] = 'Tarkistetaan tietokannan taulujen etuliite `'; $_lang["chunks"] = 'HTML-palaset'; -$_lang["config_permissions_note"] = 'Jos olet asentamassa järjestelmää Linux / Unix palvelimeen, luo kansioon manager/includes/ tyhjä tiedosto nimeltä config.inc.php ja aseta tiedostoon 0666 oikeudet.'; +$_lang["config_permissions_note"] = 'Jos olet asentamassa järjestelmää Linux / Unix palvelimeen, luo kansioon '.MGR_DIR.'/includes/ tyhjä tiedosto nimeltä config.inc.php ja aseta tiedostoon 0666 oikeudet.'; $_lang["connection_screen_collation"] = 'Merkistö:'; $_lang["connection_screen_connection_method"] = 'Yhteystyyppi:'; $_lang["connection_screen_database_connection_information"] = 'Tietokannan yhteysasetukset'; @@ -166,7 +166,7 @@ $_lang["table_prefix_not_exist"] = ' - Tietokannan taulujen etuliitettä ei löydetty tästä tietokannasta!'; $_lang["table_prefix_not_exist_note"] = 'Asennusohjelma ei voinut asentaa valittuun tietokantaan, koska se ei sisällä tauluja asetetulla etuliitteellä, jotka asetit päivitystietoihin. Ole hyvä ja valitse uusi etuliite ja yritä uudelleen.'; $_lang["templates"] = 'Sivupohjat'; -$_lang["to_log_into_content_manager"] = 'Kirjautuaksesi sisällönhallintajärjestelmään (manager/index.php) napsauta `Sulje` painiketta.'; +$_lang["to_log_into_content_manager"] = 'Kirjautuaksesi sisällönhallintajärjestelmään ('.MGR_DIR.'/index.php) napsauta `Sulje` painiketta.'; $_lang["toggle"] = 'Vastakkaiset'; $_lang["unable_install_chunk"] = 'HTML-palasta ei voitu asentaa. Tiedosto'; $_lang["unable_install_module"] = 'Moduulia ei voitu asentaa. Tiedosto'; diff --git a/install/lang/francais-utf8.inc.php b/install/lang/francais-utf8.inc.php index c0378300c5..4962818df1 100644 --- a/install/lang/francais-utf8.inc.php +++ b/install/lang/francais-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Fermer'; $_lang["btnnext_value"] = 'Suivant'; $_lang["cant_write_config_file"] = 'MODx n\'a pas pu écrire le fichier de configuration. Veuillez copier/coller ceci dans le fichier '; -$_lang["cant_write_config_file_note"] = 'Une fois l\'opération effectuée, vous pouvez vous connecter à l\'interface d\'administration de MODx en utilisant l\'adresse VotreSite.com/manager/.'; +$_lang["cant_write_config_file_note"] = 'Une fois l\'opération effectuée, vous pouvez vous connecter à l\'interface d\'administration de MODx en utilisant l\'adresse VotreSite.com/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Cochez pour sélectionner les options:'; $_lang["checking_if_cache_exist"] = 'Vérification de l\'existence du répertoire assets/cache: '; $_lang["checking_if_cache_file2_writable"] = 'Vérification des droits en écriture du fichier assets/cache/sitePublishing.idx.php: '; $_lang["checking_if_cache_file_writable"] = 'Vérification des droits en écriture du fichier assets/cache/siteCache.idx.php: '; $_lang["checking_if_cache_writable"] = 'Vérification des droits en écriture du répertoire assets/cache: '; -$_lang["checking_if_config_exist_and_writable"] = 'Vérification de l\'existence et des droits en écriture du fichier manager/includes/config.inc.php: '; +$_lang["checking_if_config_exist_and_writable"] = 'Vérification de l\'existence et des droits en écriture du fichier '.MGR_DIR.'/includes/config.inc.php: '; $_lang["checking_if_export_exists"] = 'Vérification de l\'existence du répertoire assets/export: '; $_lang["checking_if_export_writable"] = 'Vérification des droits en écriture du répertoire assets/export: '; $_lang["checking_if_images_exist"] = 'Vérification de l\'existence du répertoire assets/images: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Vérifications des paramètres de sessions: '; $_lang["checking_table_prefix"] = 'Vérification du préfixe de table `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Lors des installations Linux/Unix, veuillez créer un nouveau fichier nommé config.inc.php dans le répertoire manager/includes/ avec les droits d\'accès 0666.'; +$_lang["config_permissions_note"] = 'Lors des installations Linux/Unix, veuillez créer un nouveau fichier nommé config.inc.php dans le répertoire '.MGR_DIR.'/includes/ avec les droits d\'accès 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_method"] = 'Méthode de connexion:'; $_lang["connection_screen_database_connection_information"] = 'Informations base de données'; @@ -172,7 +172,7 @@ $_lang["table_prefix_not_exist"] = ' - Le préfixe de table n\'existe pas dans la base de données!'; $_lang["table_prefix_not_exist_note"] = 'Le programme d\'installation n\'a pas pu utiliser la base de données spécifiée parce qu\'elle ne contient pas de tables comportant le préfixe que vous avez choisi pour la mise à jour. Veuillez choisir un préfixe de table existant et recommencer l\'installation.'; $_lang["templates"] = 'Modèles'; -$_lang["to_log_into_content_manager"] = 'Pour vous connecter au Gestionnaire de Contenu (manager/index.php), cliquez sur le bouton «Fermer».'; +$_lang["to_log_into_content_manager"] = 'Pour vous connecter au Gestionnaire de Contenu ('.MGR_DIR.'/index.php), cliquez sur le bouton «Fermer».'; $_lang["toggle"] = 'Intervertir'; $_lang['tvs'] = 'Variables de Template'; $_lang["unable_install_chunk"] = 'Impossible d\'installer le Chunk. Fichier'; diff --git a/install/lang/german.inc.php b/install/lang/german.inc.php index f1024a3b01..5e101df38f 100644 --- a/install/lang/german.inc.php +++ b/install/lang/german.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Schließen'; $_lang["btnnext_value"] = 'Weiter'; $_lang["cant_write_config_file"] = 'MODx konnte die Konfigurationsdatei nicht erstellen. Bitte fügen Sie folgendes in eine leere Datei ein:'; - $_lang["cant_write_config_file_note"] = 'Sobald dieser Vorgang beendet ist, können Sie sich im MODx-Manager anmelden unter http://ihredomain.de/manager/.'; + $_lang["cant_write_config_file_note"] = 'Sobald dieser Vorgang beendet ist, können Sie sich im MODx-Manager anmelden unter http://ihredomain.de/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Checkbox-Auswahlmöglichkeiten:'; $_lang["checking_if_cache_exist"] = 'Überprüfen ob Ordner assets/cache existiert: '; $_lang["checking_if_cache_file2_writable"] = 'Überprüfen ob die Datei assets/cache/sitePublishing.idx.php beschreibbar ist: '; $_lang["checking_if_cache_file_writable"] = 'Überprüfen ob die Datei assets/cache/siteCache.idx.php beschreibbar ist: '; $_lang["checking_if_cache_writable"] = 'Überprüfen ob der Ordner assets/cache beschreibbar ist: '; - $_lang["checking_if_config_exist_and_writable"] = 'Überprüfen ob die Datei manager/includes/config.inc.php existiert und beschreibbar ist: '; + $_lang["checking_if_config_exist_and_writable"] = 'Überprüfen ob die Datei '.MGR_DIR.'/includes/config.inc.php existiert und beschreibbar ist: '; $_lang["checking_if_export_exists"] = 'Überprüfen ob der Ordner assets/export existiert: '; $_lang["checking_if_export_writable"] = 'Überprüfen ob der Ordner assets/export beschreibbar ist: '; $_lang["checking_if_images_exist"] = 'Überprüfen ob der Ordner assets/images, assets/files, assets/flash, assets/media existiert: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Überprüfe ob die Sessions sauber definiert sind: '; $_lang["checking_table_prefix"] = 'Überprüfe Tabellen-Präfixe `'; $_lang["chunks"] = 'Chunks'; - $_lang["config_permissions_note"] = 'Für neue Linux/Unix Installationen bitt eine leere Datei config.inc.php im Ordner manager/includes/ anlegen und die Dateirechte auf 0666 setzen.'; + $_lang["config_permissions_note"] = 'Für neue Linux/Unix Installationen bitt eine leere Datei config.inc.php im Ordner '.MGR_DIR.'/includes/ anlegen und die Dateirechte auf 0666 setzen.'; $_lang["connection_screen_collation"] = 'Kollation:'; $_lang["connection_screen_connection_method"] = 'Verbindungsmethode:'; $_lang["connection_screen_database_connection_information"] = 'Datenbankinformationen'; diff --git a/install/lang/hebrew.inc.php b/install/lang/hebrew.inc.php index 4c1613cba9..c5000fc981 100755 --- a/install/lang/hebrew.inc.php +++ b/install/lang/hebrew.inc.php @@ -31,13 +31,13 @@ $_lang["btnclose_value"] = 'סגור'; $_lang["btnnext_value"] = 'הבא'; $_lang["cant_write_config_file"] = 'MODx couldn\'t write the config file. Please copy the following into the file '; -$_lang["cant_write_config_file_note"] = 'Once that\'s been done, you can log into MODx Admin by pointing your browser at YourSiteName.com/manager/.'; +$_lang["cant_write_config_file_note"] = 'Once that\'s been done, you can log into MODx Admin by pointing your browser at YourSiteName.com/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'אפשרויות שדה סימון:'; $_lang["checking_if_cache_exist"] = 'Checking if assets/cache directory exists: '; $_lang["checking_if_cache_file2_writable"] = 'Checking if assets/cache/sitePublishing.idx.php file is writable: '; $_lang["checking_if_cache_file_writable"] = 'Checking if assets/cache/siteCache.idx.php file is writable: '; $_lang["checking_if_cache_writable"] = 'Checking if assets/cache directory is writable: '; -$_lang["checking_if_config_exist_and_writable"] = 'Checking if manager/includes/config.inc.php exists and is writable: '; +$_lang["checking_if_config_exist_and_writable"] = 'Checking if '.MGR_DIR.'/includes/config.inc.php exists and is writable: '; $_lang["checking_if_export_exists"] = 'Checking if assets/export directory exists: '; $_lang["checking_if_export_writable"] = 'Checking if assets/export directory is writable: '; $_lang["checking_if_images_exist"] = 'Checking if assets/images directory exists: '; @@ -50,7 +50,7 @@ $_lang["checking_sessions"] = 'Checking if sessions are properly configured: '; $_lang["checking_table_prefix"] = 'Checking table prefix '; $_lang["chunks"] = 'מיני תבניות'; -$_lang["config_permissions_note"] = 'For new Linux/Unix installs, please create a blank file named config.inc.php in the manager/includes/ directory with file permissions set to 0666.'; +$_lang["config_permissions_note"] = 'For new Linux/Unix installs, please create a blank file named config.inc.php in the '.MGR_DIR.'/includes/ directory with file permissions set to 0666.'; $_lang["connection_screen_character_set"] = 'חיבור ערכת תווים:'; $_lang["connection_screen_collation"] = 'אוסף נתונים:'; $_lang["connection_screen_connection_information"] = 'מידע התחברות'; @@ -164,7 +164,7 @@ $_lang["table_prefix_not_exist_note"] = 'Setup couldn\'t install into the selected database, as it does not contain existing tables with the prefix you specified to be upgraded. Please choose an existing table prefix, and run Setup again.'; $_lang["templates"] = 'תבניות עיצוב'; $_lang["testing_connection"] = 'בודק חיבור...'; -$_lang["to_log_into_content_manager"] = 'על מנת להתחבר למערכת הניהול (manager/index.php) ניתן ללחוץ על כפתור `סגור`.'; +$_lang["to_log_into_content_manager"] = 'על מנת להתחבר למערכת הניהול ('.MGR_DIR.'/index.php) ניתן ללחוץ על כפתור `סגור`.'; $_lang["toggle"] = 'בחירה הפוכה'; $_lang["unable_install_chunk"] = 'Unable to install chunk. File'; $_lang["unable_install_module"] = 'Unable to install module. File'; diff --git a/install/lang/italian.inc.php b/install/lang/italian.inc.php index e77a2d278e..d60b743d0f 100644 --- a/install/lang/italian.inc.php +++ b/install/lang/italian.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Chiudi'; $_lang["btnnext_value"] = 'Avanti'; $_lang["cant_write_config_file"] = 'MODx non ha potuto salvare il file di configurazione. Vi preghiamo di copiare il seguente testo nel file '; -$_lang["cant_write_config_file_note"] = 'Una volta completata l\'operazione, potete accedere a MODx inserendo nel browser l\'indirizzo vostrosito.it/manager/.'; +$_lang["cant_write_config_file_note"] = 'Una volta completata l\'operazione, potete accedere a MODx inserendo nel browser l\'indirizzo vostrosito.it/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Checkbox select options:'; $_lang["checking_if_cache_exist"] = 'Controllo se esistono le directories /assets/cache e /assets/cache/rss : '; $_lang["checking_if_cache_file_writable"] = 'Controllo i permessi di scrittura sul file /assets/cache/siteCache.idx.php : '; $_lang["checking_if_cache_file2_writable"] = 'Controllo i permessi di scrittura sul file /assets/cache/sitePublishing.idx.php : '; $_lang["checking_if_cache_writable"] = 'Controllo i permessi di scrittura sulle directories /assets/cache e /assets/cache/rss : '; -$_lang["checking_if_config_exist_and_writable"] = 'Controllo l\'esistenza e i permessi di scrittura di /manager/includes/config.inc.php : '; +$_lang["checking_if_config_exist_and_writable"] = 'Controllo l\'esistenza e i permessi di scrittura di /'.MGR_DIR.'/includes/config.inc.php : '; $_lang["checking_if_export_exists"] = 'Controllo se esiste la directory /assets/export : '; $_lang["checking_if_export_writable"] = 'Controllo i permessi di scrittura della directory /assets/export : '; $_lang["checking_if_images_exist"] = 'Controllo se esistono le directories /assets/images, /assets/files, /assets/flash e /assets/media : '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Controllo se le sessioni sono configurate correttamente: '; $_lang["checking_table_prefix"] = 'Controllo il prefisso per le tabelle `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Per nuove installazioni su Linux/Unix, vi preghiamo di creare un file vuoto config.inc.php nella directory /manager/includes/ con i permessi di scrittura a 0666.'; +$_lang["config_permissions_note"] = 'Per nuove installazioni su Linux/Unix, vi preghiamo di creare un file vuoto config.inc.php nella directory /'.MGR_DIR.'/includes/ con i permessi di scrittura a 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_method"] = 'Tipo di connessione:'; $_lang["connection_screen_database_connection_information"] = 'Informazioni sul Database'; @@ -172,7 +172,7 @@ $_lang["table_prefix_not_exist"] = ' - Il prefisso selezionato per le tabelle non esiste in questo database!'; $_lang["table_prefix_not_exist_note"] = 'MODx non ha potuto proseguire con l\'installazione nel database selezionato poichè non contiene tabelle da aggiornare con il prefisso indicato. Vi preghiamo di scegliere un prefisso già esistente per le tabelle ed eseguire nuovamente il programma di installazione.'; $_lang["templates"] = 'Templates'; -$_lang["to_log_into_content_manager"] = 'Per accedere al Manager (manager/index.php) fate click sul bottone `Chiudi`.'; +$_lang["to_log_into_content_manager"] = 'Per accedere al Manager ('.MGR_DIR.'/index.php) fate click sul bottone `Chiudi`.'; $_lang["toggle"] = 'Inverti'; $_lang['tvs'] = 'Variabili di Template'; $_lang["unable_install_chunk"] = 'Impossibile installare il chunk. File'; diff --git a/install/lang/japanese-utf8.inc.php b/install/lang/japanese-utf8.inc.php index 7cf7770dbf..b44c57dd74 100755 --- a/install/lang/japanese-utf8.inc.php +++ b/install/lang/japanese-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'インストール終了'; $_lang["btnnext_value"] = '進む'; $_lang["cant_write_config_file"] = '設定ファイルを生成できませんでした。以下をコピーしてconfig.inc.phpに反映してください '; -$_lang["cant_write_config_file_note"] = '実行後は、サイト名/manager/ にアクセスすることで管理画面にログインできます。'; +$_lang["cant_write_config_file_note"] = '実行後は、サイト名/'.MGR_DIR.'/ にアクセスすることで管理画面にログインできます。'; $_lang["checkbox_select_options"] = '拡張機能の選択:'; $_lang["checking_if_cache_exist"] = '/assets/cacheディレクトリの存在チェック(なければ転送に失敗しています): '; $_lang["checking_if_cache_file_writable"] = 'ファイル/assets/cache/siteCache.idx.phpの書き込み属性(606などに設定): '; $_lang["checking_if_cache_file2_writable"] = 'ファイル/assets/cache/sitePublishing.idx.phpの書き込み属性(606などに設定): '; $_lang["checking_if_cache_writable"] = '/assets/cacheディレクトリの書き込み属性(707などに設定): '; -$_lang["checking_if_config_exist_and_writable"] = 'ファイル/manager/includes/config.inc.phpの存在と書き込み属性: '; +$_lang["checking_if_config_exist_and_writable"] = 'ファイル/'.MGR_DIR.'/includes/config.inc.phpの存在と書き込み属性: '; $_lang["checking_if_export_exists"] = '/assets/exportディレクトリの存在(なければ転送に失敗しています): '; $_lang["checking_if_export_writable"] = '/assets/exportディレクトリの書き込み属性(707などに設定): '; $_lang["checking_if_images_exist"] = '/assets/images,/assets/files,/assets/flash,/assets/mediaディレクトリの存在(なければ転送に失敗しています): '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'セッション情報が正常に構成されるかどうか: '; $_lang["checking_table_prefix"] = 'Tableプリフィックスの設定 `'; $_lang["chunks"] = 'チャンク'; -$_lang["config_permissions_note"] = 'config.inc.phpという名前の空ファイルを作って/manager/includes/ディレクトリに転送するか、すでに転送済みのconfig.inc.php.blankをリネームするなどし、パーミッションを606などに設定してください。'; +$_lang["config_permissions_note"] = 'config.inc.phpという名前の空ファイルを作って/'.MGR_DIR.'/includes/ディレクトリに転送するか、すでに転送済みのconfig.inc.php.blankをリネームするなどし、パーミッションを606などに設定してください。'; $_lang["connection_screen_collation"] = '照合順序(エンコード指定含む):
    ※utf8_general_ciを
    おすすめします'; $_lang["connection_screen_connection_method"] = '接続時の文字セットの扱い:'; $_lang["connection_screen_database_connection_information"] = 'データベース設定'; @@ -102,7 +102,7 @@ $_lang["installation_upgrade_advanced"] = 'カスタムアップデート
    (データベース設定をアップデートできます)'; $_lang["installation_upgrade_advanced_note"] = 'データベース設定の変更を伴うアップデート(MySQL4→MySQL5など)が必要な場合はこちらを選んでください。config.inc.phpのデータベース接続情報一式を更新します。
    '; $_lang["installation_upgrade_existing"] = '通常アップデート'; -$_lang["installation_upgrade_existing_note"] = '通常のアップデートはこのオプションを。コアファイル・リソースファイルの両方とデータベースをアップデートします。
    【注意】データベースのバックアップはお済みですか？まだの場合は今からでもバックアップマネージャーでどうぞ。'; +$_lang["installation_upgrade_existing_note"] = '通常のアップデートはこのオプションを。コアファイル・リソースファイルの両方とデータベースをアップデートします。
    【注意】データベースのバックアップはお済みですか？まだの場合は今からでもバックアップマネージャーでどうぞ。'; $_lang["installed"] = 'インストールしました'; $_lang["installing_demo_site"] = 'サンプルサイトのインストール: '; $_lang["language_code"] = 'ja'; @@ -172,7 +172,7 @@ $_lang["table_prefix_not_exist"] = ' - 指定されたテーブルプレフィックスがデータベース内に存在していなかったため、インストールが完了しませんでした。正しいテーブルプリフィックスを指定し、再度実行してください。'; $_lang["table_prefix_not_exist_note"] = 'Setup couldn\'t install into the selected database, as it does not contain existing tables with the prefix you specified to be upgraded. Please choose an existing table prefix, and run Setup again.'; $_lang["templates"] = 'テンプレート'; -$_lang["to_log_into_content_manager"] = 'おつかれさまでした。「インストール終了」ボタンをクリックすると、管理画面のログインページ(manager/index.php)にアクセスします。'; +$_lang["to_log_into_content_manager"] = 'おつかれさまでした。「インストール終了」ボタンをクリックすると、管理画面のログインページ('.MGR_DIR.'/index.php)にアクセスします。'; $_lang["toggle"] = '選択状態を反転'; $_lang['tvs'] = 'テンプレート変数'; $_lang["unable_install_chunk"] = 'チャンクをインストールできません'; diff --git a/install/lang/norwegian.inc.php b/install/lang/norwegian.inc.php index 3d055a7aec..1683b17c86 100644 --- a/install/lang/norwegian.inc.php +++ b/install/lang/norwegian.inc.php @@ -32,13 +32,13 @@ $_lang["btnclose_value"] = 'Lukk'; $_lang["btnnext_value"] = 'Neste'; $_lang["cant_write_config_file"] = 'MODx kunne ikke skrive konfigurasjonsfilen. Kopier følgende til filen '; -$_lang["cant_write_config_file_note"] = 'Når det er klart kan du logge inn i MODx administrasjonskontoen ved å gå til adressen DittDomene.xx/manager/ i din nettleser.'; +$_lang["cant_write_config_file_note"] = 'Når det er klart kan du logge inn i MODx administrasjonskontoen ved å gå til adressen DittDomene.xx/'.MGR_DIR.'/ i din nettleser.'; $_lang["checkbox_select_options"] = 'Alternativ for kryssbokser:'; $_lang["checking_if_cache_exist"] = 'Kontrollerer at katalogen assets/cache eksisterer: '; $_lang["checking_if_cache_file2_writable"] = 'Kontrollerer at filen assets/cache/sitePublishing.idx.php er skrivbar: '; $_lang["checking_if_cache_file_writable"] = 'Kontrollerer at filen assets/cache/siteCache.idx.php er skrivbar: '; $_lang["checking_if_cache_writable"] = 'Kontrollerer at katalogen assets/cache er skrivbar: '; -$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer at filen manager/includes/config.inc.php eksisterer og er skrivbar: '; +$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer at filen '.MGR_DIR.'/includes/config.inc.php eksisterer og er skrivbar: '; $_lang["checking_if_export_exists"] = 'Kontrollerer at katalogen assets/export eksisterer: '; $_lang["checking_if_export_writable"] = 'Kontrollerer at katalogen assets/export er skrivbar: '; $_lang["checking_if_images_exist"] = 'Kontrollerer at katalogen assets/images eksisterer: '; @@ -51,7 +51,7 @@ $_lang["checking_sessions"] = 'Kontrollerer at sesjoner er korrekt konfigurert: '; $_lang["checking_table_prefix"] = 'Kontrollerer tabellprefixet `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'For nye installasjoner i Linux/Unix-miljø må en tom fil med navnet config.inc.php opprettes i katalogen manager/includes/ med skriverrettighetene satt til 666.'; +$_lang["config_permissions_note"] = 'For nye installasjoner i Linux/Unix-miljø må en tom fil med navnet config.inc.php opprettes i katalogen '.MGR_DIR.'/includes/ med skriverrettighetene satt til 666.'; $_lang["connection_screen_collation"] = 'Kollasjonering:'; $_lang["connection_screen_connection_information"] = 'Tilkoblingsopplysninger'; $_lang["connection_screen_connection_method"] = 'Tilkoblingsmetode:'; @@ -160,7 +160,7 @@ $_lang["table_prefix_not_exist"] = ' - Tabellprefixet finnes ikke i denne databasen!'; $_lang["table_prefix_not_exist_note"] = 'Installasjonsprogrammet kunne ikke installere i den valgte databasen ettersom den ikke inneholder tabeller med det prefixet du oppga før oppgraderingen. Velg et eksisterende prefix og kjør installasjonsprogrammet på nytt.'; $_lang["templates"] = 'Maler'; -$_lang["to_log_into_content_manager"] = 'Du kan logge inn i inneholdshåndtereren (manager/index.php)ved å klikke på \"Lukk\"-knappen.'; +$_lang["to_log_into_content_manager"] = 'Du kan logge inn i inneholdshåndtereren ('.MGR_DIR.'/index.php)ved å klikke på \"Lukk\"-knappen.'; $_lang["toggle"] = 'Skift'; $_lang["unable_install_chunk"] = 'Kunne ikke installere chunk. Fil'; $_lang["unable_install_module"] = 'Kunne ikke installere modul. Fil'; diff --git a/install/lang/persian.inc.php b/install/lang/persian.inc.php index 7f71f7e69d..340f0783d9 100644 --- a/install/lang/persian.inc.php +++ b/install/lang/persian.inc.php @@ -31,13 +31,13 @@ $_lang["btnclose_value"] = 'ببند'; $_lang["btnnext_value"] = 'بعدی'; $_lang["cant_write_config_file"] = 'مد ایکس نتوانست فایل پیکر بندی (config) را بنویسد. لطفا این ها را در فایل پیکر بندی کپی کنید.'; -$_lang["cant_write_config_file_note"] = 'هنگامی که نصب با موفقیت یه اتمام رسید شما می توانید به قسمت مدیریت سایت خود به آدرس YourSiteName.com/manager/ بروید.'; +$_lang["cant_write_config_file_note"] = 'هنگامی که نصب با موفقیت یه اتمام رسید شما می توانید به قسمت مدیریت سایت خود به آدرس YourSiteName.com/'.MGR_DIR.'/ بروید.'; $_lang["checkbox_select_options"] = 'موارد را انتخاب کنید:'; $_lang["checking_if_cache_exist"] = 'مرور اینکه آیا assets/cache موجود است: '; $_lang["checking_if_cache_file2_writable"] = 'ررو اینکه آیا فایل assets/cache/sitePublishing.idx.php قابل نوشتن است: '; $_lang["checking_if_cache_file_writable"] = 'مرور اینکه آیا فایل assets/cache/siteCache.idx.php قابل نوشتن است: '; $_lang["checking_if_cache_writable"] = 'مرور اینکه آیا assets/cache قابل نوشتن است: '; -$_lang["checking_if_config_exist_and_writable"] = 'مرور اینکه آیا فایل manager/includes/config.inc.php موجود است و قابل نوشتن است: '; +$_lang["checking_if_config_exist_and_writable"] = 'مرور اینکه آیا فایل '.MGR_DIR.'/includes/config.inc.php موجود است و قابل نوشتن است: '; $_lang["checking_if_export_exists"] = 'مرور اینکه آیا assets/export موجود است: '; $_lang["checking_if_export_writable"] = 'مرور اینکه آیا assets/export قابل نوشتن است: '; $_lang["checking_if_images_exist"] = 'مرور اینکه آیا assets/images موجود است: '; @@ -50,7 +50,7 @@ $_lang["checking_sessions"] = 'بازخوانی sessions مطابق تنظیمات درست: '; $_lang["checking_table_prefix"] = 'مرور پیشوند جدول `'; $_lang["chunks"] = 'چانکها'; -$_lang["config_permissions_note"] = 'برای نصب جدید روی لینوکس/یونیکس, لطفا یک فایل خالی به نام config.inc.php در دایرکتوری manager/includes/ ایجاد کنید که سطح دسترسی به آن 0666 تنظیم شده باشد.'; +$_lang["config_permissions_note"] = 'برای نصب جدید روی لینوکس/یونیکس, لطفا یک فایل خالی به نام config.inc.php در دایرکتوری '.MGR_DIR.'/includes/ ایجاد کنید که سطح دسترسی به آن 0666 تنظیم شده باشد.'; $_lang["connection_screen_collation"] = 'تطبیق(Collation):'; $_lang["connection_screen_connection_information"] = 'جزییات اتصال به پایگاه داده »'; $_lang["connection_screen_database_connection_information"] = 'اطلاعات پایگاه داده'; @@ -158,7 +158,7 @@ $_lang["table_prefix_not_exist"] = ' - پیشوند جداول موجود نمی باشد'; $_lang["table_prefix_not_exist_note"] = 'صب و بروزرسانی با پیشوند جداولی که انتخاب کردید به علت موجود نبودن یشوند جداول با مشکل روبرو شد. لطف پیشوند جداول را بازرسی و دوباره امتحان کنید.'; $_lang["templates"] = 'قالب ها'; -$_lang["to_log_into_content_manager"] = 'برای ورود به قسمت مدیریت (manager/index.php) شما می توانید بر دکمه "ببند" کلیک کنید.'; +$_lang["to_log_into_content_manager"] = 'برای ورود به قسمت مدیریت ('.MGR_DIR.'/index.php) شما می توانید بر دکمه "ببند" کلیک کنید.'; $_lang["toggle"] = 'دستور'; $_lang["unable_install_chunk"] = 'نصب چانک با مشکل روبرو شد. فایل'; $_lang["unable_install_module"] = 'نصب ماژول با مشکل روبرو شد. فایل'; diff --git a/install/lang/polish-utf8.inc.php b/install/lang/polish-utf8.inc.php index a9edb3f82c..51a3ab1ed9 100644 --- a/install/lang/polish-utf8.inc.php +++ b/install/lang/polish-utf8.inc.php @@ -35,13 +35,13 @@ $_lang["btnclose_value"] = 'Zamknij'; $_lang["btnnext_value"] = 'Dalej'; $_lang["cant_write_config_file"] = 'Nie można zapisać pliku konfiguracyjnego. Skopiuj do pliku następującą treść: '; -$_lang["cant_write_config_file_note"] = 'Po zakończeniu instalacji będziesz mógł zalogować się do Menedżera MODxa znajdującego się pod adresem: TwojaNazwaDomeny.com/manager/'; +$_lang["cant_write_config_file_note"] = 'Po zakończeniu instalacji będziesz mógł zalogować się do Menedżera MODxa znajdującego się pod adresem: TwojaNazwaDomeny.com/'.MGR_DIR.'/'; $_lang["checkbox_select_options"] = 'Zaznacz wybrane opcje: '; $_lang["checking_if_cache_exist"] = 'Sprawdzanie, czy istnieją foldery /assets/cache oraz /assets/cache/rss: '; $_lang["checking_if_cache_file_writable"] = 'Sprawdzanie, czy plik /assets/cache/siteCache.idx.php jest zapisywalny: '; $_lang["checking_if_cache_file2_writable"] = 'Sprawdzanie, czy plik /assets/cache/sitePublishing.idx.php jest zapisywalny: '; $_lang["checking_if_cache_writable"] = 'Sprawdzanie, czy foldery /assets/cache oraz /assets/cache/rss są zapisywalne: '; -$_lang["checking_if_config_exist_and_writable"] = 'Sprawdzanie, czy plik /manager/includes/config.inc.php istnieje i jest zapisywalny: '; +$_lang["checking_if_config_exist_and_writable"] = 'Sprawdzanie, czy plik /'.MGR_DIR.'/includes/config.inc.php istnieje i jest zapisywalny: '; $_lang["checking_if_export_exists"] = 'Sprawdzanie, czy istnieje folder /assets/export: '; $_lang["checking_if_export_writable"] = 'Sprawdzanie, czy folder /assets/export jest zapisywalny: '; $_lang["checking_if_images_exist"] = 'Sprawdzanie, czy istnieją foldery /assets/images, /assets/files, /assets/flash oraz /assets/media: '; @@ -54,7 +54,7 @@ $_lang["checking_sessions"] = 'Sprawdzanie, czy obsługa sesji jest skonfigurowana poprawnie: '; $_lang["checking_table_prefix"] = 'Sprawdzanie prefiksu tabeli `'; $_lang["chunks"] = 'Chunki'; -$_lang["config_permissions_note"] = 'Dla nowych instalacji na systemach Linux/Unix utwórz pusty plik o nazwie config.inc.php w folderze /manager/includes/ i ustaw dla niego prawa dostępu na 0666.'; +$_lang["config_permissions_note"] = 'Dla nowych instalacji na systemach Linux/Unix utwórz pusty plik o nazwie config.inc.php w folderze /'.MGR_DIR.'/includes/ i ustaw dla niego prawa dostępu na 0666.'; $_lang["connection_screen_collation"] = 'System porównań (collation): '; $_lang["connection_screen_connection_method"] = 'Metoda połączenia: '; $_lang["connection_screen_database_connection_information"] = 'Informacje o bazie danych'; @@ -177,7 +177,7 @@ $_lang["table_prefix_not_exist"] = '- Tabele o tym prefiksie nie istnieją w wybranej bazie danych!'; $_lang["table_prefix_not_exist_note"] = 'Nie można zaktualizować MODxa w wybranej bazie danych, ponieważ nie zawiera ona tabel z określonym prefiksem. Wybierz prefiks, który został zastosowany dla istniejących już tabel i uruchom instalatora ponownie.'; $_lang["templates"] = 'Szablony'; -$_lang["to_log_into_content_manager"] = 'Po kliknięciu w przycisk `Zamknij` będziesz mógł zalogować się do Menedżera MODxa (manager/index.php).'; +$_lang["to_log_into_content_manager"] = 'Po kliknięciu w przycisk `Zamknij` będziesz mógł zalogować się do Menedżera MODxa ('.MGR_DIR.'/index.php).'; $_lang["toggle"] = 'Odwróć zaznaczenie'; $_lang['tvs'] = 'Zmienne Szablonów'; $_lang["unable_install_chunk"] = 'Nie można zainstalować chunków. Plik'; diff --git a/install/lang/portuguese-br.inc.php b/install/lang/portuguese-br.inc.php index b2dbd46625..47d599d26d 100755 --- a/install/lang/portuguese-br.inc.php +++ b/install/lang/portuguese-br.inc.php @@ -29,13 +29,13 @@ $_lang["btnclose_value"] = 'Fechar'; $_lang["btnnext_value"] = 'Prximo'; $_lang["cant_write_config_file"] = 'MODx no pode escrever o arquivo de configurao. Por favor copie no arquivo as seguintes informaes '; -$_lang["cant_write_config_file_note"] = 'Assim que isto for feito, voc pode acessar o MODx Admin por apontar seu navegador para NomeDoSeuSite.com/manager/.'; +$_lang["cant_write_config_file_note"] = 'Assim que isto for feito, voc pode acessar o MODx Admin por apontar seu navegador para NomeDoSeuSite.com/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Selecionar:'; $_lang["checking_if_cache_exist"] = 'Checando se o diretrio assets/cache existe: '; $_lang["checking_if_cache_file2_writable"] = 'Checando se o arquivo assets/cache/sitePublishing.idx.php est liberado pra escrita: '; $_lang["checking_if_cache_file_writable"] = 'Checando se o arquivo assets/cache/siteCache.idx.php est liberado pra escrita: '; $_lang["checking_if_cache_writable"] = 'Checando se o diretrio assets/cache est liberado pra escrita: '; -$_lang["checking_if_config_exist_and_writable"] = 'Checando se o arquivo manager/includes/config.inc.php existe e est liberado pra escrita: '; +$_lang["checking_if_config_exist_and_writable"] = 'Checando se o arquivo '.MGR_DIR.'/includes/config.inc.php existe e est liberado pra escrita: '; $_lang["checking_if_export_exists"] = 'Checando se o diretrio assets/export directory exists: '; $_lang["checking_if_export_writable"] = 'Checando se o diretrio assets/export est liberado pra escrita: '; $_lang["checking_if_images_exist"] = 'Checando se o diretrio assets/images existe: '; @@ -46,7 +46,7 @@ $_lang["checking_sessions"] = 'Checando se as sees esto configuradas apropiadamente: '; $_lang["checking_table_prefix"] = 'Verificando Prefixo de Tabela `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Para novas instalaes de Linux/Unix, crie um arquivo vazio chamado config.inc.php no diretrio manager/includes/ com as permisses de 0666.'; +$_lang["config_permissions_note"] = 'Para novas instalaes de Linux/Unix, crie um arquivo vazio chamado config.inc.php no diretrio '.MGR_DIR.'/includes/ com as permisses de 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_information"] = 'Informao de Conexo'; $_lang["connection_screen_database_connection_information"] = 'Informao da Base de Dados.'; @@ -149,7 +149,7 @@ $_lang["table_prefix_not_exist"] = ' - Prefixo de Table no existe nesta Base de Dados!'; $_lang["table_prefix_not_exist_note"] = 'No foi possvel instalar na base de dados selecionada, como no h tabelas com o prefixo que voc inseriu. Por favor, escolha outro prefixo de tabela e re-comee a atualizao.'; $_lang["templates"] = 'Templates'; -$_lang["to_log_into_content_manager"] = 'Para logar no gerenciador de contedo (manager/index.php) voc pode clicar no boto Fechar.'; +$_lang["to_log_into_content_manager"] = 'Para logar no gerenciador de contedo ('.MGR_DIR.'/index.php) voc pode clicar no boto Fechar.'; $_lang["toggle"] = 'Detalhar'; $_lang["unable_install_chunk"] = 'No foi possivel instalar o chunk. Arquivo'; $_lang["unable_install_module"] = 'No foi possivel instalar o module. Arquivo'; diff --git a/install/lang/russian-UTF8.inc.php b/install/lang/russian-UTF8.inc.php index e8efcbdf17..34b0cad525 100644 --- a/install/lang/russian-UTF8.inc.php +++ b/install/lang/russian-UTF8.inc.php @@ -33,13 +33,13 @@ $_lang["btnclose_value"] = 'Закрыть'; $_lang["btnnext_value"] = 'Далее'; $_lang["cant_write_config_file"] = 'Программа установки не смогла записать файл конфигурации. Скопируйте вышеперечисленное в файл '; -$_lang["cant_write_config_file_note"] = 'Как только вы это сделаете, вы можете войти в панель управления, перейдя в браузере по адресу Адрес_Вашего_Сайта/manager/.'; +$_lang["cant_write_config_file_note"] = 'Как только вы это сделаете, вы можете войти в панель управления, перейдя в браузере по адресу Адрес_Вашего_Сайта/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Параметры выбора флажков:'; $_lang["checking_if_cache_exist"] = 'Проверка существования папок /assets/cache и /assets/cache/rss: '; $_lang["checking_if_cache_file_writable"] = 'Проверка возможности записи в файл /assets/cache/siteCache.idx.php: '; $_lang["checking_if_cache_file2_writable"] = 'Проверка возможности записи в файл /assets/cache/sitePublishing.idx.php: '; $_lang["checking_if_cache_writable"] = 'Проверка возможности записи в папки /assets/cache и /assets/cache/rss: '; -$_lang["checking_if_config_exist_and_writable"] = 'Проверка существования и возможности записи в файл /manager/includes/config.inc.php: '; +$_lang["checking_if_config_exist_and_writable"] = 'Проверка существования и возможности записи в файл /'.MGR_DIR.'/includes/config.inc.php: '; $_lang["checking_if_export_exists"] = 'Проверка существования папки /assets/export: '; $_lang["checking_if_export_writable"] = 'Проверка возможности записи в папку /assets/export: '; $_lang["checking_if_images_exist"] = 'Проверка существования папок /assets/images, /assets/files, /assets/flash и /assets/media: '; @@ -52,7 +52,7 @@ $_lang["checking_sessions"] = 'Проверка настроек сессий: '; $_lang["checking_table_prefix"] = 'Проверка префикса таблиц `'; $_lang["chunks"] = 'Чанки'; -$_lang["config_permissions_note"] = 'При новой Linux/Unix установке, создайте пустой файл config.inc.php в папке /manager/includes/ с правами 0666.'; +$_lang["config_permissions_note"] = 'При новой Linux/Unix установке, создайте пустой файл config.inc.php в папке /'.MGR_DIR.'/includes/ с правами 0666.'; $_lang["connection_screen_collation"] = 'Сопоставление:'; $_lang["connection_screen_connection_method"] = 'Метод сопоставления:'; $_lang["connection_screen_database_connection_information"] = 'Параметры базы данных'; @@ -175,7 +175,7 @@ $_lang["table_prefix_not_exist"] = ' - нет такого префикса таблиц в базе данных!'; $_lang["table_prefix_not_exist_note"] = 'Продолжение установки невозможно, так как нет таблиц с указанным префиксом, измените префикс таблиц и попробуйте снова.'; $_lang["templates"] = 'Шаблоны'; -$_lang["to_log_into_content_manager"] = 'Чтобы войти в панель управления (manager/index.php) нажмите на кнопку `Закрыть`.'; +$_lang["to_log_into_content_manager"] = 'Чтобы войти в панель управления ('.MGR_DIR.'/index.php) нажмите на кнопку `Закрыть`.'; $_lang["toggle"] = 'Переключить'; $_lang["tvs"] = 'Параметры (TV)'; $_lang["unable_install_chunk"] = 'Невозможно установить чанк. Файл'; diff --git a/install/lang/spanish-utf8.inc.php b/install/lang/spanish-utf8.inc.php index 02e211aef4..f43e86b579 100644 --- a/install/lang/spanish-utf8.inc.php +++ b/install/lang/spanish-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Cerrar'; $_lang["btnnext_value"] = 'Siguiente'; $_lang["cant_write_config_file"] = 'MODx no pudo escribir al archivo de configuración. Por favor copia lo siguiente en el archivo. '; -$_lang["cant_write_config_file_note"] = 'Una vez que se ha hecho eso, puedes entrar al sistema administrativo de MODx al poner en tu navegador la dirección YourSiteName.com/manager/.'; +$_lang["cant_write_config_file_note"] = 'Una vez que se ha hecho eso, puedes entrar al sistema administrativo de MODx al poner en tu navegador la dirección YourSiteName.com/'.MGR_DIR.'/.'; $_lang["checkbox_select_options"] = 'Lista Múltiple:'; $_lang["checking_if_cache_exist"] = 'Comprobando si el directorio assets/cache existe: '; $_lang["checking_if_cache_file2_writable"] = 'Comprobando que el archivo assets/cache/sitePublishing.idx.php es escribible: '; $_lang["checking_if_cache_file_writable"] = 'Comprobando que el archivo assets/cache/siteCache.idx.php es escribible: '; $_lang["checking_if_cache_writable"] = 'Comprobando que el directorio assets/cache es escribible: '; -$_lang["checking_if_config_exist_and_writable"] = 'Comprobando que el archivo manager/includes/config.inc.php existe y es escribible: '; +$_lang["checking_if_config_exist_and_writable"] = 'Comprobando que el archivo '.MGR_DIR.'/includes/config.inc.php existe y es escribible: '; $_lang["checking_if_export_exists"] = 'Comprobando que el directorio assets/export existe: '; $_lang["checking_if_export_writable"] = 'Comprobando que el directorio assets/export es escribible: '; $_lang["checking_if_images_exist"] = 'Comprobando que los directorios assets/images, /assets/files, /assets/flash y /assets/media existan: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Checando si las sesiones están apropiadamente configuradas: '; $_lang["checking_table_prefix"] = 'Checando el prefijo de las tablas `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Para instalaciones nuevas en servidores Linux/Unix, favpr de crear un archivo nuevo en blanco llamado config.inc.php en el directorio manager/includes/ con los permisos de archivo configurados a 0666.'; +$_lang["config_permissions_note"] = 'Para instalaciones nuevas en servidores Linux/Unix, favpr de crear un archivo nuevo en blanco llamado config.inc.php en el directorio '.MGR_DIR.'/includes/ con los permisos de archivo configurados a 0666.'; $_lang["connection_screen_collation"] = 'Compaginación:'; $_lang["connection_screen_connection_method"] = 'Método de Conexión:'; $_lang["connection_screen_database_connection_information"] = 'Información de la base de datos'; @@ -166,7 +166,7 @@ $_lang["table_prefix_not_exist"] = ' - ¡Este prefijo no existe en esta base de datos!'; $_lang["table_prefix_not_exist_note"] = 'El configurador no pudo instalar en la base de datos seleccionada, no contiene tablas existentes con el prefijo que especificaste para ser actualizadas. Por favor escoge un prefijo de tablas existente y corre el configurador otra vez.'; $_lang["templates"] = 'Templates'; -$_lang["to_log_into_content_manager"] = 'Para entrar al sistema de administración de MODx (manager/index.php) dando clic en el botón de `Cerrar`.'; +$_lang["to_log_into_content_manager"] = 'Para entrar al sistema de administración de MODx ('.MGR_DIR.'/index.php) dando clic en el botón de `Cerrar`.'; $_lang["toggle"] = 'Invertir'; $_lang['tvs'] = 'Template Variables'; $_lang["unable_install_chunk"] = 'No se pudo instalar el chunk. Archivo'; diff --git a/install/lang/svenska.inc.php b/install/lang/svenska.inc.php index 7cc735f73a..910097f5f3 100644 --- a/install/lang/svenska.inc.php +++ b/install/lang/svenska.inc.php @@ -35,13 +35,13 @@ $_lang["btnclose_value"] = 'Stäng'; $_lang["btnnext_value"] = 'Nästa'; $_lang["cant_write_config_file"] = 'MODx kunde inte skriva konfigurationsfilen. Kopiera följande till filen '; -$_lang["cant_write_config_file_note"] = 'När det är klart kan du logga in i MODx administrationsdel genom att ange adressen DinWebbplats.se/manager/ i din webbläsare.'; +$_lang["cant_write_config_file_note"] = 'När det är klart kan du logga in i MODx administrationsdel genom att ange adressen DinWebbplats.se/'.MGR_DIR.'/ i din webbläsare.'; $_lang["checkbox_select_options"] = 'Välj flera element:'; $_lang["checking_if_cache_exist"] = 'Kontrollerar att katalogerna /assets/cache och /assets/cache/rss existerar: '; $_lang["checking_if_cache_file_writable"] = 'Kontrollerar att filen /assets/cache/siteCache.idx.php är skrivbar: '; $_lang["checking_if_cache_file2_writable"] = 'Kontrollerar att filen /assets/cache/sitePublishing.idx.php är skrivbar: '; $_lang["checking_if_cache_writable"] = 'Kontrollerar att katalogerna /assets/cache och /assets/cache/rss är skrivbara: '; -$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerar att filen /manager/includes/config.inc.php existerar och är skrivbar: '; +$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerar att filen /'.MGR_DIR.'/includes/config.inc.php existerar och är skrivbar: '; $_lang["checking_if_export_exists"] = 'Kontrollerar att katalogen /assets/export existerar: '; $_lang["checking_if_export_writable"] = 'Kontrollerar att katalogen /assets/export är skrivbar: '; $_lang["checking_if_images_exist"] = 'Kontrollerar att katalogerna /assets/images, /assets/files, /assets/flash och /assets/media existerar: '; @@ -54,7 +54,7 @@ $_lang["checking_sessions"] = 'Kontrollerar att sessioner är korrekt konfigurerade: '; $_lang["checking_table_prefix"] = 'Kontrollerar tabellprefixet `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'För nya installationer i Linux/Unix-miljö måste en tom fil med namnet config.inc.php skapas i katalogen /manager/includes/ med åtkomsträttigheterna satta till 0666.'; +$_lang["config_permissions_note"] = 'För nya installationer i Linux/Unix-miljö måste en tom fil med namnet config.inc.php skapas i katalogen /'.MGR_DIR.'/includes/ med åtkomsträttigheterna satta till 0666.'; $_lang["connection_screen_collation"] = 'Kollationering:'; $_lang["connection_screen_connection_method"] = 'Anslutningsmetod:'; $_lang["connection_screen_database_connection_information"] = 'Databasuppgifter'; @@ -177,7 +177,7 @@ $_lang["table_prefix_not_exist"] = ' - Tabellprefixet finns inte i den här databasen!'; $_lang["table_prefix_not_exist_note"] = 'Installationsprogrammet kunde inte installera i den valda databasen eftersom den inte innehåller tabeller med det prefix du angav för uppgradering. Välj ett existerande prefix och kör sedan installationsprogrammet igen.'; $_lang["templates"] = 'Mallar'; -$_lang["to_log_into_content_manager"] = 'Du kan logga in i innehållshanteraren (manager/index.php) genom att klicka på "Stäng"-knappen.'; +$_lang["to_log_into_content_manager"] = 'Du kan logga in i innehållshanteraren ('.MGR_DIR.'/index.php) genom att klicka på "Stäng"-knappen.'; $_lang["toggle"] = 'Växla'; $_lang['tvs'] = 'Mallvariabler'; $_lang["unable_install_chunk"] = 'Kunde inte installera chunk. Fil'; diff --git a/install/setup.data.sql b/install/setup.data.sql index 52b3c289f9..9b98082935 100644 --- a/install/setup.data.sql +++ b/install/setup.data.sql @@ -30,7 +30,7 @@ REPLACE INTO `{PREFIX}documentgroup_names` VALUES ('1','Site Admin Pages','0','0 # -REPLACE INTO `{PREFIX}site_content` VALUES (1, 'document', 'text/html', 'Home', 'Welcome to MODX', 'Introduction to MODX', 'index', '', 1, 0, 0, 0, 0, 'Create and do amazing things with MODX', '

    Install Successful!

    \r\n

    You have successfully installed and configured MODX. We hope you find this site an adequate starting configuration for many small business, organization or personal websites; just change the template and content, and you''ll be good to go! This site is preconfigured with a variety of options we hope are helpful, relevant and just plain cool for many marketing or personal sites:

    \r\n
      \r\n
    • Simple Blog. When logged into your site, you''ll be able to create new entries from the front end. This can also be turned into a News publishing or PR publishing system. View example blog
      • \r\n
    • Easy Comments. When logged into your site, your registered site users can comment on your posts. View example
      • \r\n
    • RSS Feeds. Your site visitors can stay up to date using your site feeds. View RSS feed
      • \r\n
    • Automatic User Registration. Those that wish to comment on blogs must first create an account. This comes pre-configured with a "Captcha" anti-robot registration feature. View registration form
      • \r\n
    • QuickEdit. When you''re logged into the manager, you can edit a page directly from the front end! More about CMS features
      • \r\n
    • Integrated Site Search. Allows visitors to search only the pages you wish them to search. Uses Ajax to display results without loading a new page.
      • \r\n
    • Powerful Navigation Builder. Duplicate or build virtually any navigation system with our dynamic menu builder code. The menu above, for example. More about menu features
      • \r\n
    • Mootools enabled. You''re on your way to Web 2.0 and AJAX goodness. More about Ajax features
      • \r\n
    • Custom "page not found (404)" page. Help visitors who go astray to find what they''re looking for. View 404 page
      • \r\n
    • Contact Us form. A highly configurable contact form you should customize to point to the right email address. Comes pre-configured to prevent mail-form-injection so your site does not become a source for spam. View form
      • \r\n
    • Newest documents list. Shows your visitor the most recently added pages (configurable).
      • \r\n
    • Customizable Content Manager. Preview uploaded images, hide or rename fields and lots more. See ManagerManager''s documentation for details and instructions. Quick start: ManagerManager by default will look for "rules" in a Chunk named "mm_rules". Simply copy or rename the Chunk named "mm_demo_rules" to "mm_rules" and try it out!
      • \r\n
    \r\n

    To log into the MODX Control Panel and start customizing this site, point your browser to [(site_url)]manager/.

    ', 1, 4, 1, 1, 1, 1, 1144904400, 1, 1160262629, 0, 0, 0, 0, 0, 'Home', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES (1, 'document', 'text/html', 'Home', 'Welcome to MODX', 'Introduction to MODX', 'index', '', 1, 0, 0, 0, 0, 'Create and do amazing things with MODX', '

    Install Successful!

    \r\n

    You have successfully installed and configured MODX. We hope you find this site an adequate starting configuration for many small business, organization or personal websites; just change the template and content, and you''ll be good to go! This site is preconfigured with a variety of options we hope are helpful, relevant and just plain cool for many marketing or personal sites:

    \r\n
      \r\n
    • Simple Blog. When logged into your site, you''ll be able to create new entries from the front end. This can also be turned into a News publishing or PR publishing system. View example blog
      • \r\n
    • Easy Comments. When logged into your site, your registered site users can comment on your posts. View example
      • \r\n
    • RSS Feeds. Your site visitors can stay up to date using your site feeds. View RSS feed
      • \r\n
    • Automatic User Registration. Those that wish to comment on blogs must first create an account. This comes pre-configured with a "Captcha" anti-robot registration feature. View registration form
      • \r\n
    • QuickEdit. When you''re logged into the manager, you can edit a page directly from the front end! More about CMS features
      • \r\n
    • Integrated Site Search. Allows visitors to search only the pages you wish them to search. Uses Ajax to display results without loading a new page.
      • \r\n
    • Powerful Navigation Builder. Duplicate or build virtually any navigation system with our dynamic menu builder code. The menu above, for example. More about menu features
      • \r\n
    • Mootools enabled. You''re on your way to Web 2.0 and AJAX goodness. More about Ajax features
      • \r\n
    • Custom "page not found (404)" page. Help visitors who go astray to find what they''re looking for. View 404 page
      • \r\n
    • Contact Us form. A highly configurable contact form you should customize to point to the right email address. Comes pre-configured to prevent mail-form-injection so your site does not become a source for spam. View form
      • \r\n
    • Newest documents list. Shows your visitor the most recently added pages (configurable).
      • \r\n
    • Customizable Content Manager. Preview uploaded images, hide or rename fields and lots more. See ManagerManager''s documentation for details and instructions. Quick start: ManagerManager by default will look for "rules" in a Chunk named "mm_rules". Simply copy or rename the Chunk named "mm_demo_rules" to "mm_rules" and try it out!
      • \r\n
    \r\n

    To log into the MODX Control Panel and start customizing this site, point your browser to [(site_manager_url)].

    ', 1, 4, 1, 1, 1, 1, 1144904400, 1, 1160262629, 0, 0, 0, 0, 0, 'Home', 0, 0, 0, 0, 0, 0, 0); REPLACE INTO `{PREFIX}site_content` VALUES (2, 'document', 'text/html', 'Blog', 'My Blog', '', 'blog', '', 1, 0, 0, 0, 1, '', '[[Ditto? &parents=`2` &display=`2` &removeChunk=`Comments` &tpl=`ditto_blog` &paginate=`1` &extenders=`summary,dateFilter` &paginateAlwaysShowLinks=`1` &tagData=`documentTags`]]\r\n\r\n

    Showing [+start+] - [+stop+] of [+total+] Articles

    \r\n\r\n
    [+previous+] [+pages+] [+next+]
    \r\n\r\n
     
    \r\n\r\n[[Reflect? &config=`wordpress` &dittoSnippetParameters=`parents:2` &id=`wp` &getDocuments=`1`]]', 1, 4, 2, 0, 0, 1, 1144904400, 1, 1159818696, 0, 0, 0, 0, 0, 'Blog', 0, 0, 0, 0, 0, 0, 0); @@ -51,7 +51,7 @@ REPLACE INTO `{PREFIX}site_content` VALUES (7, 'document', 'text/html', '404 - D REPLACE INTO `{PREFIX}site_content` VALUES (8, 'document', 'text/html', 'Search Results', 'Your Search Results', '', 'search-results', '', 1, 0, 0, 0, 0, '', '[!AjaxSearch? &showInputForm=`0` &ajaxSearch=`0`!]', 0, 4, 5, 0, 0, 1, 1144904400, 1, 1158613055, 0, 0, 0, 0, 0, '', 1, 0, 0, 0, 0, 0, 1); -REPLACE INTO `{PREFIX}site_content` VALUES (9, 'document', 'text/html', 'Mini-Blog HOWTO', 'How to Start Posting with MODX Mini-Blogs', '', 'article-1126081344', '', 1, 0, 0, 2, 1, '', '

    Setting up a mini-blog is relatively simple. Here''s what you need to do to get started with making new posts:

    \r\n
      \r\n
    1. Login to the MODX Control Panel.
      2. \r\n
    2. Press the plus-sign next to the Blog(2) container resource to see the blog entries posted there.
      3. \r\n
    3. To make a new Blog entry, simply right-click the Blog container document and choose the "Create Resource here" menu option. To edit an existing blog article, right click the entry and choose the "Edit Resource" menu option.
      4. \r\n \r\n
    4. Write or edit the content and press save, making sure the document is published.
      5. \r\n
    5. Everything else is automatic; you''re done!
      6. \r\n
    \r\n{{Comments}}', 1, 4, 0, 1, 1, -1, 1144904400, 1, 1160171764, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); +REPLACE INTO `{PREFIX}site_content` VALUES (9, 'document', 'text/html', 'Mini-Blog HOWTO', 'How to Start Posting with MODX Mini-Blogs', '', 'article-1126081344', '', 1, 0, 0, 2, 1, '', '

    Setting up a mini-blog is relatively simple. Here''s what you need to do to get started with making new posts:

    \r\n
      \r\n
    1. Login to the MODX Control Panel.
      2. \r\n
    2. Press the plus-sign next to the Blog(2) container resource to see the blog entries posted there.
      3. \r\n
    3. To make a new Blog entry, simply right-click the Blog container document and choose the "Create Resource here" menu option. To edit an existing blog article, right click the entry and choose the "Edit Resource" menu option.
      4. \r\n \r\n
    4. Write or edit the content and press save, making sure the document is published.
      5. \r\n
    5. Everything else is automatic; you''re done!
      6. \r\n
    \r\n{{Comments}}', 1, 4, 0, 1, 1, -1, 1144904400, 1, 1160171764, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); REPLACE INTO `{PREFIX}site_content` VALUES (11, 'document', 'text/xml', 'RSS Feed', '[(site_name)] RSS Feed', '', 'feed.rss', '', 1, 0, 0, 0, 0, '', '[[Ditto? &parents=`2` &format=`rss` &display=`20` &total=`20` &removeChunk=`Comments`]]', 0, 0, 6, 0, 0, 1, 1144904400, 1, 1160062859, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); @@ -92,7 +92,7 @@ REPLACE INTO `{PREFIX}site_content` VALUES (46, 'document', 'text/html', 'Thank # -REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (4, 'FormSignup', 'For the weblogin signup', 0, 2, 0, ' \r\n\r\n
    \r\n
    \r\n

    User Details

    \r\n

    Items marked by * are required

    \r\n \r\n \r\n \r\n
    \r\n \r\n
    \r\n

    Password

    \r\n \r\n \r\n
    \r\n \r\n
    \r\n

    Optional Account Profile Info

    \r\n \r\n \r\n
    \r\n \r\n
    \r\n

    Bot-Patrol

    \r\n

    Enter the word/number combination shown in the image below.

    \r\n

    \"If

    \r\n \r\n
    \r\n \r\n
    \r\n \r\n
    \r\n
    \r\n\r\n\r\n
    \r\n\r\n

    Signup completed successfully!
    \r\nYour account was created. A copy of your signup information was sent to your email address.

    \r\n', 0); +REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (4, 'FormSignup', 'For the weblogin signup', 0, 2, 0, ' \r\n\r\n
    \r\n
    \r\n

    User Details

    \r\n

    Items marked by * are required

    \r\n \r\n \r\n \r\n
    \r\n \r\n
    \r\n

    Password

    \r\n \r\n \r\n
    \r\n \r\n
    \r\n

    Optional Account Profile Info

    \r\n \r\n \r\n
    \r\n \r\n
    \r\n

    Bot-Patrol

    \r\n

    Enter the word/number combination shown in the image below.

    \r\n

    \"If

    \r\n \r\n
    \r\n \r\n
    \r\n \r\n
    \r\n
    \r\n\r\n\r\n
    \r\n\r\n

    Signup completed successfully!
    \r\nYour account was created. A copy of your signup information was sent to your email address.

    \r\n', 0); REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (6, 'nl_sidebar', 'Default Template TPL for Ditto', 0, 1, 0, '[+title+]
    \r\n[+longtitle+]

    ', 0); diff --git a/install/setup.info.php b/install/setup.info.php index d7a1288dec..f7ab6d6ba3 100755 --- a/install/setup.info.php +++ b/install/setup.info.php @@ -1,7 +1,9 @@ 真的. 请将您的 config文件(/manager/includes/config.inc.php) 设置为只读!'; +$_lang["configcheck_configinc_msg"] = '可能会有不怀好意的人通过它破坏网站. 真的. 请将您的 config文件(/'.MGR_DIR.'/includes/config.inc.php) 设置为只读!'; $_lang["configcheck_default_msg"] = '发生未知错误.'; $_lang["configcheck_errorpage_unpublished"] = 'The Error page defined in the site configuration settings is not published.'; $_lang["configcheck_errorpage_unpublished_msg"] = 'This means that your Error page is inaccessible to the general public, you should publish the page for it to work correctly.'; diff --git a/manager/includes/lang/czech.inc.php b/manager/includes/lang/czech.inc.php index 8f45fc8ffc..94d4528c37 100644 --- a/manager/includes/lang/czech.inc.php +++ b/manager/includes/lang/czech.inc.php @@ -116,7 +116,7 @@ $_lang["configcheck_cache"] = 'Adresář cache není nastavený pro zápis.'; $_lang["configcheck_cache_msg"] = 'MODx nemůže zapisovat do adresáře cache. Systém bude fungovat správně, ale nebude dostupná funkce zásobníku. Prosím nastavte povolení pro zápis do adresáře cache.'; $_lang["configcheck_configinc"] = 'Do konfiguračního souboru je stále možno zapisovat.'; -$_lang["configcheck_configinc_msg"] = 'Velmi neslušní lidé mohou potenciálně způsobit pěkný nepořádek na vašich stránkách a čemkoli spojeném s nimi. Opravdu. Prosím nastavte váš konfigurační soubor (/manager/includes/config.inc.php) jen pro čtení!'; +$_lang["configcheck_configinc_msg"] = 'Velmi neslušní lidé mohou potenciálně způsobit pěkný nepořádek na vašich stránkách a čemkoli spojeném s nimi. Opravdu. Prosím nastavte váš konfigurační soubor (/'.MGR_DIR.'/includes/config.inc.php) jen pro čtení!'; $_lang["configcheck_default_msg"] = 'Byla nalezena nespecifikovaná výstraha. Pro další postup použíjte křišťálovou kouli. :-)'; $_lang["configcheck_errorpage_unavailable"] = 'Vaše Chybová stránka (error 404) není dostupná.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'To znamená, že vaše Chybová stránka není dostupná normálním internetovým uživatelům nebo neexistuje. To může vést k mnoha chybovým zápisům do logů. Ujistěte se zda žádná ze skupin návštěvníků nemá přístup k této stránce.'; diff --git a/manager/includes/lang/danish.inc.php b/manager/includes/lang/danish.inc.php index 6fd5a84e26..fc4d3b0bae 100644 --- a/manager/includes/lang/danish.inc.php +++ b/manager/includes/lang/danish.inc.php @@ -7,7 +7,7 @@ * @date 27/12/10 18.10 * @version 1.0.4 * - * Filename: /manager/includes/lang/danish.inc.php + * Filename: includes/lang/danish.inc.php * Language: Danish * Encoding: UTF-8 */ @@ -114,7 +114,7 @@ $_lang["configcheck_cache"] = 'Cache mappen er ikke skrivbar'; $_lang["configcheck_cache_msg"] = 'MODx Evolution kan ikke skrive til cache mappen. MODx Evolution vil dog stadig fungere men uden caching. For at rette dette, skal /_cache/ mappen gøres skrivbar.'; $_lang["configcheck_configinc"] = 'Konfigurationsfilen er stadigvæk skrivbar'; -$_lang["configcheck_configinc_msg"] = 'Det betyder at hackere kan ødelægge alt indholdet i websitet. Du skal ændre (/manager/includes/config.inc.php) så den kun er read-only!'; +$_lang["configcheck_configinc_msg"] = 'Det betyder at hackere kan ødelægge alt indholdet i websitet. Du skal ændre (/'.MGR_DIR.'/includes/config.inc.php) så den kun er read-only!'; $_lang["configcheck_default_msg"] = 'Der er opstået en uspecificeret fejl. Dette er så underligt at du bør informere en system administrator.'; $_lang["configcheck_errorpage_unavailable"] = 'Websitets fejlside er ikke til rådighed.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Det betyder at fejlsiden enten ikke eksisterer eller, at den ikke kan tilgås af normale besøgende. Det kan medføre, at systemet omstiller uden at stoppe, og vil samtidig resultere i, at websitets logfiler til sidst vil fylde for meget. Husk at kontrollere, at der ikke er nogle web bruger grupper, der er sammenkædet med siden.'; diff --git a/manager/includes/lang/english.inc.php b/manager/includes/lang/english.inc.php index f392f6fc86..42823f85f3 100755 --- a/manager/includes/lang/english.inc.php +++ b/manager/includes/lang/english.inc.php @@ -112,7 +112,7 @@ $_lang["configcheck_cache"] = 'cache directory not writable'; $_lang["configcheck_cache_msg"] = 'MODX cannot write to the cache directory. MODX will still function as expected, but no caching will take place. To solve this, make the /_cache/ directory writable.'; $_lang["configcheck_configinc"] = 'Config file still writable'; -$_lang["configcheck_configinc_msg"] = 'Very naughty people could potentially wreak some havoc on your site and everything associated with it. Really. Please make your config file (/manager/includes/config.inc.php) read only!'; +$_lang["configcheck_configinc_msg"] = 'Very naughty people could potentially wreak some havoc on your site and everything associated with it. Really. Please make your config file (/'.MGR_DIR.'/includes/config.inc.php) read only!'; $_lang["configcheck_default_msg"] = 'An unspecified warning was found. Which is strange.'; $_lang["configcheck_errorpage_unavailable"] = 'Your site\'s Error page is not available.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'This means that your Error page is not accessible to normal web surfers or does not exist. This can lead to a recursive looping condition and many errors in your site logs. Make sure there are no Webuser Groups assigned to the page.'; @@ -1127,7 +1127,7 @@ $_lang['check_files_onlogin_message'] = 'By enabling this option, important system files will be checked for modification typical of scripted website attacks. While not a foolproof guarantee, it may alert you to a compromised MODX system file and website.'; $_lang['configcheck_sysfiles_mod'] = 'Important System Files have been modified.'; -$_lang['configcheck_sysfiles_mod_msg'] = 'You have enabled the setting to check important system files to detect possible website script attacks. This doesn\'t necessarily mean that your site has been compromised, however, you should review the changed files.(index.php, .htaccess, manager/index.php, manager/includes/config.inc.php)'; +$_lang['configcheck_sysfiles_mod_msg'] = 'You have enabled the setting to check important system files to detect possible website script attacks. This doesn\'t necessarily mean that your site has been compromised, however, you should review the changed files.(index.php, .htaccess, '.MGR_DIR.'/index.php, '.MGR_DIR.'/includes/config.inc.php)'; $_lang['setting_resource_tree_node_name'] = 'The node name of a resource tree'; $_lang['setting_resource_tree_node_name_desc'] = 'Specify the Resource field to use when rendering the nodes in the Resource Tree. Defaults to pagetitle, although any Resource field can be used, such as menutitle, alias.'; diff --git a/manager/includes/lang/finnish.inc.php b/manager/includes/lang/finnish.inc.php index 2178eb45d4..670435577f 100755 --- a/manager/includes/lang/finnish.inc.php +++ b/manager/includes/lang/finnish.inc.php @@ -110,7 +110,7 @@ $_lang["configcheck_cache"] = 'Välimuisti-kansioon (cache) ei voi kirjoittaa'; $_lang["configcheck_cache_msg"] = 'MODx ei voi kirjoittaa välimuistikansioon (cache). MODx toimii yhä kuten pitääkin, mutta mitään ei ladata välimuistiin. Ratkaise ongelma antamalla /_cache/ kansioon kirjoitusoikeudet.'; $_lang["configcheck_configinc"] = 'Asetustiedostoon voi yhä kirjoittaa'; -$_lang["configcheck_configinc_msg"] = 'Pahantahtoiset henkilöt voivat hyödyntää tätä murtautuakseen sivustollesi. Korjaa ongelma poistamalla tiedostosta (/manager/includes/config.inc.php) kirjoitusoikeudet!'; +$_lang["configcheck_configinc_msg"] = 'Pahantahtoiset henkilöt voivat hyödyntää tätä murtautuakseen sivustollesi. Korjaa ongelma poistamalla tiedostosta (/'.MGR_DIR.'/includes/config.inc.php) kirjoitusoikeudet!'; $_lang["configcheck_default_msg"] = 'Määrittelemätön varoitus on löytynyt. Outoa.'; $_lang["configcheck_errorpage_unavailable"] = 'Virhesivua ei ole saatavilla.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Virhesivulle ei ole käyttöoikeutta tai sitä ei ole olemassa. Tämä voi aiheuttaa ongelmia sivustolla. Varmista, ettei sivulle ole määritetty web-käyttäjäryhmää.'; diff --git a/manager/includes/lang/francais-utf8.inc.php b/manager/includes/lang/francais-utf8.inc.php index 25c0bda53f..c202ae1a98 100644 --- a/manager/includes/lang/francais-utf8.inc.php +++ b/manager/includes/lang/francais-utf8.inc.php @@ -112,7 +112,7 @@ $_lang["configcheck_cache"] = 'répertoire cache non modifiable'; $_lang["configcheck_cache_msg"] = 'MODx ne peut pas écrire dans le répertoire cache. MODx continuera à fonctionner normalement, mais le cache ne fonctionnera pas. Pour corriger ce problème, veuillez donnez les droits en écriture au répertoire /_cache/.'; $_lang["configcheck_configinc"] = 'Le fichier de configuration est encore accessible en écriture'; -$_lang["configcheck_configinc_msg"] = 'Des personnes mal intentionnées pourraient modifier la configuration de votre site. Modifiez immédiatement les permissions de votre fichier de configuration (/manager/includes/config.inc.php) pour qu\'il reste en lecture seule!'; +$_lang["configcheck_configinc_msg"] = 'Des personnes mal intentionnées pourraient modifier la configuration de votre site. Modifiez immédiatement les permissions de votre fichier de configuration (/'.MGR_DIR.'/includes/config.inc.php) pour qu\'il reste en lecture seule!'; $_lang["configcheck_default_msg"] = 'Une erreur inconnue est survenue. Étrange.'; $_lang["configcheck_errorpage_unavailable"] = 'La page d\'erreur de votre site n\'est pas définie.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Cela signifie que votre page d\'erreur n\'est pas accessible à vos visiteurs ou qu\'elle n\'existe pas. Cela peut provoquer une boucle infinie, générer des erreurs dans vos logs. Assurez vous qu\'aucun Groupe d\'Utilisateurs Web n\'est associé à cette page.'; diff --git a/manager/includes/lang/francais.inc.php b/manager/includes/lang/francais.inc.php index e0ad4fa966..ad1cedd439 100644 --- a/manager/includes/lang/francais.inc.php +++ b/manager/includes/lang/francais.inc.php @@ -112,7 +112,7 @@ $_lang["configcheck_cache"] = 'rpertoire cache non modifiable'; $_lang["configcheck_cache_msg"] = 'MODx ne peut pas crire dans le rpertoire cache. MODx continuera fonctionner normalement, mais le cache ne fonctionnera pas. Pour corriger ce problme, veuillez donnez les droits en criture au rpertoire /_cache/.'; $_lang["configcheck_configinc"] = 'Le fichier de configuration est encore accessible en criture'; -$_lang["configcheck_configinc_msg"] = 'Des personnes mal intentionnes pourraient modifier la configuration de votre site. Modifiez immdiatement les permissions de votre fichier de configuration (/manager/includes/config.inc.php) pour qu\'il reste en lecture seule!'; +$_lang["configcheck_configinc_msg"] = 'Des personnes mal intentionnes pourraient modifier la configuration de votre site. Modifiez immdiatement les permissions de votre fichier de configuration (/'.MGR_DIR.'/includes/config.inc.php) pour qu\'il reste en lecture seule!'; $_lang["configcheck_default_msg"] = 'Une erreur inconnue est survenue. trange.'; $_lang["configcheck_errorpage_unavailable"] = 'La page d\'erreur de votre site n\'est pas dfinie.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Cela signifie que votre page d\'erreur n\'est pas accessible vos visiteurs ou qu\'elle n\'existe pas. Cela peut provoquer une boucle infinie, gnrer des erreurs dans vos logs. Assurez vous qu\'aucun Groupe d\'Utilisateurs Web n\'est associ cette page.'; diff --git a/manager/includes/lang/german.inc.php b/manager/includes/lang/german.inc.php index d35336d1ea..a5afb85569 100644 --- a/manager/includes/lang/german.inc.php +++ b/manager/includes/lang/german.inc.php @@ -114,7 +114,7 @@ $_lang["configcheck_cache"] = 'Das Cache-Verzeichnis ist nicht beschreibbar'; $_lang["configcheck_cache_msg"] = 'MODx kann das Cache-Verzeichnis nicht beschreiben. MODx wird wie erwartet funktionieren, das Caching ist jedoch deaktiviert. Um das Problem zu beheben, machen Sie das Verzeichnis „cache“ im Verzeichnis „assets“ beschreibbar.'; $_lang["configcheck_configinc"] = 'Die Konfigurationsdatei ist weiterhin beschreibbar'; -$_lang["configcheck_configinc_msg"] = 'Böswillige Menschen könnten möglicherweise verheerende Schäden an Ihrer Website und allem was damit verbunden ist anrichten. Wichtig: Bitte ändern Sie die Zugriffsrechte der Konfigurationsdatei (/manager/includes/config.inc.php) auf nur-lesen!'; +$_lang["configcheck_configinc_msg"] = 'Böswillige Menschen könnten möglicherweise verheerende Schäden an Ihrer Website und allem was damit verbunden ist anrichten. Wichtig: Bitte ändern Sie die Zugriffsrechte der Konfigurationsdatei (/'.MGR_DIR.'/includes/config.inc.php) auf nur-lesen!'; $_lang["configcheck_default_msg"] = 'Eine nicht spezifizierte Warnung wurde ermittelt, was seltsam ist.'; $_lang["configcheck_errorpage_unavailable"] = 'Die Fehlerseite Ihres Webauftrittes ist nicht verfügbar.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Ihre Fehlerseite ist für normale Besucher nicht abrufbar oder existiert nicht. Dies kann zu einer Endlosschleife und vielen Fehlermeldungen in Ihren Webserver-Statistiken führen. Stellen Sie sicher, dass der Seite keine Benutzergruppen zugeordnet sind.'; diff --git a/manager/includes/lang/hebrew.inc.php b/manager/includes/lang/hebrew.inc.php index ee88a537be..bdd04c32a6 100755 --- a/manager/includes/lang/hebrew.inc.php +++ b/manager/includes/lang/hebrew.inc.php @@ -104,7 +104,7 @@ $_lang["configcheck_cache"] = 'תיקיית זיכרון המטמון לא ניתנת לכתיבה'; $_lang["configcheck_cache_msg"] = 'MODx לא יכול לכתוב לתיקיית זיכרון המטמון . MODx ימשיך לתפקד כמצופה, אך לא ניתן יהיה להשתמש בזיכרון מטמון. כדי לפתור את זה, יש לתת לתיקיית / _cache / הרשאות כתיבה.'; $_lang["configcheck_configinc"] = 'קובץ ההגדרות עדיין ניתן לכתיבה'; -$_lang["configcheck_configinc_msg"] = 'אנא הפוך את קובץ התצורה (/manager/includes/config.inc.php) לקריאה בלבד!'; +$_lang["configcheck_configinc_msg"] = 'אנא הפוך את קובץ התצורה (/'.MGR_DIR.'/includes/config.inc.php) לקריאה בלבד!'; $_lang["configcheck_default_msg"] = 'אזהרה לא מוגדרת נמצאה. הדבר מוזר.'; $_lang["configcheck_errorpage_unavailable"] = 'דף השגיאה של האתר לא זמין.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'This means that your Error page is not accessible to normal web surfers or does not exist. This can lead to a recursive looping condition and many errors in your site logs. Make sure there are no webuser groups assigned to the page.'; diff --git a/manager/includes/lang/italian.inc.php b/manager/includes/lang/italian.inc.php index fc93da3ecb..313779c80e 100755 --- a/manager/includes/lang/italian.inc.php +++ b/manager/includes/lang/italian.inc.php @@ -111,8 +111,8 @@ $_lang["configcheck_admin"] = 'Vi preghiamo di contattare gli amministratori di sistema e avvisarli di questo messaggio!'; $_lang["configcheck_cache"] = 'cartella cache non scrivibile'; $_lang["configcheck_cache_msg"] = 'MODx non può scrivere nella cartella cache. MODx continuerà a funzionare come previsto, ma non avverrà alcuna operazione di caching. Per risolvere, rendete la cartella /_cache/ scrivibile.'; -$_lang["configcheck_configinc"] = 'Il file di configurazione (/manager/includes/config.inc.php) è ancora scrivibile'; -$_lang["configcheck_configinc_msg"] = 'Malintenzionati potrebbero combinare guai sul vostro sito e tutto ciò che è collegato ad esso. Sul serio. Impostate il file di configurazione (/manager/includes/config.inc.php) in sola lettura!'; +$_lang["configcheck_configinc"] = 'Il file di configurazione (/'.MGR_DIR.'/includes/config.inc.php) è ancora scrivibile'; +$_lang["configcheck_configinc_msg"] = 'Malintenzionati potrebbero combinare guai sul vostro sito e tutto ciò che è collegato ad esso. Sul serio. Impostate il file di configurazione (/'.MGR_DIR.'/includes/config.inc.php) in sola lettura!'; $_lang["configcheck_default_msg"] = 'E\' stato trovato un avviso non specificato. Che è sconosciuto.'; $_lang["configcheck_errorpage_unavailable"] = 'La pagina di Errore del vostro sito non è disponibile.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Ciò significa che la pagina di Errore non è accessibile da parte di normali visitatori web oppure non esiste. Questo fatto può portare ad una condizione di loop ricorsivo e generare numerosi errori nel log del vostro sito. Verificate che non ci siano Gruppi di Utenti Web assegnati a questa pagina.'; diff --git a/manager/includes/lang/japanese-utf8.inc.php b/manager/includes/lang/japanese-utf8.inc.php index 7f492c3af7..4c2391cbb6 100755 --- a/manager/includes/lang/japanese-utf8.inc.php +++ b/manager/includes/lang/japanese-utf8.inc.php @@ -114,7 +114,7 @@ $_lang["configcheck_cache"] = 'キャッシュディレクトリに書き込みできません'; $_lang["configcheck_cache_msg"] = 'キャッシュファイルを更新できません。MODXは動作しますが、キャッシュが利用できないためレスポンスが悪化します。/cache/ ディレクトリを書き込み可能にしてください。'; $_lang["configcheck_configinc"] = '設定ファイルがまだ書き込み可能になっています'; -$_lang["configcheck_configinc_msg"] = '設定ファイルが書き込み可能になっているため、悪意の第三者による操作がしやすい状態になっています。 /manager/includes/config.inc.php のパーミッションを404などに設定し、書込み不可にしてください。'; +$_lang["configcheck_configinc_msg"] = '設定ファイルが書き込み可能になっているため、悪意の第三者による操作がしやすい状態になっています。 /'.MGR_DIR.'/includes/config.inc.php のパーミッションを404などに設定し、書込み不可にしてください。'; $_lang["configcheck_default_msg"] = '原因不明のエラーが存在します。'; $_lang["configcheck_errorpage_unavailable"] = '設定した「エラーページ」は利用できません'; $_lang["configcheck_errorpage_unavailable_msg"] = '設定した「エラーページ」が一般的なエンドユーザーからアクセスできないページ（private）かあるいは存在しないことを意味しています。この場合、システムがループ状態に陥り、多くのエラーメッセージをエラーログに記録してしまいます。「エラーページ」には存在するページでかつ、公開ページ、かつ「public」なページを指定してください。'; diff --git a/manager/includes/lang/nederlands-utf8.inc.php b/manager/includes/lang/nederlands-utf8.inc.php index 0716af5aca..4b7160e6b8 100644 --- a/manager/includes/lang/nederlands-utf8.inc.php +++ b/manager/includes/lang/nederlands-utf8.inc.php @@ -114,7 +114,7 @@ $_lang["configcheck_cache"] = 'Kan niet schrijven in de cache Map'; $_lang["configcheck_cache_msg"] = 'MODx kan niet naar de cache Map schrijven. MODx blijft normaal functioneren, maar er zal geen caching plaatsvinden. Om dit probleem op te lossen dient u de /_cache/ Map schrijfrechten te geven.'; $_lang["configcheck_configinc"] = 'Configuratiebestand heeft nog schrijfrechten'; -$_lang["configcheck_configinc_msg"] = 'Slechtwillenden zouden mogelijk schade aan uw website kunnen toebrengen met alle gevolgen van dien. Echt waar. Zet a.u.b. uw configuratiebestand (/manager/includes/config.inc.php) op alleen-lezen!'; +$_lang["configcheck_configinc_msg"] = 'Slechtwillenden zouden mogelijk schade aan uw website kunnen toebrengen met alle gevolgen van dien. Echt waar. Zet a.u.b. uw configuratiebestand (/'.MGR_DIR.'/includes/config.inc.php) op alleen-lezen!'; $_lang["configcheck_default_msg"] = 'Er is een ongedefinieerde waarschuwing gevonden. Dit is zeer vreemd.'; $_lang["configcheck_errorpage_unavailable"] = 'Er is geen \'Fout\'-pagina voor uw website beschikbaar.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Dit houdt in dat uw \'Fout\'-pagina niet toegankelijk is voor normale Webgebruikers of niet bestaat. Dit kan leiden tot een oneindige lus en veel foutmeldingen in uw logbestand. Zorg ervoor dat de Pagina niet aan een Webgebruikersgroep is toegewezen.'; diff --git a/manager/includes/lang/nederlands.inc.php b/manager/includes/lang/nederlands.inc.php index fd872009ea..39751fc090 100644 --- a/manager/includes/lang/nederlands.inc.php +++ b/manager/includes/lang/nederlands.inc.php @@ -114,7 +114,7 @@ $_lang["configcheck_cache"] = 'Kan niet schrijven in de cache Map'; $_lang["configcheck_cache_msg"] = 'MODx kan niet naar de cache Map schrijven. MODx blijft normaal functioneren, maar er zal geen caching plaatsvinden. Om dit probleem op te lossen dient u de /_cache/ Map schrijfrechten te geven.'; $_lang["configcheck_configinc"] = 'Configuratiebestand heeft nog schrijfrechten'; -$_lang["configcheck_configinc_msg"] = 'Slechtwillenden zouden mogelijk schade aan uw website kunnen toebrengen met alle gevolgen van dien. Echt waar. Zet a.u.b. uw configuratiebestand (/manager/includes/config.inc.php) op alleen-lezen!'; +$_lang["configcheck_configinc_msg"] = 'Slechtwillenden zouden mogelijk schade aan uw website kunnen toebrengen met alle gevolgen van dien. Echt waar. Zet a.u.b. uw configuratiebestand (/'.MGR_DIR.'/includes/config.inc.php) op alleen-lezen!'; $_lang["configcheck_default_msg"] = 'Er is een ongedefinieerde waarschuwing gevonden. Dit is zeer vreemd.'; $_lang["configcheck_errorpage_unavailable"] = 'Er is geen \'Fout\'-pagina voor uw website beschikbaar.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Dit houdt in dat uw \'Fout\'-pagina niet toegankelijk is voor normale Webgebruikers of niet bestaat. Dit kan leiden tot een oneindige lus en veel foutmeldingen in uw logbestand. Zorg ervoor dat de Pagina niet aan een Webgebruikersgroep is toegewezen.'; diff --git a/manager/includes/lang/norsk.inc.php b/manager/includes/lang/norsk.inc.php index ca8f8a7e92..efb93e2934 100644 --- a/manager/includes/lang/norsk.inc.php +++ b/manager/includes/lang/norsk.inc.php @@ -93,7 +93,7 @@ $_lang["configcheck_cache"] = 'cache-mappen er ikke skrivbar'; $_lang["configcheck_cache_msg"] = 'MODx kan ikke skrive til cache-mappen. MODx kommer fortsatt til å virke som ventet, men ingen dokumenter vil caches. For å fikse dette, gjør /_cache/-mappen skrivbar.'; $_lang["configcheck_configinc"] = 'Konfigurasjonsfil er fortsatt skrivbar'; -$_lang["configcheck_configinc_msg"] = 'En angriper kan potensielt ødelegge siden din og alt som er relatert til den. Vennligst fjern skriverettigheter til konfigurasjonsfilen din (/manager/includes/config.inc.php) for å være sikker!'; +$_lang["configcheck_configinc_msg"] = 'En angriper kan potensielt ødelegge siden din og alt som er relatert til den. Vennligst fjern skriverettigheter til konfigurasjonsfilen din (/'.MGR_DIR.'/includes/config.inc.php) for å være sikker!'; $_lang["configcheck_default_msg"] = 'En uspesifisert advarsel ble funnet. Dette skal vanligvis ikke forekomme.'; $_lang["configcheck_images"] = 'Bildemappen er ikke skrivbar'; $_lang["configcheck_images_msg"] = 'Bildemappen er ikke skrivbar eller finnes ikke. Dette betyr at bildehånteringsfunksjonene i editoren ikke kommer til å fungere!'; diff --git a/manager/includes/lang/persian.inc.php b/manager/includes/lang/persian.inc.php index 188be62f31..1cf15680e1 100755 --- a/manager/includes/lang/persian.inc.php +++ b/manager/includes/lang/persian.inc.php @@ -98,7 +98,7 @@ $_lang["configcheck_cache"] = 'پوشه یا دایره ی دخیره یا کش قابل نگارش نیست'; $_lang["configcheck_cache_msg"] = 'سیستم امکان ایجاد نگارشی جدید در دایره ذخیره یا کش را ندارد. سیستم به فعالیت خود همچون گذشته ادامه میدهد, اما ذخیره ای صورت نمیگیرد. برای رفع این موضوع, لطفا پوشه ی /_cache/ را قابل نگارش نمایید.'; $_lang["configcheck_configinc"] = 'فایل کانفیگ همچنان قابل نگارش است'; -$_lang["configcheck_configinc_msg"] = 'انسانهای بی وجدان ممکن است از طریق این مسئله به وبگاه یا فایلهای مشترک با آن آسیب برسانند. حتما فایل کانفیگ خود را (/manager/includes/config.inc.php) تنها قابل بازخوانی کنید و از این حالت با قابلیت نگارش خارج کنید.'; +$_lang["configcheck_configinc_msg"] = 'انسانهای بی وجدان ممکن است از طریق این مسئله به وبگاه یا فایلهای مشترک با آن آسیب برسانند. حتما فایل کانفیگ خود را (/'.MGR_DIR.'/includes/config.inc.php) تنها قابل بازخوانی کنید و از این حالت با قابلیت نگارش خارج کنید.'; $_lang["configcheck_default_msg"] = 'به مشکلی برخوردید که توضیحی برای آن نداریم.'; $_lang["configcheck_errorpage_unavailable"] = 'صفحه ی ارور وبگاه شما در دسترس یا حاضر نیست.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'به این معنی که صفحه ی ارور شما برای بازدیدکنندگان وبگاه شما قابل دسترس یا موجود نیست. این مسئله منجر به ارورهای دیگر و مشکلات عدیده ی دیگر در وبگاه شما خواهد شد. لطفا از این موضوع اطمینان حاصل کنید که هیچ گروه کاربری به این فایل دسترسی ندارد.'; diff --git a/manager/includes/lang/polish-utf8.inc.php b/manager/includes/lang/polish-utf8.inc.php index a24b8f8b37..ab6eea063c 100644 --- a/manager/includes/lang/polish-utf8.inc.php +++ b/manager/includes/lang/polish-utf8.inc.php @@ -121,7 +121,7 @@ $_lang["configcheck_cache"] = 'katalog cache\'u nie jest zapisywalny'; $_lang["configcheck_cache_msg"] = 'MODx nie może zapisać do katalogu cache\'u. MODx będzie wciąż działał poprawnie, ale strony nie będą cache\'owane. Aby rozwiązać ten problem, nadaj uprawnienia do zapisu dla katalogu /_cache/.'; $_lang["configcheck_configinc"] = 'Plik konfiguracyjny jest zapisywalny'; -$_lang["configcheck_configinc_msg"] = 'Dla większego bezpieczeństwa ustaw prawa dostępu do pliku konfiguracji (/manager/includes/config.inc.php) na tylko do odczytu.'; +$_lang["configcheck_configinc_msg"] = 'Dla większego bezpieczeństwa ustaw prawa dostępu do pliku konfiguracji (/'.MGR_DIR.'/includes/config.inc.php) na tylko do odczytu.'; $_lang["configcheck_default_msg"] = 'Wystąpił nieokreślony błąd.'; $_lang["configcheck_errorpage_unavailable"] = 'Strona błędu Twojego serwisu jest niedostępna'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Oznacza to, że Twoja strona błędu jest niedostępna dla użytkowników albo nie istnieje. Może to powodować niestabilność i wiele błędnych wpisów w logach serwisu. Upewnij się, że żadna grupa użytkowników nie jest przypisana do strony.'; diff --git a/manager/includes/lang/polish.inc.php b/manager/includes/lang/polish.inc.php index 92e237416b..c46a5af181 100644 --- a/manager/includes/lang/polish.inc.php +++ b/manager/includes/lang/polish.inc.php @@ -121,7 +121,7 @@ $_lang["configcheck_cache"] = 'katalog cache\'u nie jest zapisywalny'; $_lang["configcheck_cache_msg"] = 'MODx nie moe zapisa do katalogu cache\'u. MODx bdzie wci dziaa poprawnie, ale strony nie bd cache\'owane. Aby rozwiza ten problem, nadaj uprawnienia do zapisu dla katalogu /_cache/.'; $_lang["configcheck_configinc"] = 'Plik konfiguracyjny jest zapisywalny'; -$_lang["configcheck_configinc_msg"] = 'Dla wikszego bezpieczestwa ustaw prawa dostpu do pliku konfiguracji (/manager/includes/config.inc.php) na tylko do odczytu.'; +$_lang["configcheck_configinc_msg"] = 'Dla wikszego bezpieczestwa ustaw prawa dostpu do pliku konfiguracji (/'.MGR_DIR.'/includes/config.inc.php) na tylko do odczytu.'; $_lang["configcheck_default_msg"] = 'Wystpi nieokrelony bd.'; $_lang["configcheck_errorpage_unavailable"] = 'Strona bdu Twojego serwisu jest niedostpna'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Oznacza to, e Twoja strona bdu jest niedostpna dla uytkownikw albo nie istnieje. Moe to powodowa niestabilno i wiele bdnych wpisw w logach serwisu. Upewnij si, e adna grupa uytkownikw nie jest przypisana do strony.'; diff --git a/manager/includes/lang/portuguese-br.inc.php b/manager/includes/lang/portuguese-br.inc.php index 5569156879..cf0ba4382e 100755 --- a/manager/includes/lang/portuguese-br.inc.php +++ b/manager/includes/lang/portuguese-br.inc.php @@ -99,7 +99,7 @@ $_lang["configcheck_cache"] = 'O diretório do cache não tem permissão de escrita'; $_lang["configcheck_cache_msg"] = 'O sistema MODx não pode escrever o diretório de cache. O sistema MODx continuará a funcionar como esperado, mas a cache não estará activa. Para resolver isto, active a permissão de escrita no diretório do cache (/_cache/).'; $_lang["configcheck_configinc"] = 'Arquivo de configuração ainda editável'; -$_lang["configcheck_configinc_msg"] = 'Gente mal intencionada poderá eventualmente afetar seriamente o site e tudo o que lhe estiver associado. A sério. Por favor desligue as permissões de escrita no arquivo de configuração (/manager/includes/config.inc.php)!'; +$_lang["configcheck_configinc_msg"] = 'Gente mal intencionada poderá eventualmente afetar seriamente o site e tudo o que lhe estiver associado. A sério. Por favor desligue as permissões de escrita no arquivo de configuração (/'.MGR_DIR.'/includes/config.inc.php)!'; $_lang["configcheck_default_msg"] = 'Um erro não especificado foi encontrado. Contacte o suporte técnico.'; $_lang["configcheck_errorpage_unavailable"] = 'A página de erro do seu site não está disponível.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Isto significa que a Página de erro não está disponível a usuários normais da web ou não existe. Isto pode conduzir a um ciclo recursivo e a muitos erros nos registos do site. Certifique-se de que não existem grupos de webusers alocados a essa página.'; diff --git a/manager/includes/lang/portuguese.inc.php b/manager/includes/lang/portuguese.inc.php index 7f2b4693a5..82584c6a39 100644 --- a/manager/includes/lang/portuguese.inc.php +++ b/manager/includes/lang/portuguese.inc.php @@ -95,7 +95,7 @@ $_lang["configcheck_cache"] = 'O directório da cache não tem permissão de escrita'; $_lang["configcheck_cache_msg"] = 'O sistema MODx não pode escrever o directório de cache. O sistema MODx continuará a funcionar como esperado, mas a cache não estará activa. Para resolver isto, active a permissão de escrita no directório da cache (/_cache/).'; $_lang["configcheck_configinc"] = 'Ficheiro de configuração ainda editável'; -$_lang["configcheck_configinc_msg"] = 'Gente mal intencionada poderá eventualmente afectar seriamente o site e tudo o que lhe estiver associado. A sério. Por favor desligue as permissões de escrita no ficheiro de configuração (/manager/includes/config.inc.php)!'; +$_lang["configcheck_configinc_msg"] = 'Gente mal intencionada poderá eventualmente afectar seriamente o site e tudo o que lhe estiver associado. A sério. Por favor desligue as permissões de escrita no ficheiro de configuração (/'.MGR_DIR.'/includes/config.inc.php)!'; $_lang["configcheck_default_msg"] = 'Um erro não especificado foi encontrado. Contacte o suporte técnico.'; $_lang["configcheck_errorpage_unavailable"] = 'A página de erro do seu site não está disponível.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Isto significa que a Página de erro não está disponível a utilizadores normais da web ou não existe. Isto pode conduzir a um ciclo recursivo e a muitos erros nos registos do site. Certifique-se de que não existem grupos de webusers alocados a essa página.'; diff --git a/manager/includes/lang/russian-UTF8.inc.php b/manager/includes/lang/russian-UTF8.inc.php index a7e21c0bdd..0968910804 100755 --- a/manager/includes/lang/russian-UTF8.inc.php +++ b/manager/includes/lang/russian-UTF8.inc.php @@ -112,7 +112,7 @@ $_lang["configcheck_cache"] = 'невозможна запись в папку кэширования'; $_lang["configcheck_cache_msg"] = 'MODx не в состоянии записывать данные в папку кэширования. Система будет работать нормально, но кэширования происходить не будет. Для решения проблемы разрешите запись в папку /assets/cache.'; $_lang["configcheck_configinc"] = 'Файл конфигурации все еще доступен для записи'; -$_lang["configcheck_configinc_msg"] = 'Злоумышленники потенциально могут нанести вред вашему сайту. Серьёзно. Пожалуйста, установите права доступа к файлу конфигурации (/manager/includes/config.inc.php) в режим \'Только для чтения\''; +$_lang["configcheck_configinc_msg"] = 'Злоумышленники потенциально могут нанести вред вашему сайту. Серьёзно. Пожалуйста, установите права доступа к файлу конфигурации (/'.MGR_DIR.'/includes/config.inc.php) в режим \'Только для чтения\''; $_lang["configcheck_default_msg"] = 'Неопределенная ошибка.'; $_lang["configcheck_errorpage_unavailable"] = 'Страница сообщения об ошибке, указанная в конфигурации сайта, недоступна.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Это означает, что она не существует или недоступна обычным посетителям сайта. Это может привести к циклическому вызову функции \'сообщения об ошибке\' и большому количеству записей в журнале сайта. Убедитесь, что нет групп веб-пользователей, которым назначена эта страница.'; diff --git a/manager/includes/lang/russian.inc.php b/manager/includes/lang/russian.inc.php index 90d48cc340..052cb286dd 100755 --- a/manager/includes/lang/russian.inc.php +++ b/manager/includes/lang/russian.inc.php @@ -111,7 +111,7 @@ $_lang["configcheck_cache"] = ' '; $_lang["configcheck_cache_msg"] = 'MODx . , . /assets/cache.'; $_lang["configcheck_configinc"] = ' '; -$_lang["configcheck_configinc_msg"] = ' . . , (/manager/includes/config.inc.php) \' \''; +$_lang["configcheck_configinc_msg"] = ' . . , (/'.MGR_DIR.'/includes/config.inc.php) \' \''; $_lang["configcheck_default_msg"] = ' .'; $_lang["configcheck_errorpage_unavailable"] = ' , , .'; $_lang["configcheck_errorpage_unavailable_msg"] = ' , . \' \' . , -, .'; diff --git a/manager/includes/lang/spanish-utf8.inc.php b/manager/includes/lang/spanish-utf8.inc.php index bd3ec69578..e6cab8242b 100644 --- a/manager/includes/lang/spanish-utf8.inc.php +++ b/manager/includes/lang/spanish-utf8.inc.php @@ -107,7 +107,7 @@ $_lang["configcheck_cache"] = 'el directorio cache no es escribible'; $_lang["configcheck_cache_msg"] = 'MODx no puede escribir en el directorio cache. MODx continuará funcionando como es esperado, pero no realizará ningún cache. Para solucionar esto, haz el directorio /_cache/ escribible.'; $_lang["configcheck_configinc"] = 'El archivo de configuración todavía es escribible'; -$_lang["configcheck_configinc_msg"] = 'Personas muy malintencionadas podrían potencialmente probocar algunos problemas en tu sitio y todo lo asociado con él. En serio. Por favor ¡Haz tu archivo de configuración (/manager/includes/config.inc.php) de sólo lectura!'; +$_lang["configcheck_configinc_msg"] = 'Personas muy malintencionadas podrían potencialmente probocar algunos problemas en tu sitio y todo lo asociado con él. En serio. Por favor ¡Haz tu archivo de configuración (/'.MGR_DIR.'/includes/config.inc.php) de sólo lectura!'; $_lang["configcheck_default_msg"] = 'Una alerta no especificada ha sido encontrada. Lo cual es extraño.'; $_lang["configcheck_errorpage_unavailable"] = 'La página de error de tu sitio no está disponible.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Esto significa que tu página de Error no es accesible para navegantes normales de internet o que no existe. Esto puede provocar un estado de circulo cerrado y varios errores en la bitácora de tu sitio. Asegúrate de que nohaya grupos de usuarios asignados a la página.'; diff --git a/manager/includes/lang/spanish.inc.php b/manager/includes/lang/spanish.inc.php index fa20fc6b1a..159f62b74a 100755 --- a/manager/includes/lang/spanish.inc.php +++ b/manager/includes/lang/spanish.inc.php @@ -108,7 +108,7 @@ $_lang["configcheck_cache"] = 'el directorio cache no es escribible'; $_lang["configcheck_cache_msg"] = 'MODx no puede escribir en el directorio cache. MODx continuar funcionando como es esperado, pero no realizar ningn cache. Para solucionar esto, haz el directorio /_cache/ escribible.'; $_lang["configcheck_configinc"] = 'El archivo de configuracin todava es escribible'; -$_lang["configcheck_configinc_msg"] = 'Personas muy malintencionadas podran potencialmente probocar algunos problemas en tu sitio y todo lo asociado con l. En serio. Por favor Haz tu archivo de configuracin (/manager/includes/config.inc.php) de slo lectura!'; +$_lang["configcheck_configinc_msg"] = 'Personas muy malintencionadas podran potencialmente probocar algunos problemas en tu sitio y todo lo asociado con l. En serio. Por favor Haz tu archivo de configuracin (/'.MGR_DIR.'/includes/config.inc.php) de slo lectura!'; $_lang["configcheck_default_msg"] = 'Una alerta no especificada ha sido encontrada. Lo cual es extrao.'; $_lang["configcheck_errorpage_unavailable"] = 'La pgina de error de tu sitio no est disponible.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Esto significa que tu pgina de Error no es accesible para navegantes normales de internet o que no existe. Esto puede provocar un estado de circulo cerrado y varios errores en la bitcora de tu sitio. Asegrate de que nohaya grupos de usuarios asignados a la pgina.'; diff --git a/manager/includes/lang/svenska-utf8.inc.php b/manager/includes/lang/svenska-utf8.inc.php index e1354937a9..fc9576d6fd 100755 --- a/manager/includes/lang/svenska-utf8.inc.php +++ b/manager/includes/lang/svenska-utf8.inc.php @@ -112,7 +112,7 @@ $_lang["configcheck_cache"] = 'cache-katalogen är inte skrivbar'; $_lang["configcheck_cache_msg"] = 'MODx kan inte skriva till cache-katalogen. MODx kommer fortfarande att fungera som förväntat, men inga resurser kommer att cachas. För att rätta till det här, gör /_cache/-katalogen skrivbar.'; $_lang["configcheck_configinc"] = 'Konfigurationsfilen är fortfarande skrivbar'; -$_lang["configcheck_configinc_msg"] = 'Elaka människor kan orsaka stora skador på din webbplats och allt som hör till den. På riktigt. Se till att konfigurationsfilen (/manager/includes/config.inc.php) blir skrivskyddad!'; +$_lang["configcheck_configinc_msg"] = 'Elaka människor kan orsaka stora skador på din webbplats och allt som hör till den. På riktigt. Se till att konfigurationsfilen (/'.MGR_DIR.'/includes/config.inc.php) blir skrivskyddad!'; $_lang["configcheck_default_msg"] = 'En ospecificerad varning hittades, vilket är konstigt.'; $_lang["configcheck_errorpage_unavailable"] = 'Felsidan för din webbplats är inte tillgänglig.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Detta betyder att din felsida inte är tillgänglig för vanliga användare eller att den inte existerar. Det här kan leda till att ett tillstånd med upprepande loopar skapas och ger upphov till att många fel rapporteras i webbplatsens loggar. Kontrollera att inga webbanvändargrupper är anslutna till sidan.'; diff --git a/manager/includes/lang/svenska.inc.php b/manager/includes/lang/svenska.inc.php index 53f1f924b5..010d0f05c1 100755 --- a/manager/includes/lang/svenska.inc.php +++ b/manager/includes/lang/svenska.inc.php @@ -112,7 +112,7 @@ $_lang["configcheck_cache"] = 'cache-katalogen r inte skrivbar'; $_lang["configcheck_cache_msg"] = 'MODx kan inte skriva till cache-katalogen. MODx kommer fortfarande att fungera som frvntat, men inga resurser kommer att cachas. Fr att rtta till det hr, gr /_cache/-katalogen skrivbar.'; $_lang["configcheck_configinc"] = 'Konfigurationsfilen r fortfarande skrivbar'; -$_lang["configcheck_configinc_msg"] = 'Elaka mnniskor kan orsaka stora skador p din webbplats och allt som hr till den. P riktigt. Se till att konfigurationsfilen (/manager/includes/config.inc.php) blir skrivskyddad!'; +$_lang["configcheck_configinc_msg"] = 'Elaka mnniskor kan orsaka stora skador p din webbplats och allt som hr till den. P riktigt. Se till att konfigurationsfilen (/'.MGR_DIR.'/includes/config.inc.php) blir skrivskyddad!'; $_lang["configcheck_default_msg"] = 'En ospecificerad varning hittades, vilket r konstigt.'; $_lang["configcheck_errorpage_unavailable"] = 'Felsidan fr din webbplats r inte tillgnglig.'; $_lang["configcheck_errorpage_unavailable_msg"] = 'Detta betyder att din felsida inte r tillgnglig fr vanliga anvndare eller att den inte existerar. Det hr kan leda till att ett tillstnd med upprepande loopar skapas och ger upphov till att mnga fel rapporteras i webbplatsens loggar. Kontrollera att inga webbanvndargrupper r anslutna till sidan.'; From debbb689ca30bb9ad20556ec9493e1bb0db78178 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Thu, 23 May 2013 00:36:25 +0300 Subject: [PATCH 034/530] Refactor #9884 MODX_MANAGER_PATH step5 --- assets/modules/docmanager/tv.ajax.php | 2 +- index-ajax.php | 3 ++- index.php | 4 ++-- install/action.connection.php | 4 ++++ install/action.mode.php | 6 ++++++ install/action.options.php | 8 +++++++- install/action.summary.php | 8 +++++++- install/index.php | 8 +++++++- install/instprocessor.php | 5 +++++ install/setup.info.php | 5 ++++- manager/index.php | 21 +++++++++++++++++++-- 11 files changed, 64 insertions(+), 10 deletions(-) diff --git a/assets/modules/docmanager/tv.ajax.php b/assets/modules/docmanager/tv.ajax.php index 43cb6d5dfc..6a80299cc4 100644 --- a/assets/modules/docmanager/tv.ajax.php +++ b/assets/modules/docmanager/tv.ajax.php @@ -3,7 +3,7 @@ * This file includes slightly modified code from the MODx core distribution. */ -define("MGR_DIR", "manager"); +include_once("../../cache/siteManager.php"); require_once '../../../'.MGR_DIR.'/includes/protect.inc.php'; include_once ('../../../'.MGR_DIR.'/includes/config.inc.php'); diff --git a/index-ajax.php b/index-ajax.php index 18a56fbeaf..512dfd6830 100644 --- a/index-ajax.php +++ b/index-ajax.php @@ -4,7 +4,8 @@ // Any PHP files in these directories can be executed by any user. $allowed_dirs = array('assets/snippets/ajaxSearch/'); -define("MGR_DIR", "manager"); +include_once(dirname(__FILE__)."/assets/cache/siteManager.php"); + // harden it require_once('./'.MGR_DIR.'/includes/protect.inc.php'); diff --git a/index.php b/index.php index 7167989e36..e9d0c70574 100644 --- a/index.php +++ b/index.php @@ -44,7 +44,7 @@ * Initialize Document Parsing * ----------------------------- */ -define("MGR_DIR", "manager"); +include_once(dirname(__FILE__)."/assets/cache/siteManager.php"); // get start time $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tstart = $mtime; @@ -111,7 +111,7 @@ startCMSSession(); // initiate a new document parser -include_once(MODX_MANAGER_PATH.'/includes/document.parser.class.inc.php'); +include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php'); $modx = new DocumentParser; $etomite = &$modx; // for backward compatibility diff --git a/install/action.connection.php b/install/action.connection.php index b37141531a..a59b1c4c2c 100644 --- a/install/action.connection.php +++ b/install/action.connection.php @@ -1,6 +1,10 @@ " . $_lang['preinstall_validation'] . "

    "; echo "

    " . $_lang['summary_setup_check'] . "

    "; diff --git a/install/index.php b/install/index.php index 74ed0dee09..7332cbb663 100755 --- a/install/index.php +++ b/install/index.php @@ -15,7 +15,13 @@ // set error reporting error_reporting(E_ALL & ~E_NOTICE); -define("MGR_DIR", "manager"); +if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) { + include_once(dirname(__FILE__)."/../assets/cache/siteManager.php"); +}else{ + define('MGR_DIR', 'manager'); +} + + require_once("lang.php"); require_once('../'.MGR_DIR.'/includes/version.inc.php'); diff --git a/install/instprocessor.php b/install/instprocessor.php index 498dfec2dc..e7922d16ea 100755 --- a/install/instprocessor.php +++ b/install/instprocessor.php @@ -1,5 +1,10 @@ Date: Thu, 23 May 2013 01:26:03 +0300 Subject: [PATCH 035/530] small fix --- install/instprocessor.php | 7 +++++++ manager/actions/files.dynamic.php | 2 +- manager/actions/modules.static.php | 2 +- manager/actions/mutate_content.dynamic.php | 6 +++--- manager/actions/mutate_htmlsnippet.dynamic.php | 4 ++-- manager/actions/mutate_plugin.dynamic.php | 4 ++-- manager/actions/mutate_plugin_priority.dynamic.php | 2 +- manager/actions/mutate_snippet.dynamic.php | 6 +++--- manager/actions/mutate_templates.dynamic.php | 4 ++-- manager/actions/mutate_tmplvars.dynamic.php | 4 ++-- manager/actions/mutate_user.dynamic.php | 4 ++-- manager/actions/wait.static.php | 2 +- manager/frames/menu.php | 2 +- manager/includes/config_check.inc.php | 2 +- manager/includes/sysalert.display.inc.php | 2 +- manager/processors/delete_content.processor.php | 2 +- manager/processors/duplicate_content.processor.php | 2 +- manager/processors/login.processor.php | 3 ++- manager/processors/save_content.processor.php | 2 +- manager/processors/undelete_content.processor.php | 2 +- 20 files changed, 36 insertions(+), 28 deletions(-) diff --git a/install/instprocessor.php b/install/instprocessor.php index e7922d16ea..9ff747697d 100755 --- a/install/instprocessor.php +++ b/install/instprocessor.php @@ -203,7 +203,14 @@ function parseProperties($propertyString) { echo "".$_lang['ok']."

    "; } } + +// custom or not +if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) { + $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");'; +}else{ $mgrdir = 'define(\'MGR_DIR\', \'manager\');'; +} + // write the config.inc.php file if new installation echo "

    " . $_lang['writing_config_file']; $configString = 'config['base_path'] . 'manager'; + $proteted_path[] = $modx->config['modx_manager_path']; $proteted_path[] = $modx->config['base_path'] . 'temp/backup'; $proteted_path[] = $modx->config['base_path'] . 'assets/backup'; diff --git a/manager/actions/modules.static.php b/manager/actions/modules.static.php index 4c10821095..0488fca532 100644 --- a/manager/actions/modules.static.php +++ b/manager/actions/modules.static.php @@ -85,7 +85,7 @@ function menuAction(a) {

    diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index 2c25ad1640..61d20a173c 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -526,10 +526,10 @@ function decode(s) { + " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" /> - diff --git a/manager/actions/mutate_htmlsnippet.dynamic.php b/manager/actions/mutate_htmlsnippet.dynamic.php index 708507a9d4..2e92041fb8 100644 --- a/manager/actions/mutate_htmlsnippet.dynamic.php +++ b/manager/actions/mutate_htmlsnippet.dynamic.php @@ -135,10 +135,10 @@ function deletedocument() { + + setCachepath($basePath.'/assets/cache/'); + $sync->setCachepath($basePath.'assets/cache/'); $sync->setReport(false); $sync->emptyCache(); // first empty the cache } diff --git a/manager/actions/mutate_snippet.dynamic.php b/manager/actions/mutate_snippet.dynamic.php index fb3bfe93b4..27444b776a 100644 --- a/manager/actions/mutate_snippet.dynamic.php +++ b/manager/actions/mutate_snippet.dynamic.php @@ -111,7 +111,7 @@ function showParameters(ctrl) { dp = (f.properties.value) ? f.properties.value.split("&"):""; if(!dp) tr.style.display='none'; else { - t='
    +   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />   onclick="changestate(document.mutate.hidemenu);" />  " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
    '; + t='
    '; for(p = 0; p < dp.length; p++) { dp[p]=(dp[p]+'').replace(/^\s|\s$/,""); // trim ar = dp[p].split("="); @@ -276,9 +276,9 @@ function decode(s){ + + " /> + + } -x=window.setTimeout('goHome()',2000); +x=window.setTimeout('goHome()',1000); diff --git a/manager/frames/menu.php b/manager/frames/menu.php index 6dce737aab..e58079bebf 100644 --- a/manager/frames/menu.php +++ b/manager/frames/menu.php @@ -136,7 +136,7 @@ function startrefresh(rFrame){ y=window.setTimeout('reloadtree()',500); } if(rFrame==10) { - window.top.location.href = "../manager"; + window.top.location.href = "../"; } } diff --git a/manager/includes/config_check.inc.php b/manager/includes/config_check.inc.php index 2dfa163f27..a48abc3811 100755 --- a/manager/includes/config_check.inc.php +++ b/manager/includes/config_check.inc.php @@ -134,7 +134,7 @@ function checkSiteCache() { } if (count($_lang)!=$length_eng_lang) { - $warningspresent = 1; + $warningspresent = 0; $warnings[] = array($_lang['configcheck_lang_difference']); } diff --git a/manager/includes/sysalert.display.inc.php b/manager/includes/sysalert.display.inc.php index 6ca21f4b0b..0b97e73b96 100755 --- a/manager/includes/sysalert.display.inc.php +++ b/manager/includes/sysalert.display.inc.php @@ -24,7 +24,7 @@ ?> config['site_manager_url'].'media/style/'.$manager_theme.'/style.css'.'" />'; + echo ''; ?> @si', - '@&#(\d+);@e', - '@\[\~(.*?)\~\]@si', - '@\[\((.*?)\)\]@si', - '@{{(.*?)}}@si', - '@\[\+(.*?)\+\]@si', - '@\[\*(.*?)\*\]@si', - '@\[\[(.*?)\]\]@si', - '@\[!(.*?)!\]@si' - )); + # sanitize the values with slashes stripped to avoid remote execution of Snippets + modx_sanitize_gpc($fields, array ( + '@]*?>.*?@si', + '@&#(\d+);@e', + '@\[\~(.*?)\~\]@si', + '@\[\((.*?)\)\]@si', + '@{{(.*?)}}@si', + '@\[\+(.*?)\+\]@si', + '@\[\*(.*?)\*\]@si', + '@\[\[(.*?)\]\]@si', + '@\[!(.*?)!\]@si' + )); # validate fields foreach($fields as $name => $value) { @@ -268,39 +265,39 @@ function eForm($modx,$params) { } } -// Changed in 1.4.4.5 - now expects 4 parameters - if ($eFormOnValidate) { - if( $isDebug && !function_exists($eFormOnValidate)) + // Changed in 1.4.4.5 - now expects 4 parameters + if ($eFormOnValidate) { + if( $isDebug && !function_exists($eFormOnValidate)) $fields['debug'] .= "eformOnValidate event: Could not find the function " . $eFormOnValidate; else if ($eFormOnValidate($fields,$vMsg,$rMsg,$rClass)===false) return; - } + } - if(count($vMsg)>0 || count($rMsg)>0){ + if(count($vMsg)>0 || count($rMsg)>0){ - //New in 1.4.2 - classes are set in labels and form elements for invalid fields - foreach($rClass as $n => $class){ - $fields[$n.'_class'] = $fields[$n.'_class']?$fields[$n.'_class'].' '. $class:$class; - $fields[$n.'_vClass'] = $fields[$n.'_vClass']?$fields[$n.'_vClass'].' '. $class:$class; - //work around for checkboxes - if( isset($formats[$n][6] )){ //have separate id's for check and option tags - set classes as well - foreach( explode(',',$formats[$n][6]) as $id) - $fields[$id.'_vClass'] = $fields[$id.'_vClass'] ? $fields[$id.'_vClass'].' '. $class : $class; + //New in 1.4.2 - classes are set in labels and form elements for invalid fields + foreach($rClass as $n => $class){ + $fields[$n.'_class'] = $fields[$n.'_class']?$fields[$n.'_class'].' '. $class:$class; + $fields[$n.'_vClass'] = $fields[$n.'_vClass']?$fields[$n.'_vClass'].' '. $class:$class; + //work around for checkboxes + if( isset($formats[$n][6] )){ //have separate id's for check and option tags - set classes as well + foreach( explode(',',$formats[$n][6]) as $id) + $fields[$id.'_vClass'] = $fields[$id.'_vClass'] ? $fields[$id.'_vClass'].' '. $class : $class; + } } - } - //add debugging info to fields array - if($isDebug){ - ksort($fields); - if($isDebug>1){ - $debugText .= "
    Formats array:
    ". var_export($formats,true).'
    '; - $debugText .= "
    Fields array:
    ". var_export($fields,true).'
    '; - $debugText .= "
    Classes parsed :
    " . var_export($rClass,true) ."
    "; + //add debugging info to fields array + if($isDebug){ + ksort($fields); + if($isDebug>1){ + $debugText .= "
    Formats array:
    ". var_export($formats,true).'
    '; + $debugText .= "
    Fields array:
    ". var_export($fields,true).'
    '; + $debugText .= "
    Classes parsed :
    " . var_export($rClass,true) ."
    "; + } + $debugText .= "
    eForm configuration:
    \n". var_export($params,true).'
    '; + $fields['debug']=$debugText; } - $debugText .= "
    eForm configuration:
    \n". var_export($params,true).'
    '; - $fields['debug']=$debugText; - } #set validation message $tmp = (count($rMsg)>0)?str_replace("{fields}", implode(", ",$rMsg),$_lang['ef_required_message']):""; @@ -309,7 +306,7 @@ function eForm($modx,$params) { $modx->setPlaceholder('validationmessage',str_replace('[+ef_wrapper+]', $tmp, $_lang['ef_validation_message'])); else $fields['validationmessage'] .= str_replace('[+ef_wrapper+]', $tmp, $_lang['ef_validation_message']); - } else { + } else { # format report fields foreach($fields as $name => $value) { @@ -325,7 +322,7 @@ function eForm($modx,$params) { $localeInfo = localeconv(); $th_sep = empty($_lang['ef_thousands_separator'])?$localeInfo['thousands_sep']:$_lang['ef_thousands_separator']; $dec_point= $localeInfo['decimal_point']; -$debugText .= 'Locale
    '.var_export($localeInfo,true).'
    '; + $debugText .= 'Locale
    '.var_export($localeInfo,true).'
    '; $value = number_format((float) $value, 2, $dec_point, $th_sep); //EM~ break; case "date": @@ -549,10 +546,10 @@ function eForm($modx,$params) { if($isDebug){ $debugText .="Mail Headers:
    From: $from ($fromname)
    Reply-to:$replyto
    To: $to
    Subject: $subject
    CC: $cc
    BCC:$bcc
    "; - if($isDebug>1){ - $debugText .= "
    Formats array:
    ". var_export($formats,true).'
    '; - $debugText .= "
    Fields array:
    ". var_export($fields,true).'
    '; - } + if($isDebug>1){ + $debugText .= "
    Formats array:
    ". var_export($formats,true).'
    '; + $debugText .= "
    Fields array:
    ". var_export($fields,true).'
    '; + } $fields['debug'] = $debugText; } @@ -636,7 +633,7 @@ function formMerge($docText, $docFields, $vClasses='') { list($listName,$listValue) = explode(":",$name); $value = isset($docFields[$listName])? $docFields[$listName]:''; -// support for multi checkbox, radio and select - Djamoer + // support for multi checkbox, radio and select - Djamoer if(is_array($value)) $value=implode(', ', $value); $fld = $formats[$name]; @@ -706,23 +703,23 @@ function AttachFilesToMailer(&$mail,&$attachFiles) { function eFormParseTemplate($tpl, $isDebug=false ){ global $modx,$formats,$optionsName,$_lang,$debugText,$fields,$validFormId; global $efPostBack; - - $formats = array(); //clear formats so values don't persist through multiple snippet calls - $labels = array(); + + $formats = array(); //clear formats so values don't persist through multiple snippet calls + $labels = array(); $regExpr = "#(]*?>)(.*?)#si";; preg_match_all($regExpr,$tpl,$matches); foreach($matches[1] as $key => $fld){ $attr = attr2array($fld); if(isset($attr['for'])){ - $name = substr($attr['for'],1,-1); - //add class to fields array - $fields[$name."_vClass"] = isset($attr['class'])?substr($attr['class'],1,-1):''; - $labels[$name] = strip_tags($matches[2][$key]); - //create placeholder for class - $attr['class'] = '"[+'.$name.'_vClass+]"'; - $newTag = buildTagPlaceholder('label',$attr,$name); - $tpl = str_replace($fld,$newTag,$tpl); + $name = substr($attr['for'],1,-1); + //add class to fields array + $fields[$name."_vClass"] = isset($attr['class'])?substr($attr['class'],1,-1):''; + $labels[$name] = strip_tags($matches[2][$key]); + //create placeholder for class + $attr['class'] = '"[+'.$name.'_vClass+]"'; + $newTag = buildTagPlaceholder('label',$attr,$name); + $tpl = str_replace($fld,$newTag,$tpl); } } @@ -796,7 +793,7 @@ function eFormParseTemplate($tpl, $isDebug=false ){ $validValues = array(); foreach($matches[1] as $option){ $attr = attr2array($option); -//* debug */ print __LINE__.': 
    '.print_r($attr,true) .'

    '; + //* debug */ print __LINE__.': 
    '.print_r($attr,true) .'

    '; $value = substr($attr['value'],1,-1); //strip outer quotes if( trim($value)!='' ) $validValues[] = $value; $newTag = buildTagPlaceholder('option',$attr,$name); @@ -961,7 +958,7 @@ function validateField($value,$fld,&$vMsg,$isDebug=false){ case "#LIST": // List of comma separated values (not case sensitive) //added in 1.4 - file upload filetype test -//FS#960 - removed trimming of $param - values with leading or trailing spaces would always fail validation + //FS#960 - removed trimming of $param - values with leading or trailing spaces would always fail validation if($fld[2]=='file')$value = substr($value,strrpos($value,'.')+1); //file extension if(!isset($vlist)){ $vlist = explode(',',strtolower($param)); //cached @@ -1075,23 +1072,23 @@ function filterEformValue($value,$param){ return $value; } - function efLoadTemplate($key){ - global $modx; - if( strlen($key)>50 ) return $key; - $tpl = false; - if( is_numeric($key) ) { //get from document id - //try unpublished docs first - $tpl = ( $doc=$modx->getDocument($key,'content',0) )? $doc['content'] :false; - if(!$tpl ) - $tpl = ( $doc=$modx->getDocument($key,'content',1) )? $doc['content'] : false; - - }elseif( $key ){ - $tpl = ( $doc=$modx->getChunk($key) )? $doc : false; - //try snippet if chunk is not found - if(!$tpl) $tpl = ( $doc=$modx->runSnippet($key) )? $doc : false; - } - return $tpl; +function efLoadTemplate($key){ + global $modx; + if( strlen($key)>50 ) return $key; + $tpl = false; + if( is_numeric($key) ) { //get from document id + //try unpublished docs first + $tpl = ( $doc=$modx->getDocument($key,'content',0) )? $doc['content'] :false; + if(!$tpl ) + $tpl = ( $doc=$modx->getDocument($key,'content',1) )? $doc['content'] : false; + + }elseif( $key ){ + $tpl = ( $doc=$modx->getChunk($key) )? $doc : false; + //try snippet if chunk is not found + if(!$tpl) $tpl = ( $doc=$modx->runSnippet($key) )? $doc : false; } + return $tpl; +} # registers css and/or javascript to modx class From 69ff6107c0f1da61e65ec9ccba56372af2ac1caa Mon Sep 17 00:00:00 2001 From: Thomas Jakobi Date: Thu, 23 May 2013 10:26:35 +0200 Subject: [PATCH 038/530] Corrected typo --- assets/snippets/eform/docs/eform.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/snippets/eform/docs/eform.htm b/assets/snippets/eform/docs/eform.htm index 0399039e71..0ab2628ca7 100755 --- a/assets/snippets/eform/docs/eform.htm +++ b/assets/snippets/eform/docs/eform.htm @@ -226,7 +226,7 @@

    Installation

  • &gotoid (Optional)
    document id to load after sending message. See also &thankyou
  • &category (Optional)
    Category ID or name used to categorize eForms. - If category is not found a new category will beb created + If category is not found a new category will be created. This will appear in the subject of the email sent to the user
  • &keywords (Optional)
    Comma delimited keywords or [+formfields+] used when searching databank E.g. [+firstname+], [+lastname+], [+email+]
    • From 18a5873f716fee82cc1057612a06b960efd38a3e Mon Sep 17 00:00:00 2001 From: Thomas Jakobi Date: Thu, 23 May 2013 10:37:27 +0200 Subject: [PATCH 039/530] Bug #9938: Send sendirect, ccsender and autotext mails only to the first mail address of the comma separated list. --- assets/snippets/eform/docs/eform.htm | 2 +- assets/snippets/eform/docs/eform_history.htm | 2 +- assets/snippets/eform/eform.inc.php | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/snippets/eform/docs/eform.htm b/assets/snippets/eform/docs/eform.htm index 0399039e71..f6cd0102ff 100755 --- a/assets/snippets/eform/docs/eform.htm +++ b/assets/snippets/eform/docs/eform.htm @@ -155,7 +155,7 @@

    Version 1.4.4.1 - 1.4.4.8

  • Work around for setting required class on check & radio labels
  • bugfix: If eform attibute is set on multiple check boxes only the last value is set in values list
  • Security fix: Additional sanitization applied after stripslashes is used on fields
    • -
  • Security fix: Send ccsender and autotext mails only to the first mail address of the comma separated list.
    • +
  • Security fix: Send sendirect, ccsender and autotext mails only to the first mail address of the comma separated list.


    • You can see a more extensive version history here.

    diff --git a/assets/snippets/eform/docs/eform_history.htm b/assets/snippets/eform/docs/eform_history.htm index 1596d56639..7071f1f574 100755 --- a/assets/snippets/eform/docs/eform_history.htm +++ b/assets/snippets/eform/docs/eform_history.htm @@ -146,7 +146,7 @@

    Version 1.4.4.1 - 1.4.4.8

  • Work around for setting required class on check & radio labels
  • bugfix: If eform attibute is set on multiple check boxes only the last value is set in values list
  • Security fix: Additional sanitization applied after stripslashes is used on fields
    • -
  • Security fix: Send ccsender and autotext mails only to the first mail address of the comma separated list.
    • +
  • Security fix: Send sendirect, ccsender and autotext mails only to the first mail address of the comma separated list.

    • Version 1.4.4

      diff --git a/assets/snippets/eform/eform.inc.php b/assets/snippets/eform/eform.inc.php index 0bf94c62c1..4090d6b4b0 100644 --- a/assets/snippets/eform/eform.inc.php +++ b/assets/snippets/eform/eform.inc.php @@ -457,8 +457,15 @@ function eForm($modx,$params) { //defaults to html so only test sendasText $isHtml = ($sendAsText==1 || strstr($sendAsText,'report'))?false:true; + # added in 1.4.4.8 - Send sendirect, ccsender and autotext mails only to the first mail address of the comma separated list. + if ($fields['email']) { + $firstEmail = array_shift(explode(',', $fields['email'])); + } else { + $firstEmail = ''; + } + if(!$noemail) { - if($sendirect) $to = $fields['email']; + if($sendirect) $to = $firstEmail; $mail = new PHPMailer(); $mail->IsMail(); $mail->CharSet = $modx->config['modx_charset']; @@ -475,15 +482,8 @@ function eForm($modx,$params) { if(!$mail->send()) return 'Main mail: ' . $_lang['ef_mail_error'] . $mail->ErrorInfo; } - # added in 1.4.4.8 - Send ccsender and autotext mails only to the first mail address of the comma separated list. - if ($fields['email']) { - $firstEmail = array_shift(explode(',', $fields['email'])); - } else { - $firstEmail = FALSE; - } - # send user a copy of the report - if($ccsender && $firstEmail) { + if($ccsender && $firstEmail != '') { $mail = new PHPMailer(); $mail->IsMail(); $mail->CharSet = $modx->config['modx_charset']; @@ -500,7 +500,7 @@ function eForm($modx,$params) { # send auto-respond email //defaults to html so only test sendasText $isHtml = ($sendAsText==1 || strstr($sendAsText,'autotext'))?false:true; - if ($autotext && $firstEmail) { + if ($autotext && $firstEmail != '') { $autotext = formMerge($autotext,$fields); $mail = new PHPMailer(); $mail->IsMail(); From acecf346093202886474b7717551c78dcbf3c697 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Thu, 23 May 2013 12:37:00 +0300 Subject: [PATCH 040/530] small fix --- manager/actions/document_data.static.php | 2 +- manager/actions/mutate_module.dynamic.php | 10 +++++----- manager/includes/accesscontrol.inc.php | 1 + manager/includes/lang/russian-UTF8.inc.php | 14 +++++--------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/manager/actions/document_data.static.php b/manager/actions/document_data.static.php index f3d1039cb8..ee94f32e52 100644 --- a/manager/actions/document_data.static.php +++ b/manager/actions/document_data.static.php @@ -154,7 +154,7 @@ 'status' => $_lang['page_data_status'], 'edit' => $_lang['mgrlog_action'], ); - $tbWidth = array('5%', '60%', '10%', '25%'); + $tbWidth = array('2%', '', '10%', '10%', '90', '150'); $childsTable->setColumnWidths($tbWidth); $limitClause = $childsTable->handlePaging(); diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index d456960a75..d3d52aad76 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -145,7 +145,7 @@ function showParameters(ctrl) { dp = (f.properties.value) ? f.properties.value.split("&"):""; if(!dp) tr.style.display='none'; else { - t='
    '; + t='
    '; for(p = 0; p < dp.length; p++) { dp[p]=(dp[p]+'').replace(/^\s|\s$/,""); // trim ar = dp[p].split("="); @@ -213,7 +213,7 @@ function showParameters(ctrl) { break; } - t +=''; + t +=''; }; } t+='
    '+desc+''+c+'
    '+desc+''+c+'
    '; @@ -338,10 +338,10 @@ function SetUrl(url, width, height, alt) { + :    class="inputBox" onclick="documentDirty=true;" /> : -    +    value="on" class="inputBox" /> '.$_lang['module_disabled'].'' : $_lang['module_disabled']?> class="inputBox" /> diff --git a/manager/includes/accesscontrol.inc.php b/manager/includes/accesscontrol.inc.php index 4f9f0c6a35..49dedc889d 100755 --- a/manager/includes/accesscontrol.inc.php +++ b/manager/includes/accesscontrol.inc.php @@ -72,6 +72,7 @@ $modx->setPlaceholder('OnManagerLoginFormPrerender',$html); $modx->setPlaceholder('site_name',$site_name); + $modx->setPlaceholder('manager_path',MGR_DIR); $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]); $modx->setPlaceholder('login_message',$_lang["login_message"]); $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/'); diff --git a/manager/includes/lang/russian-UTF8.inc.php b/manager/includes/lang/russian-UTF8.inc.php index 0968910804..9770e4096f 100755 --- a/manager/includes/lang/russian-UTF8.inc.php +++ b/manager/includes/lang/russian-UTF8.inc.php @@ -3,17 +3,17 @@ * Filename: includes/lang/russian-UTF8.inc.php * Function: Russian language file. * Encoding: UTF8 - * Author: Russian MODx community, gabdullin, Jaroslav Sidorkin, Safronovich Victor, MARDEN + * Author: Russian MODX community, gabdullin, Jaroslav Sidorkin, Safronovich Victor, MARDEN * Date: 30 December 2010 * Version: 2.0.5 - * MODx version: Evolution 1.0.5 + * MODX version: Evolution 1.0.10 */ $modx_lang_attribute = 'ru'; // Manager HTML/XML Language Attribute see http://en.wikipedia.org/wiki/ISO_639-1 $modx_manager_charset = 'UTF-8'; setlocale (LC_ALL, 'ru_RU.UTF-8'); -$_lang["about_msg"] = 'MODx - это PHP Application Framework и Content Management System, распространяемая по лицензии GNU GPL.'; -$_lang["about_title"] = 'О MODx'; +$_lang["about_msg"] = 'MODX - это PHP Application Framework и Content Management System, распространяемая по лицензии GNU GPL.'; +$_lang["about_title"] = 'О MODX'; $_lang["access_permission_denied"] = 'У вас недостаточно прав для просмотра данного ресурса.'; $_lang["access_permission_parent_denied"] = 'У вас недостаточно прав для создания ресурса в данном разделе'; $_lang["access_permissions"] = 'Права доступа'; @@ -951,7 +951,7 @@ $_lang["tmplvars_default"] = 'Значение по умолчанию'; $_lang["tmplvars_description"] = 'Описание'; $_lang["tmplvars_elements"] = 'Возможные значения'; -$_lang["tmplvars_management_msg"] = 'Параметры (TV) - это динамические элементы шаблона, которые получают своё значение из некоего источника данных. Существуют также параметры, предопределённые для каждого конкретного ресурса (например, предопределённый параметр [*pagetitle*] содержит заголовок страницы). Параметры могут иметь различный тип данных и разное значение на различных страницах сайта.

    Использование: вставьте где-либо в шаблоне или в области контента выражение [*tvName*]

    Вызов через MODx API: $modx->documentObject[\'variable-name\']


    Выберите параметр для редактирования или создайте новый.'; +$_lang["tmplvars_management_msg"] = 'Параметры (TV) - это динамические элементы шаблона, которые получают своё значение из некоего источника данных. Существуют также параметры, предопределённые для каждого конкретного ресурса (например, предопределённый параметр [*pagetitle*] содержит заголовок страницы). Параметры могут иметь различный тип данных и разное значение на различных страницах сайта.

    Использование: вставьте где-либо в шаблоне или в области контента выражение [*tvName*]

    Вызов через MODX API: $modx->documentObject[\'variable-name\']


    Выберите параметр для редактирования или создайте новый.'; $_lang["tmplvars_msg"] = 'Здесь вы можете создать / отредактировать параметр (TV).
    Помните, параметры должны быть доступны для выбранных шаблонов, чтобы их можно было использовать.

    '; $_lang["tmplvars_name"] = 'Имя параметра'; $_lang["tmplvars_novars"] = 'Параметров (TV) не найдено'; @@ -1104,10 +1104,6 @@ $_lang["bkmgr_snapshot_list_title"] = 'Список бекапов'; $_lang["bkmgr_restore_submit"] = 'Восстановить эти данные'; $_lang["bkmgr_snapshot_nothing"] = 'Нет бекапов'; -$_lang["bkmgr_snapshot_submit"] = 'Создать бекап'; -$_lang["bkmgr_snapshot_list_title"] = 'Список бекапов'; -$_lang["bkmgr_restore_submit"] = 'Восстановить эти данные'; -$_lang["bkmgr_snapshot_nothing"] = 'Нет бекапов'; $_lang['not_readable_dir'] = 'Директория недоступна для записи'; $_lang['files.dynamic.php1'] = 'Создать PHP-файл'; From fa45948ff8482a43dc9e715883385a118d307b55 Mon Sep 17 00:00:00 2001 From: Thomas Jakobi Date: Thu, 23 May 2013 11:39:45 +0200 Subject: [PATCH 041/530] Refactor #9939: multiple event functions separated by comma --- assets/snippets/eform/eform.inc.php | 111 ++++++++++++++++++---------- 1 file changed, 74 insertions(+), 37 deletions(-) diff --git a/assets/snippets/eform/eform.inc.php b/assets/snippets/eform/eform.inc.php index e4cc88c26a..80a835e6f8 100644 --- a/assets/snippets/eform/eform.inc.php +++ b/assets/snippets/eform/eform.inc.php @@ -130,15 +130,21 @@ function eForm($modx,$params) { } # invoke onBeforeFormParse event set by another script + // Changed in 1.4.4.8 - Multiple event functions separated by comma. if ($eFormOnBeforeFormParse) { - if( $isDebug && !function_exists($eFormOnBeforeFormParse)) - $fields['debug'] .= "eFormOnBeforeFormParse event: Could not find the function " . $eFormOnBeforeFormParse; - else{ - $templates = array('tpl'=>$tpl,'report'=>$report,'thankyou'=>$thankyou,'autotext'=>$autotext); - if( $eFormOnBeforeFormParse($fields,$templates)===false ) - return ""; - elseif(is_array($templates)) - extract($templates); // extract back into original variables + $eFormOnBeforeFormParse = explode(',', $eFormOnBeforeFormParse); + foreach ($eFormOnBeforeFormParse as $beforeFormParse) { + $beforeFormParse = trim($beforeFormParse); + if ($isDebug && !function_exists($beforeFormParse)) { + $fields['debug'] .= 'eFormOnBeforeFormParse event: Could not find the function ' . $beforeFormParse; + } else { + $templates = array('tpl' => $tpl, 'report' => $report, 'thankyou' => $thankyou, 'autotext' => $autotext); + if ($beforeFormParse($fields, $templates) === false) { + return ''; + } elseif (is_array($templates)) { + extract($templates); // extract back into original variables + } + } } } @@ -265,12 +271,20 @@ function eForm($modx,$params) { } } - // Changed in 1.4.4.5 - now expects 4 parameters + // Changed in 1.4.4.5 - now expects 4 parameters + // Changed in 1.4.4.8 - Multiple event functions separated by comma. if ($eFormOnValidate) { - if( $isDebug && !function_exists($eFormOnValidate)) - $fields['debug'] .= "eformOnValidate event: Could not find the function " . $eFormOnValidate; - else - if ($eFormOnValidate($fields,$vMsg,$rMsg,$rClass)===false) return; + $eFormOnValidate = explode(',', $eFormOnValidate); + foreach ($eFormOnValidate as $onValidate) { + $onValidate = trim($onValidate); + if ($isDebug && !function_exists($onValidate)) { + $fields['debug'] .= 'eformOnValidate event: Could not find the function ' . $onValidate; + } else { + if ($onValidate($fields, $vMsg, $rMsg, $rClass) === false) { + return; + } + } + } } @@ -389,17 +403,24 @@ function eForm($modx,$params) { } # invoke OnBeforeMailSent event set by another script + // Changed in 1.4.4.8 - Multiple event functions separated by comma. if ($eFormOnBeforeMailSent) { - if( $isDebug && !function_exists($eFormOnBeforeMailSent)) - $fields['debug'] .= "eFormOnBeforeMailSent event: Could not find the function " . $eFormOnBeforeMailSent; - elseif ($eFormOnBeforeMailSent($fields)===false) { - if( isset($fields['validationmessage']) && !empty($fields['validationmessage']) ){ - //register css and/or javascript - if( isset($startupSource) ) efRegisterStartupBlock($startupSource); - return formMerge($tpl,$fields); + $eFormOnBeforeMailSent = explode(',', $eFormOnBeforeMailSent); + foreach ($eFormOnBeforeMailSent as $beforeMailSent) { + $beforeMailSent = trim($beforeMailSent); + if ($isDebug && !function_exists($beforeMailSent)) { + $fields['debug'] .= 'eFormOnBeforeMailSent event: Could not find the function ' . $beforeMailSent; + } elseif ($beforeMailSent($fields) === false) { + if (isset($fields['validationmessage']) && !empty($fields['validationmessage'])) { + //register css and/or javascript + if (isset($startupSource)) { + efRegisterStartupBlock($startupSource); + } + return formMerge($tpl, $fields); + } else { + return; + } } - else - return; } } @@ -529,19 +550,27 @@ function eForm($modx,$params) { } }//end test nomail - # added in 1.4.2 - Protection against multiple submit with same form data - if($protectSubmit) $_SESSION[$formid.'_hash'] = $hash; //hash is set earlier - - # added in 1.4.2 - Limit the time between form submissions - if($submitLimit>0) $_SESSION[$formid.'_limit'] = time(); + # added in 1.4.2 - Protection against multiple submit with same form data + if($protectSubmit) $_SESSION[$formid.'_hash'] = $hash; //hash is set earlier - # invoke OnMailSent event set by another script - if ($eFormOnMailSent) { - if( $isDebug && !function_exists($eFormOnMailSent) ) - $fields['debug'] .= "eFormOnMailSent event: Could not find the function" . $eFormOnMailSent; - else - if ($eFormOnMailSent($fields)===false) return; + # added in 1.4.2 - Limit the time between form submissions + if($submitLimit>0) $_SESSION[$formid.'_limit'] = time(); + + # invoke OnMailSent event set by another script + // Changed in 1.4.4.8 - Multiple event functions separated by comma. + if ($eFormOnMailSent) { + $eFormOnMailSent = explode(',', $eFormOnMailSent); + foreach ($eFormOnMailSent as $mailSent) { + $mailSent = trim($mailSent); + if ($isDebug && !function_exists($mailSent)) { + $fields['debug'] .= 'eFormOnMailSent event: Could not find the function' . $mailSent; + } else { + if ($mailSent($fields) === false) { + return; + } + } } + } if($isDebug){ @@ -606,11 +635,19 @@ function eForm($modx,$params) { } # invoke OnBeforeFormMerge event set by another script + // Changed in 1.4.4.8 - Multiple event functions separated by comma. if ($eFormOnBeforeFormMerge) { - if( $isDebug && !function_exists($eFormOnBeforeFormMerge)) - $fields['debug'] .= "eFormOnBeforeFormMerge event: Could not find the function " . $eFormOnBeforeFormMerge; - else - if ($eFormOnBeforeFormMerge($fields)===false) return; + $eFormOnBeforeFormMerge = explode(',', $eFormOnBeforeFormMerge); + foreach ($eFormOnBeforeFormMerge as $beforeFormMerge) { + $beforeFormMerge = trim($beforeFormMerge); + if ($isDebug && !function_exists($beforeFormMerge)) { + $fields['debug'] .= 'eFormOnBeforeFormMerge event: Could not find the function ' . $beforeFormMerge; + } else { + if ($beforeFormMerge($fields) === false) { + return; + } + } + } } # build form From 6f53c3b63cf5cf71fd7244a12520c1af80aa3fb1 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Thu, 23 May 2013 13:03:39 +0300 Subject: [PATCH 042/530] #9940 refactor exec mergeSettingsContent --- manager/includes/document.parser.class.inc.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index f08e8fe370..d05c124d0d 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -48,6 +48,7 @@ class DocumentParser { var $documentMap; var $forwards= 3; var $error_reporting; + var $aliasListing; private $version=array(); /** @@ -787,7 +788,12 @@ function getTagsFromContent($content,$left='[+',$right='+]') { return $matches; } - // mod by Raymond + /** + * Merge content fields and TVs + * + * @param string $template + * @return string + */ function mergeDocumentContent($content) { $replace= array (); $matches = $this->getTagsFromContent($content,'[*','*]'); @@ -861,6 +867,7 @@ function mergeChunkContent($content) { } } $content= str_replace($matches[0], $replace, $content); + $content=$this->mergeSettingsContent($content); } return $content; } @@ -873,6 +880,7 @@ function mergeChunkContent($content) { */ function mergePlaceholderContent($content) { $replace= array (); + $content=$this->mergeSettingsContent($content); $matches = $this->getTagsFromContent($content,'[+','+]'); if($matches) { $cnt= count($matches[1]); @@ -1304,7 +1312,9 @@ function parseDocumentSource($source) { $this->documentOutput= $source; // store source code so plugins can $this->invokeEvent("OnParseDocument"); // work on it via $modx->documentOutput $source= $this->documentOutput; - + + $source = $this->mergeSettingsContent($source); + // combine template and document variables $source= $this->mergeDocumentContent($source); // replace settings referenced in document @@ -1319,6 +1329,9 @@ function parseDocumentSource($source) { $source= $this->evalSnippets($source); // find and replace Placeholders (must be parsed last) - Added by Raymond $source= $this->mergePlaceholderContent($source); + + $source = $this->mergeSettingsContent($source); + if ($this->dumpSnippets == 1) { echo "
    "; } From c08989b4a97fb305544fece9e2b7676df60cdfe3 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Thu, 23 May 2013 13:52:14 +0300 Subject: [PATCH 043/530] small fix --- assets/snippets/ditto/classes/filter.class.inc.php | 4 ++-- assets/snippets/ditto/classes/template.class.inc.php | 2 +- assets/snippets/ditto/debug/modxDebugConsole.class.php | 2 +- assets/snippets/eform/eform.inc.php | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/snippets/ditto/classes/filter.class.inc.php b/assets/snippets/ditto/classes/filter.class.inc.php index 62759807fd..30cc65e69e 100644 --- a/assets/snippets/ditto/classes/filter.class.inc.php +++ b/assets/snippets/ditto/classes/filter.class.inc.php @@ -67,12 +67,12 @@ function basicFilter ($value) { break; case "<=" : case 5 : - if (!($value[$this->array_key] < $this->filterValue)) + if (!($value[$this->array_key] <= $this->filterValue)) $unset = 0; break; case ">=" : case 6 : - if (!($value[$this->array_key] > $this->filterValue)) + if (!($value[$this->array_key] >= $this->filterValue)) $unset = 0; break; diff --git a/assets/snippets/ditto/classes/template.class.inc.php b/assets/snippets/ditto/classes/template.class.inc.php index 354952a8d1..5a9679a219 100644 --- a/assets/snippets/ditto/classes/template.class.inc.php +++ b/assets/snippets/ditto/classes/template.class.inc.php @@ -200,7 +200,7 @@ function fetch($tpl){ if ($modx->getChunk($tpl) != "") { $template = $modx->getChunk($tpl); } else if(substr($tpl, 0, 6) == "@FILE:") { - $template = $this->get_file_contents(substr($tpl, 6)); + $template = $this->get_file_contents(MODX_BASE_PATH.substr($tpl, 6)); } else if(substr($tpl, 0, 6) == "@CODE:") { $template = substr($tpl, 6); } else if(substr($tpl, 0, 5) == "@FILE") { diff --git a/assets/snippets/ditto/debug/modxDebugConsole.class.php b/assets/snippets/ditto/debug/modxDebugConsole.class.php index 4896e85e47..1bf3093726 100644 --- a/assets/snippets/ditto/debug/modxDebugConsole.class.php +++ b/assets/snippets/ditto/debug/modxDebugConsole.class.php @@ -27,7 +27,7 @@ function render($cTabs,$title,$base_path) { } $placeholders = array( "[+ditto_base_url+]" => $base_path, - "[+base_url+]" => $modx->config["site_url"]."manager", + "[+base_url+]" => MODX_MANAGER_URL, "[+theme+]" => $modx->config["manager_theme"], "[+title+]" => $title, "[+content+]" => $content, diff --git a/assets/snippets/eform/eform.inc.php b/assets/snippets/eform/eform.inc.php index 7dfaf105bc..87e1f5a4bf 100644 --- a/assets/snippets/eform/eform.inc.php +++ b/assets/snippets/eform/eform.inc.php @@ -619,8 +619,7 @@ function eForm($modx,$params) { # Form Merge function formMerge($docText, $docFields, $vClasses='') { - global $formats; - $lastitems; + global $formats, $lastitems; if(!$docText) return ''; preg_match_all('~\[\+(.*?)\+\]~', $docText, $matches); From ef43e82facb3dab65c878f66aff18606637b3503 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Thu, 23 May 2013 14:19:03 +0300 Subject: [PATCH 044/530] small fix --- install/setup.data.sql | 10 +++++----- install/setup.sql | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/setup.data.sql b/install/setup.data.sql index 9b98082935..94c4f5bfe8 100644 --- a/install/setup.data.sql +++ b/install/setup.data.sql @@ -107,16 +107,16 @@ REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (9, 'footer', 'Site Template Foo REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (10, 'meta', 'Site Template Meta', 0, 1, 0, '

    Valid XHTML

    Valid css

    MODx

    ', 0); -REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (11, 'mh.InnerRowTpl', 'Inner row template for ModxHost top menu', 0, 1, 0, '[+wf.linktext+][+wf.wrapper+]', 0); +REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (11, 'mh.InnerRowTpl', 'Inner row template for MODXHost top menu', 0, 1, 0, '[+wf.linktext+][+wf.wrapper+]', 0); -REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (12, 'mh.InnerTpl', 'Inner nesting template for ModxHost top menu', 0, 1, 0, '
      \r\n [+wf.wrapper+]\r\n
    ', 0); +REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (12, 'mh.InnerTpl', 'Inner nesting template for MODXHost top menu', 0, 1, 0, '
      \r\n [+wf.wrapper+]\r\n
    ', 0); -REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (13, 'mh.OuterTpl', 'Outer nesting template for ModxHost top menu', 0, 1, 0, '
      \r\n [+wf.wrapper+]\r\n
    ', 0); +REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (13, 'mh.OuterTpl', 'Outer nesting template for MODXHost top menu', 0, 1, 0, '
      \r\n [+wf.wrapper+]\r\n
    ', 0); -REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (14, 'mh.RowTpl', 'Row template for ModxHost top menu', 0, 1, 0, '
  • [+wf.linktext+][+wf.wrapper+]
    • ', 0); +REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (14, 'mh.RowTpl', 'Row template for MODXHost top menu', 0, 1, 0, '
  • [+wf.linktext+][+wf.wrapper+]
    • ', 0); REPLACE INTO `{PREFIX}site_htmlsnippets` VALUES (15, 'Comments', 'Comments (Jot) showing beneath a blog entry.', 0, 1, 0, '
    \r\n[!Jot? &customfields=`name,email` &subscribe=`1` &pagination=`4` &badwords=`dotNet` &canmoderate=`Site Admins` !]\r\n
    ', 0); @@ -153,7 +153,7 @@ REPLACE INTO `{PREFIX}site_keywords` VALUES ('4','login'); # -# Dumping data for table `modx2352_site_tmplvar_contentvalues` +# Dumping data for table `MODX2352_site_tmplvar_contentvalues` # diff --git a/install/setup.sql b/install/setup.sql index 9415926197..230ceccb81 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -1141,4 +1141,4 @@ UPDATE `{PREFIX}user_settings` SET REPLACE INTO `{PREFIX}system_settings` (setting_name, setting_value) VALUES ('manager_theme','MODxCarbon'); -UPDATE `{PREFIX}system_settings` set setting_value = if(setting_value REGEXP 'application/json',setting_value,concat_ws(",",setting_value,"application/json")) WHERE setting_name='custom_contenttype' \ No newline at end of file +UPDATE `{PREFIX}system_settings` set setting_value = if(setting_value REGEXP 'application/json',setting_value,concat_ws(",",setting_value,"application/json")) WHERE setting_name='custom_contenttype'; \ No newline at end of file From d4c275fe83faaa647c806e4222b1902f98323ec5 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Thu, 23 May 2013 14:45:58 +0300 Subject: [PATCH 045/530] fix trouble with display 2 tv with type date --- manager/actions/mutate_content.dynamic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index 61d20a173c..5a912c7b5e 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -778,10 +778,10 @@ function decode(s) { $tvDescription = (!empty($row['description'])) ? '
    ' . $row['description'] . '
    ' : ''; $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '
    (' . $_lang['tmplvars_inherited'] . ')
    ' : ''; - $zindex = $row['type'] == 'date' ? '100' : '500'; + echo "\t\t",'',$row['caption'],"\n", "\t\t\t",$tvDescription,$tvInherited,"\n", - "\t\t\t",'',"\n", + "\t\t\t",'',"\n", "\t\t\t",renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row),"\n", "\t\t\n"; } From 304a0c25713b55f99b289b5ed31773a551835d51 Mon Sep 17 00:00:00 2001 From: yama Date: Thu, 23 May 2013 21:25:22 +0900 Subject: [PATCH 046/530] Refactor #9884 MODX_MANAGER_PATH step6 --- assets/modules/docmanager/tv.ajax.php | 8 ++++---- assets/plugins/tinymce/functions.php | 4 ++-- manager/actions/mutate_module.dynamic.php | 2 +- manager/actions/mutate_user.dynamic.php | 2 +- manager/actions/mutate_web_user.dynamic.php | 2 +- manager/includes/tmplvars.inc.php | 8 ++++---- manager/media/browser/mcpuk/browser.php | 1 + manager/media/browser/mcpuk/frmresourceslist.html | 2 +- manager/media/browser/mcpuk/js/common.js | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/assets/modules/docmanager/tv.ajax.php b/assets/modules/docmanager/tv.ajax.php index 6a80299cc4..cbbc4d5fb7 100644 --- a/assets/modules/docmanager/tv.ajax.php +++ b/assets/modules/docmanager/tv.ajax.php @@ -182,14 +182,14 @@ function BrowseServer(ctrl) { lastImageCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=images&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".MODX_MANAGER_URL."media/browser/mcpuk/browser.html?Type=images&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function BrowseFileServer(ctrl) { lastFileCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=files&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=files&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function SetUrl(url, width, height, alt){ @@ -237,14 +237,14 @@ function BrowseServer(ctrl) { lastImageCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=images&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=images&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function BrowseFileServer(ctrl) { lastFileCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=files&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=files&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function SetUrl(url, width, height, alt){ diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index e2567af93e..19ee658ca5 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -409,8 +409,8 @@ function build_mce_init($params,$plugins,$buttons1,$buttons2,$buttons3,$buttons4 function build_tiny_callback($params) { $ph['cmsurl'] = MODX_MANAGER_URL . 'media/browser/mcpuk/browser.php?Connector='; - $ph['cmsurl'] .= MODX_MANAGER_URL . 'media/browser/mcpuk/connectors/php/connector.php&ServerPath='; - $ph['cmsurl'] .= MODX_BASE_URL . '&editor=tinymce&editorpath=' . $params['mce_url']; + $ph['cmsurl'] .= MODX_MANAGER_URL . 'media/browser/mcpuk/connectors/php/connector.php&manager_url='; + $ph['cmsurl'] .= MODX_MANAGER_URL . '&editor=tinymce&editorpath=' . $params['mce_url']; $modx_fb = file_get_contents($params['mce_path'] . 'js/modx_fb.js.inc'); foreach($ph as $name => $value) diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index d456960a75..f6f2e36051 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -308,7 +308,7 @@ function OpenServerBrowser(url, width, height ) { function BrowseServer() { var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); + OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&manager_url=", w, h); } function SetUrl(url, width, height, alt) { diff --git a/manager/actions/mutate_user.dynamic.php b/manager/actions/mutate_user.dynamic.php index 74f9d99fc4..67bad7b2a5 100644 --- a/manager/actions/mutate_user.dynamic.php +++ b/manager/actions/mutate_user.dynamic.php @@ -765,7 +765,7 @@ function OpenServerBrowser(url, width, height ) { function BrowseServer() { var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); + OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&manager_url=", w, h); } function SetUrl(url, width, height, alt){ document.userform.photo.value = url; diff --git a/manager/actions/mutate_web_user.dynamic.php b/manager/actions/mutate_web_user.dynamic.php index 63a6c59142..82bc38b10d 100644 --- a/manager/actions/mutate_web_user.dynamic.php +++ b/manager/actions/mutate_web_user.dynamic.php @@ -492,7 +492,7 @@ function OpenServerBrowser(url, width, height ) { function BrowseServer() { var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&ServerPath=", w, h); + OpenServerBrowser("media/browser/mcpuk/browser.html?Type=images&Connector=media/browser/mcpuk/connectors/php/connector.php&manager_url=", w, h); } function SetUrl(url, width, height, alt){ document.userform.photo.value = url; diff --git a/manager/includes/tmplvars.inc.php b/manager/includes/tmplvars.inc.php index 94873f7d10..35c8c8fc3f 100755 --- a/manager/includes/tmplvars.inc.php +++ b/manager/includes/tmplvars.inc.php @@ -135,14 +135,14 @@ function BrowseServer(ctrl) { lastImageCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=images&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".MODX_MANAGER_URL."media/browser/mcpuk/browser.html?Type=images&Connector=".MODX_MANAGER_URL."media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function BrowseFileServer(ctrl) { lastFileCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=files&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".MODX_MANAGER_URL."media/browser/mcpuk/browser.html?Type=files&Connector=".MODX_MANAGER_URL."media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function SetUrl(url, width, height, alt){ @@ -191,14 +191,14 @@ function BrowseServer(ctrl) { lastImageCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=images&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".MODX_MANAGER_URL."media/browser/mcpuk/browser.html?Type=images&Connector=".MODX_MANAGER_URL."media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function BrowseFileServer(ctrl) { lastFileCtrl = ctrl; var w = screen.width * 0.7; var h = screen.height * 0.7; - OpenServerBrowser('".$base_url.MGR_DIR."/media/browser/mcpuk/browser.html?Type=files&Connector=".$base_url.MGR_DIR."/media/browser/mcpuk/connectors/php/connector.php&ServerPath=".$base_url."', w, h); + OpenServerBrowser('".MODX_MANAGER_URL."media/browser/mcpuk/browser.html?Type=files&Connector=".MODX_MANAGER_URL."media/browser/mcpuk/connectors/php/connector.php&manager_url=".MODX_MANAGER_URL."', w, h); } function SetUrl(url, width, height, alt){ diff --git a/manager/media/browser/mcpuk/browser.php b/manager/media/browser/mcpuk/browser.php index cff3bd9aa3..4f074cc69b 100644 --- a/manager/media/browser/mcpuk/browser.php +++ b/manager/media/browser/mcpuk/browser.php @@ -1,4 +1,5 @@ Edit image' ; + oCell.innerHTML = oCell.innerHTML + 'Edit image' ; } /* diff --git a/manager/media/browser/mcpuk/js/common.js b/manager/media/browser/mcpuk/js/common.js index b21150bf54..9851d5ee84 100644 --- a/manager/media/browser/mcpuk/js/common.js +++ b/manager/media/browser/mcpuk/js/common.js @@ -55,7 +55,7 @@ oConnector.CurrentFolder = '/' ; oConnector.UploadHandler = GetUrlParam( 'UploadHandler' ); oConnector.ConnectorUrl = GetUrlParam( 'Connector' ) ; oConnector.ResourceType = GetUrlParam( 'Type' ) ; -oConnector.ServerPath = GetUrlParam( 'ServerPath' ) ; +oConnector.manager_url = GetUrlParam( 'manager_url' ) ; oConnector.ExtraParams = GetUrlParam( 'ExtraParams' ) ; oConnector.Editor = GetUrlParam( 'editor' ) ; From 57b20a542b0895e41fcc61f6869b3107705a6265 Mon Sep 17 00:00:00 2001 From: Thomas Jakobi Date: Fri, 24 May 2013 16:33:45 +0200 Subject: [PATCH 047/530] Refactor #9939: multiple event functions separated by comma Updated documentation --- assets/snippets/eform/docs/eform.htm | 41 +++++++++++--------- assets/snippets/eform/docs/eform_history.htm | 1 + 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/assets/snippets/eform/docs/eform.htm b/assets/snippets/eform/docs/eform.htm index e070753f5e..2aca6f9c7f 100755 --- a/assets/snippets/eform/docs/eform.htm +++ b/assets/snippets/eform/docs/eform.htm @@ -156,6 +156,7 @@

    Version 1.4.4.1 - 1.4.4.8

  • bugfix: If eform attibute is set on multiple check boxes only the last value is set in values list
  • Security fix: Additional sanitization applied after stripslashes is used on fields
  • Security fix: Send sendirect, ccsender and autotext mails only to the first mail address of the comma separated list.
    • +
  • Added: Multiple event functions separated by comma.


    • You can see a more extensive version history here.

    @@ -294,26 +295,30 @@

    Installation

    PHP Event Functions:

    The eForm event functions are now incorporated into the parameters. They are:

      -
    • &eFormOnBeforeMailSent (optional)
      Expects a function name. This function will be called after the form has been validated and before the report and thankyou templates have been parsed and any emails have been sent out. - See this example on how to use the events.
      • -
    • &eFormOnMailSent (optional)
      Expects a function name. This function is called after all templates have been parsed and any emails were sent.
      • -
    • &eformOnBeforeFormParse (optional)
      - Expects a function name. The function is called after the templates are loaded and the formid is found valid. The function should accomodate the following parameter: &$templates - (as reference) an associative array of loaded templates with indexes 'tpl', 'report','thankyou' & 'autotext'. Be aware that the latter three will only have a value if the form has been posted! -
      • -
    • &eFormOnBeforeFormMerge (optional)
      Expects a function name. This function will only be - called whenever the form is displayed and just before all placeholders - are merged. The function should accomodate the following parameter: &$fields - - (as reference) an associative array of field and placeholder values.
      • -
    • &eFormOnValidate (optional)
      Expects a function name. This function will be called directly after - the form validation has taken place. You can use this event to add - your own extra validation logic. The function should accomodate the - following parameters +
    • &eFormOnBeforeMailSent (optional)
      Expects a list of comma separated function names. These functions will be called after the form has been validated and before the report and thankyou templates have been parsed and any emails have been sent out. + See this example on how to use the events.
        -
      • &$fields - (as reference) an associative array of field and placeholder - values.
        • +
      • &$fields - (as reference) an associative array of field and placeholder values.
        • +
      • +
    • &eFormOnMailSent (optional)
      Expects a list of comma separated function names. These functions are called after all templates have been parsed and any emails were sent. +
        +
      • &$fields - (as reference) an associative array of field and placeholder values.
        • +
      • +
    • &eformOnBeforeFormParse (optional)
      Expects a list of comma separated function names. These functions are called after the templates are loaded and the formid is found valid. The function should accomodate the following parameter: +
        +
      • &$fields - (as reference) an associative array of field and placeholder values.
        • +
      • &$templates - (as reference) an associative array of loaded templates with indexes 'tpl', 'report','thankyou' & 'autotext'. Be aware that the latter three will only have a value if the form has been posted!
        • +
      • +
    • &eFormOnBeforeFormMerge (optional)
      Expects a list of comma separated function names. These functions will only be called whenever the form is displayed and just before all placeholders are merged. The function should accomodate the following parameter: +
        +
      • &$fields - (as reference) an associative array of field and placeholder values.
        • +
      • +
    • &eFormOnValidate (optional)
      Expects a function name. This function will be called directly after the form validation has taken place. You can use this event to add your own extra validation logic. The function should accomodate the following parameters +
        +
      • &$fields - (as reference) an associative array of field and placeholder values.
      • &$vMsg - (as reference) a numeric array of validation error messages.
        • -
      • &$rMsg - (as Reference) a numeric array of missing required - fields.
        • +
      • &$rMsg - (as Reference) a numeric array of missing required fields.
        • +
      • &$rClass - (as Reference) an associative array of fieldnames and classes assigned.

    Examples:

    diff --git a/assets/snippets/eform/docs/eform_history.htm b/assets/snippets/eform/docs/eform_history.htm index 7071f1f574..82a3471081 100755 --- a/assets/snippets/eform/docs/eform_history.htm +++ b/assets/snippets/eform/docs/eform_history.htm @@ -147,6 +147,7 @@

    Version 1.4.4.1 - 1.4.4.8

  • bugfix: If eform attibute is set on multiple check boxes only the last value is set in values list
  • Security fix: Additional sanitization applied after stripslashes is used on fields
  • Security fix: Send sendirect, ccsender and autotext mails only to the first mail address of the comma separated list.
    • +
  • Added: Multiple event functions separated by comma.

    • Version 1.4.4

    +
    @@ -40,3 +41,4 @@
    +
    From ee953115b7bfc50a881d383182f3756edab1b4c7 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sat, 10 Aug 2013 16:02:52 +0300 Subject: [PATCH 215/530] fix html in refresh_site --- manager/actions/refresh_site.dynamic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manager/actions/refresh_site.dynamic.php b/manager/actions/refresh_site.dynamic.php index 9e6d36e3fd..0e34ace4e1 100644 --- a/manager/actions/refresh_site.dynamic.php +++ b/manager/actions/refresh_site.dynamic.php @@ -17,7 +17,7 @@ ?>

    - +
    ".$_lang["refresh_published"]."

    ", $num_rows_pub) ?> ".$_lang["refresh_unpublished"]."

    ", $num_rows_unpub) ?> @@ -33,3 +33,4 @@ ?>
    +
    From ff452cd4a7ddfd4e1a86bdf03c2a5b2db9c95b4e Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sat, 10 Aug 2013 16:04:04 +0300 Subject: [PATCH 216/530] fix html in rele_management --- manager/actions/role_management.static.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manager/actions/role_management.static.php b/manager/actions/role_management.static.php index b6b78ce1d5..cd943b2165 100644 --- a/manager/actions/role_management.static.php +++ b/manager/actions/role_management.static.php @@ -14,7 +14,7 @@

    - +

    @@ -49,3 +49,4 @@ ?>
    +
    From 4efe26731dc457535282b07c28b721df616829f5 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sat, 10 Aug 2013 16:05:30 +0300 Subject: [PATCH 217/530] fix html in sysinfo --- manager/actions/sysinfo.static.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/manager/actions/sysinfo.static.php b/manager/actions/sysinfo.static.php index bda447f8be..1c2db1a0a6 100644 --- a/manager/actions/sysinfo.static.php +++ b/manager/actions/sysinfo.static.php @@ -125,6 +125,7 @@ function viewPHPInfo() { +

    @@ -162,9 +163,10 @@ function viewPHPInfo() {

    - +
    +

    @@ -250,9 +252,10 @@ function nicesize($size) { if($totaloverhead>0) { ?>

    - + +
    -
    +
    From d356741a4fa751e1da5754646d01c0e3f3da5aac Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sat, 10 Aug 2013 16:06:40 +0300 Subject: [PATCH 218/530] fix html in user_management --- manager/actions/user_management.static.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/user_management.static.php b/manager/actions/user_management.static.php index ebb76e7d60..0d61a02bb8 100644 --- a/manager/actions/user_management.static.php +++ b/manager/actions/user_management.static.php @@ -88,7 +88,7 @@ function menuAction(a) {

    - +

    @@ -151,5 +151,5 @@ function menuAction(a) { echo $grd->render(); ?>
    -
    +
    From 1619f31ec0ccb5317e8ae7b9a75b9170de20baa6 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sat, 10 Aug 2013 16:07:29 +0300 Subject: [PATCH 219/530] fix html in web_user_management --- manager/actions/web_user_management.static.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/web_user_management.static.php b/manager/actions/web_user_management.static.php index 64d0ef3431..8671d6d2fe 100644 --- a/manager/actions/web_user_management.static.php +++ b/manager/actions/web_user_management.static.php @@ -87,7 +87,7 @@ function menuAction(a) {

    - +

    @@ -133,5 +133,5 @@ function menuAction(a) { echo $grd->render(); ?>
    -
    +
    From 7932001483c6609918bd3ba67827d73b0a5af641 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 08:46:40 +0300 Subject: [PATCH 220/530] refactor plugin FMP for smaller cache file --- .../plugin.forgotmanagerlogin.php | 185 ++++++++++++++++++ .../assets/plugins/ForgotManagerPassword.tpl | 184 +---------------- 2 files changed, 186 insertions(+), 183 deletions(-) create mode 100644 assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php diff --git a/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php b/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php new file mode 100644 index 0000000000..ffd407ffe9 --- /dev/null +++ b/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php @@ -0,0 +1,185 @@ +errors = array(); + $this->checkLang(); + } + + function getLink() { + global $_lang; + + $link = <<{$_lang['forgot_your_password']} +EOD; + + return $link; + } + + function getForm() { + global $_lang; + + $form = <<{$_lang['account_email']}: + + +EOD; + + return $form; + } + + /* Get user info including a hash unique to this user, password, and day */ + function getUser($user_id=false, $username='', $email='', $hash='') { + global $modx, $_lang; + + $user_id = $user_id == false ? false : $modx->db->escape($user_id); + $username = $modx->db->escape($username); + $email = $modx->db->escape($email); + $hash = $modx->db->escape($hash); + + $pre = $modx->db->config['table_prefix']; + $site_id = $modx->config['site_id']; + $today = date('Yz'); // Year and day of the year + $wheres = array(); + $where = ''; + $user = null; + + if($user_id !== false) { $wheres[] = "usr.id = '{$user_id}'"; } + if(!empty($username)) { $wheres[] = "usr.username = '{$username}'"; } + if(!empty($email)) { $wheres[] = "attr.email = '{$email}'"; } + if(!empty($hash)) { $wheres[] = "MD5(CONCAT(usr.username,usr.password,'{$site_id}','{$today}')) = '{$hash}'"; } + + if($wheres) { + $where = ' WHERE '.implode(' AND ',$wheres); + $sql = "SELECT usr.id, usr.username, attr.email, MD5(CONCAT(usr.username,usr.password,'{$site_id}','{$today}')) AS hash + FROM `{$pre}manager_users` usr + INNER JOIN `{$pre}user_attributes` attr ON usr.id = attr.internalKey + {$where} + LIMIT 1;"; + + if($result = $modx->db->query($sql)){ + if($modx->db->getRecordCount($result)==1) { + $user = $modx->db->getRow($result); + } + } + } + + if($user == null) { $this->errors[] = $_lang['could_not_find_user']; } + + return $user; + } + + + + /* Send an email with a link to login */ + function sendEmail($to) { + global $modx, $_lang; + + $subject = $_lang['password_change_request']; + $headers = "MIME-Version: 1.0\r\n". + "Content-type: text/html; charset=\"{$modx->config['modx_charset']}\"\r\n". + "From: MODx <{$modx->config['emailsender']}>\r\n". + "Reply-To: no-reply@{$_SERVER['HTTP_HOST']}\r\n". + "X-Mailer: PHP/".phpversion(); + + $user = $this->getUser(0, '', $to); + + if($user['username']) { + $body = <<{$_lang['forgot_password_email_intro']} {$_lang['forgot_password_email_link']}

    +

    {$_lang['forgot_password_email_instructions']}

    +

    {$_lang['forgot_password_email_fine_print']}

    +EOD; + + $mail = mail($to, $subject, $body, $headers); + if(!$mail) { $this->errors[] = $_lang['error_sending_email']; } + + return $mail; + } + } + + function unblockUser($user_id) { + global $modx, $_lang; + + $pre = $modx->db->config['table_prefix']; + $modx->db->update(array('blocked' => 0, 'blockeduntil' => 0, 'failedlogincount' => 0), "`{$pre}user_attributes`", "internalKey = '{$user_id}'"); + + if(!$modx->db->getAffectedRows()) { $this->errors[] = $_lang['user_doesnt_exist']; return; } + + return true; + } + + function checkLang() { + global $_lang; + + $eng = array(); + $eng['forgot_your_password'] = 'Forgot your password?'; + $eng['account_email'] = 'Account email'; + $eng['send'] = 'Send'; + $eng['password_change_request'] = 'Password change request'; + $eng['forgot_password_email_intro'] = 'A request has been made to change the password on your account.'; + $eng['forgot_password_email_link'] = 'Click here to complete the process.'; + $eng['forgot_password_email_instructions'] = 'From there you will be able to change your password from the My Account menu.'; + $eng['forgot_password_email_fine_print'] = '* The URL above will expire once you change your password or after today.'; + $eng['error_sending_email'] = 'Error sending email'; + $eng['could_not_find_user'] = 'Could not find user'; + $eng['user_doesnt_exist'] = 'User does not exist'; + $eng['email_sent'] = 'Email sent'; + + foreach($eng as $key=>$value) { + if(empty($_lang[$key])) { $_lang[$key] = $value; } + } + } + + function getErrorOutput() { + $output = ''; + + if($this->errors) { + $output = ''.implode('', $this->errors).''; + } + + return $output; + } + } +} + +global $_lang; + +$output = ''; +$event_name = $modx->Event->name; +$action = (empty($_GET['action']) ? '' : (is_string($_GET['action']) ? $_GET['action'] : '')); +$username = (empty($_GET['username']) ? false : (is_string($_GET['username']) ? $_GET['username'] : '')); +$to = (empty($_GET['email']) ? '' : (is_string($_GET['email']) ? $_GET['email'] : '')); +$hash = (empty($_GET['hash']) ? false : (is_string($_GET['hash']) ? $_GET['hash'] : '')); +$forgot = new ForgotManagerPassword(); + +if($event_name == 'OnManagerLoginFormRender') { + switch($action) { + case 'show_form': + $output = $forgot->getForm(); + break; + case 'send_email': + if($forgot->sendEmail($to)) { $output = $_lang['email_sent']; } + break; + default: + $output = $forgot->getLink(); + break; + } + + if($forgot->errors) { $output = $forgot->getErrorOutput() . $forgot->getLink(); } +} + +if($event_name == 'OnBeforeManagerLogin' && $hash && $username) { + $user = $forgot->getUser(false, $username, '', $hash); + if($user && is_array($user) && !$forgot->errors) { + $forgot->unblockUser($user['id']); + } +} + +if($event_name == 'OnManagerAuthentication' && $hash && $username) { + $user = $forgot->getUser(false, $username, '', $hash); + $output = ($user !== null && count($forgot->errors) == 0) ? true : false; +} + +$modx->Event->output($output); diff --git a/install/assets/plugins/ForgotManagerPassword.tpl b/install/assets/plugins/ForgotManagerPassword.tpl index 53ebfdeb93..f3730e82b2 100644 --- a/install/assets/plugins/ForgotManagerPassword.tpl +++ b/install/assets/plugins/ForgotManagerPassword.tpl @@ -12,186 +12,4 @@ * @internal @installset base */ -if(!class_exists('ForgotManagerPassword')) { - class ForgotManagerPassword{ - function ForgotManagerPassword(){ - $this->errors = array(); - $this->checkLang(); - } - - function getLink() { - global $_lang; - - $link = <<{$_lang['forgot_your_password']} -EOD; - - return $link; - } - - function getForm() { - global $_lang; - - $form = <<{$_lang['account_email']}: - - -EOD; - - return $form; - } - - /* Get user info including a hash unique to this user, password, and day */ - function getUser($user_id=false, $username='', $email='', $hash='') { - global $modx, $_lang; - - $user_id = $user_id == false ? false : $modx->db->escape($user_id); - $username = $modx->db->escape($username); - $email = $modx->db->escape($email); - $hash = $modx->db->escape($hash); - - $pre = $modx->db->config['table_prefix']; - $site_id = $modx->config['site_id']; - $today = date('Yz'); // Year and day of the year - $wheres = array(); - $where = ''; - $user = null; - - if($user_id !== false) { $wheres[] = "usr.id = '{$user_id}'"; } - if(!empty($username)) { $wheres[] = "usr.username = '{$username}'"; } - if(!empty($email)) { $wheres[] = "attr.email = '{$email}'"; } - if(!empty($hash)) { $wheres[] = "MD5(CONCAT(usr.username,usr.password,'{$site_id}','{$today}')) = '{$hash}'"; } - - if($wheres) { - $where = ' WHERE '.implode(' AND ',$wheres); - $sql = "SELECT usr.id, usr.username, attr.email, MD5(CONCAT(usr.username,usr.password,'{$site_id}','{$today}')) AS hash - FROM `{$pre}manager_users` usr - INNER JOIN `{$pre}user_attributes` attr ON usr.id = attr.internalKey - {$where} - LIMIT 1;"; - - if($result = $modx->db->query($sql)){ - if($modx->db->getRecordCount($result)==1) { - $user = $modx->db->getRow($result); - } - } - } - - if($user == null) { $this->errors[] = $_lang['could_not_find_user']; } - - return $user; - } - - - - /* Send an email with a link to login */ - function sendEmail($to) { - global $modx, $_lang; - - $subject = $_lang['password_change_request']; - $headers = "MIME-Version: 1.0\r\n". - "Content-type: text/html; charset=\"{$modx->config['modx_charset']}\"\r\n". - "From: MODx <{$modx->config['emailsender']}>\r\n". - "Reply-To: no-reply@{$_SERVER['HTTP_HOST']}\r\n". - "X-Mailer: PHP/".phpversion(); - - $user = $this->getUser(0, '', $to); - - if($user['username']) { - $body = <<{$_lang['forgot_password_email_intro']} {$_lang['forgot_password_email_link']}

    -

    {$_lang['forgot_password_email_instructions']}

    -

    {$_lang['forgot_password_email_fine_print']}

    -EOD; - - $mail = mail($to, $subject, $body, $headers); - if(!$mail) { $this->errors[] = $_lang['error_sending_email']; } - - return $mail; - } - } - - function unblockUser($user_id) { - global $modx, $_lang; - - $pre = $modx->db->config['table_prefix']; - $modx->db->update(array('blocked' => 0, 'blockeduntil' => 0, 'failedlogincount' => 0), "`{$pre}user_attributes`", "internalKey = '{$user_id}'"); - - if(!$modx->db->getAffectedRows()) { $this->errors[] = $_lang['user_doesnt_exist']; return; } - - return true; - } - - function checkLang() { - global $_lang; - - $eng = array(); - $eng['forgot_your_password'] = 'Forgot your password?'; - $eng['account_email'] = 'Account email'; - $eng['send'] = 'Send'; - $eng['password_change_request'] = 'Password change request'; - $eng['forgot_password_email_intro'] = 'A request has been made to change the password on your account.'; - $eng['forgot_password_email_link'] = 'Click here to complete the process.'; - $eng['forgot_password_email_instructions'] = 'From there you will be able to change your password from the My Account menu.'; - $eng['forgot_password_email_fine_print'] = '* The URL above will expire once you change your password or after today.'; - $eng['error_sending_email'] = 'Error sending email'; - $eng['could_not_find_user'] = 'Could not find user'; - $eng['user_doesnt_exist'] = 'User does not exist'; - $eng['email_sent'] = 'Email sent'; - - foreach($eng as $key=>$value) { - if(empty($_lang[$key])) { $_lang[$key] = $value; } - } - } - - function getErrorOutput() { - $output = ''; - - if($this->errors) { - $output = ''.implode('', $this->errors).''; - } - - return $output; - } - } -} - -global $_lang; - -$output = ''; -$event_name = $modx->Event->name; -$action = (empty($_GET['action']) ? '' : (is_string($_GET['action']) ? $_GET['action'] : '')); -$username = (empty($_GET['username']) ? false : (is_string($_GET['username']) ? $_GET['username'] : '')); -$to = (empty($_GET['email']) ? '' : (is_string($_GET['email']) ? $_GET['email'] : '')); -$hash = (empty($_GET['hash']) ? false : (is_string($_GET['hash']) ? $_GET['hash'] : '')); -$forgot = new ForgotManagerPassword(); - -if($event_name == 'OnManagerLoginFormRender') { - switch($action) { - case 'show_form': - $output = $forgot->getForm(); - break; - case 'send_email': - if($forgot->sendEmail($to)) { $output = $_lang['email_sent']; } - break; - default: - $output = $forgot->getLink(); - break; - } - - if($forgot->errors) { $output = $forgot->getErrorOutput() . $forgot->getLink(); } -} - -if($event_name == 'OnBeforeManagerLogin' && $hash && $username) { - $user = $forgot->getUser(false, $username, '', $hash); - if($user && is_array($user) && !$forgot->errors) { - $forgot->unblockUser($user['id']); - } -} - -if($event_name == 'OnManagerAuthentication' && $hash && $username) { - $user = $forgot->getUser(false, $username, '', $hash); - $output = ($user !== null && count($forgot->errors) == 0) ? true : false; -} - -$modx->Event->output($output); +require MODX_BASE_PATH.'assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php'; \ No newline at end of file From 115313723dce0616a6bc4f31581713145658699f Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 08:51:24 +0300 Subject: [PATCH 221/530] refactor transallias to smaller cache file --- .../plugins/transalias/plugin.transalias.php | 45 +++++++++++++++++++ install/assets/plugins/transalias.tpl | 43 +----------------- 2 files changed, 46 insertions(+), 42 deletions(-) create mode 100644 assets/plugins/transalias/plugin.transalias.php diff --git a/assets/plugins/transalias/plugin.transalias.php b/assets/plugins/transalias/plugin.transalias.php new file mode 100644 index 0000000000..a417e03140 --- /dev/null +++ b/assets/plugins/transalias/plugin.transalias.php @@ -0,0 +1,45 @@ +config['base_path'].'assets/plugins/'.$plugin_dir; } +if (!isset ($table_name)) { $table_name = 'common'; } +if (!isset ($char_restrict)) { $char_restrict = 'lowercase alphanumeric'; } +if (!isset ($remove_periods)) { $remove_periods = 'No'; } +if (!isset ($word_separator)) { $word_separator = 'dash'; } +if (!isset ($override_tv)) { $override_tv = ''; } + +if (!class_exists('TransAlias')) { + require_once $plugin_path.'/transalias.class.php'; +} +$trans = new TransAlias($modx); + +/* + * see if TV overrides the table name + */ +if(!empty($override_tv)) { + $tvval = $trans->getTVValue($override_tv); + if(!empty($tvval)) { + $table_name = $tvval; + } +} + +/* + * Handle events + */ +$e =& $modx->event; +switch ($e->name ) { + case 'OnStripAlias': + if ($trans->loadTable($table_name, $remove_periods)) { + $output = $trans->stripAlias($alias,$char_restrict,$word_separator); + $e->output($output); + $e->stopPropagation(); + } + break ; + default: + return ; +} \ No newline at end of file diff --git a/install/assets/plugins/transalias.tpl b/install/assets/plugins/transalias.tpl index ad66e8e8aa..be4710ec1a 100644 --- a/install/assets/plugins/transalias.tpl +++ b/install/assets/plugins/transalias.tpl @@ -16,45 +16,4 @@ * @internal @installset base, sample */ -/* - * Initialize parameters - */ -if (!isset ($alias)) { return ; } -if (!isset ($plugin_dir) ) { $plugin_dir = 'transalias'; } -if (!isset ($plugin_path) ) { $plugin_path = $modx->config['base_path'].'assets/plugins/'.$plugin_dir; } -if (!isset ($table_name)) { $table_name = 'common'; } -if (!isset ($char_restrict)) { $char_restrict = 'lowercase alphanumeric'; } -if (!isset ($remove_periods)) { $remove_periods = 'No'; } -if (!isset ($word_separator)) { $word_separator = 'dash'; } -if (!isset ($override_tv)) { $override_tv = ''; } - -if (!class_exists('TransAlias')) { - require_once $plugin_path.'/transalias.class.php'; -} -$trans = new TransAlias($modx); - -/* - * see if TV overrides the table name - */ -if(!empty($override_tv)) { - $tvval = $trans->getTVValue($override_tv); - if(!empty($tvval)) { - $table_name = $tvval; - } -} - -/* - * Handle events - */ -$e =& $modx->event; -switch ($e->name ) { - case 'OnStripAlias': - if ($trans->loadTable($table_name, $remove_periods)) { - $output = $trans->stripAlias($alias,$char_restrict,$word_separator); - $e->output($output); - $e->stopPropagation(); - } - break ; - default: - return ; -} \ No newline at end of file +require MODX_BASE_PATH.'assets/plugins/transalias/plugin.transalias.php'; \ No newline at end of file From b2c17dad1b0f24909810cc2240cc78ee88766b93 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 08:58:57 +0300 Subject: [PATCH 222/530] small fix and add fileSource plugin --- .../plugins/filesource/plugin.filesource.php | 139 ++++++++++++++++++ .../plugin.forgotmanagerlogin.php | 1 + .../plugins/transalias/plugin.transalias.php | 17 +-- install/assets/plugins/filesource.tpl | 16 ++ 4 files changed, 160 insertions(+), 13 deletions(-) create mode 100644 assets/plugins/filesource/plugin.filesource.php create mode 100644 install/assets/plugins/filesource.tpl diff --git a/assets/plugins/filesource/plugin.filesource.php b/assets/plugins/filesource/plugin.filesource.php new file mode 100644 index 0000000000..13ff25eb64 --- /dev/null +++ b/assets/plugins/filesource/plugin.filesource.php @@ -0,0 +1,139 @@ +Event; + +$output = ''; + +/** + * Подготовка информации перед рендером формы редактирования сниппета + */ +$name=$e->name; +$dir='snippets'; +$vals='snippet'; +$include='return require'; +$count=47; + if ($name=='OnPluginFormPrerender' ||$name=='OnPluginFormRender' ||$name=='OnBeforePluginFormSave') {$dir='plugins';$vals='plugincode';$count=39;$include='require';} + + + +switch ($e->name) { + case 'OnPluginFormPrerender': + case 'OnSnipFormPrerender': + + global $content; + if(substr(trim($content[$vals]),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$dir.'/'){ + $content['file_binding'] = str_replace(array(';','\''),'',trim(substr(trim($content[$vals]),$count,250))); + $snippetPath = MODX_BASE_PATH . 'assets/'.$dir.'/' . $content['file_binding']; + $content[$vals] = file_get_contents($snippetPath); + if ( $vals=='snippet'){ + if ( strncmp($content[$vals], "' ) $content[$vals] = substr($content[$vals], 0, -2); + + } else { + $content['file_binding'] = ''; + } + } + + if ( $vals=='plugincode'){ + if ( strncmp($content[$vals], "' ) $content[$vals] = substr($content[$vals], 0, -2); + + } +} + $_SESSION['itemname']=$content['name']; + } elseif (substr(trim($content[$vals]),0,7) == '//@FILE'){ // Added by Carw + $content['file_binding'] = str_replace(';','',trim(substr(trim($content[$vals]),7,250))); + $snippetPath = MODX_BASE_PATH . 'assets/'.$dir.'/' . $content['file_binding']; + $content[$vals] = file_get_contents($snippetPath); + if ( strncmp($content[$vals], "' ) $content[$vals] = substr($content[$vals], 0, -2); + } else { + $content['file_binding'] = ''; + } + $_SESSION['itemname']=$content['name']; + } else { + $_SESSION['itemname']="New snippet"; + } + break; + case 'OnSnipFormRender': + case 'OnPluginFormRender': + global $content; + + $output = ' + + '; + break; + case 'OnBeforeSnipFormSave': + if(!empty($_POST['filebinding'])) { + global $snippet; + $pathsnippet = trim($modx->db->escape($_POST['filebinding'])); + $fullpathsnippet = MODX_BASE_PATH . 'assets/'.$dir.'/' . $pathsnippet; + + if($fl = @fopen($fullpathsnippet,'w')) { + fwrite($fl, $_POST['post']); + fclose($fl); + $snippet = $modx->db->escape($include.' MODX_BASE_PATH.\'assets/'.$dir.'/' . $pathsnippet . '\';'); + } + } + break; + case 'OnBeforePluginFormSave': + + + if(!empty($_POST['filebinding'])) { + global $plugincode; + $pathsnippet = trim($modx->db->escape($_POST['filebinding'])); + $fullpathsnippet = MODX_BASE_PATH . 'assets/'.$dir.'/' . $pathsnippet; + + + $code=''; + + if($fl = @fopen($fullpathsnippet,'w')) { + fwrite($fl, $code); + fclose($fl); + $plugincode = $modx->db->escape($include.' MODX_BASE_PATH.\'assets/'.$dir.'/' . $pathsnippet . '\';'); + } + + } + break; +} + +if($output != '') { + $e->output($output); +} +?> \ No newline at end of file diff --git a/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php b/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php index ffd407ffe9..1a073e9058 100644 --- a/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php +++ b/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php @@ -183,3 +183,4 @@ function getErrorOutput() { } $modx->Event->output($output); +?> \ No newline at end of file diff --git a/assets/plugins/transalias/plugin.transalias.php b/assets/plugins/transalias/plugin.transalias.php index a417e03140..6bcfddfd15 100644 --- a/assets/plugins/transalias/plugin.transalias.php +++ b/assets/plugins/transalias/plugin.transalias.php @@ -1,9 +1,6 @@ config['base_path'].'assets/plugins/'.$plugin_dir; } @@ -12,25 +9,18 @@ if (!isset ($remove_periods)) { $remove_periods = 'No'; } if (!isset ($word_separator)) { $word_separator = 'dash'; } if (!isset ($override_tv)) { $override_tv = ''; } - if (!class_exists('TransAlias')) { require_once $plugin_path.'/transalias.class.php'; } $trans = new TransAlias($modx); - -/* - * see if TV overrides the table name - */ +//see if TV overrides the table name if(!empty($override_tv)) { $tvval = $trans->getTVValue($override_tv); if(!empty($tvval)) { $table_name = $tvval; } } - -/* - * Handle events - */ +//Handle events $e =& $modx->event; switch ($e->name ) { case 'OnStripAlias': @@ -42,4 +32,5 @@ break ; default: return ; -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/install/assets/plugins/filesource.tpl b/install/assets/plugins/filesource.tpl new file mode 100644 index 0000000000..5f30861bf0 --- /dev/null +++ b/install/assets/plugins/filesource.tpl @@ -0,0 +1,16 @@ +// Date: Sun, 11 Aug 2013 09:05:08 +0300 Subject: [PATCH 223/530] qm+ install disabled --- install/assets/plugins/ForgotManagerPassword.tpl | 3 ++- install/assets/plugins/qm.tpl | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/install/assets/plugins/ForgotManagerPassword.tpl b/install/assets/plugins/ForgotManagerPassword.tpl index f3730e82b2..0548a7a2fd 100644 --- a/install/assets/plugins/ForgotManagerPassword.tpl +++ b/install/assets/plugins/ForgotManagerPassword.tpl @@ -10,6 +10,7 @@ * @internal @events OnBeforeManagerLogin,OnManagerAuthentication,OnManagerLoginFormRender * @internal @modx_category Manager and Admin * @internal @installset base + * @author opengeek + * @author Agel_Nash */ - require MODX_BASE_PATH.'assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php'; \ No newline at end of file diff --git a/install/assets/plugins/qm.tpl b/install/assets/plugins/qm.tpl index 8739e802f5..b1dc1970f0 100644 --- a/install/assets/plugins/qm.tpl +++ b/install/assets/plugins/qm.tpl @@ -12,6 +12,7 @@ * @internal @modx_category Manager and Admin * @internal @legacy_names QM+,QuickEdit * @internal @installset base, sample + * @internal @disabled 1 */ From 3f853e8382647c24010361910de7c2fbc5b7de78 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:09:31 +0300 Subject: [PATCH 224/530] Refactor #10071 ajaxSearch --- .../ajaxSearch/snippet.ajaxSearch.php | 416 ++++++++++++++++ install/assets/plugins/searchhighlight.tpl | 1 + install/assets/snippets/ajaxSearch.tpl | 471 +----------------- 3 files changed, 419 insertions(+), 469 deletions(-) create mode 100755 assets/snippets/ajaxSearch/snippet.ajaxSearch.php diff --git a/assets/snippets/ajaxSearch/snippet.ajaxSearch.php b/assets/snippets/ajaxSearch/snippet.ajaxSearch.php new file mode 100755 index 0000000000..e0aae2385f --- /dev/null +++ b/assets/snippets/ajaxSearch/snippet.ajaxSearch.php @@ -0,0 +1,416 @@ +getMicroTime(); + +$cfg = array(); // current configuration +$cfg['version'] = AS_VERSION; + +// Load the default configuration $dcfg to get the default values +$default = AS_PATH . 'configs/default.config.php'; +if (file_exists($default)) include $default; +else return "

    AjaxSearch error: $default not found !
    Check the existing of this file!

    "; +if (!isset($dcfg)) return "

    AjaxSearch error: default configuration array not defined in $default!
    Check the content of this file!

    "; + +if ($dcfg['version'] != AS_VERSION) return "

    AjaxSearch error: Version number mismatch. Check the content of the default configuration file!

    "; + +// check the possible use of deprecated parameters (since 1.8.5) +$readme = "ajaxSearch_version_193.txt"; +if (isset($searchWordList)) return "

    AjaxSearch error: searchWordList is a deprecated parameter. Read " . $readme . " file.

    "; +if (isset($resultsPage)) return "

    AjaxSearch error: resultsPage is a deprecated parameter. Read " . $readme . " file.

    "; +if (isset($AS_showForm)) return "

    AjaxSearch error: AS_showForm parameter has been renamed showInputForm. Read " . $readme . " file.

    "; +if (isset($AS_landing)) return "

    AjaxSearch error: AS_landing parameter has been renamed landingPage. Read " . $readme . " file.

    "; +if (isset($AS_showResults)) return "

    AjaxSearch error: AS_showResults parameter has been renamed showResults. Read " . $readme . " file.

    "; + +// Load a custom configuration file if required +// config_name - Other config installed in the configs folder or in any folder within the MODx base path via @FILE +// Configuration files should be named in the form: .config.php +// Default: '' - no custom config +$cfg['config'] = isset($config) ? $config : $dcfg['config']; +if ($cfg['config']) { + $config = $cfg['config']; + $lconfig = (substr($config, 0, 6) != "@FILE:") ? AS_PATH . "configs/$config.config.php" : $modx->config['base_path'] . trim(substr($config, 6, strlen($config)-6)); + if (file_exists($lconfig)) include $lconfig; + else return "

    AjaxSearch error: " . $lconfig . " not found !
    Check your config parameter or your config file name!

    "; +} + +// &debug = [ 0 | 1 | 2 | 3 ] +// 1,2,3 : File mode - Output logged into a file named ajaxSearch_log.txt in ajaxSearch/debug/ directory. +// this directory should be writable. +// Default: 0 - no logs +$cfg['debug'] = isset($debug) ? $debug : (isset($__debug) ? $__debug : $dcfg['debug']); + +// &timeLimit = [ int | 60 ] +// Max execution time in seconds for the AjaxSearch script +// 0 - If set to zero, no time limit is imposed +// Default: 60 - 1 minute. +$cfg['timeLimit'] = isset($timeLimit) ? $timeLimit : (isset($__timeLimit) ? $__timeLimit : $dcfg['timeLimit']); + +// &language [ language_name | manager_language ] (optional) +// Default: $modx->config['manager_language'] - manager language used +$cfg['language'] = isset($language) ? $language : (isset($__language) ? $__language : $dcfg['language']); + +// &ajaxSearch [1 | 0] (as passed in snippet variable ONLY) +// Use this to display the search results using ajax You must include the Mootools library in your template +// Default: 1 - ajax mode selected +$cfg['ajaxSearch'] = isset($ajaxSearch) ? $ajaxSearch : (isset($__ajaxSearch) ? $__ajaxSearch : $dcfg['ajaxSearch']); +// avoid the use of @FILE: prefix with ajax mode +if ((substr($cfg['config'], 0, 6) == "@FILE:") && $cfg['ajaxSearch']) + return "

    AjaxSearch error: @FILE: prefix not allowed !
    Check your config parameter or your config file name!

    "; + +// &advSearch [ 'exactphrase' | 'allwords' | 'nowords' | 'oneword' ] +// Advanced search: +// - exactphrase : provides the documents which contain the exact phrase +// - allwords : provides the documents which contain all the words +// - nowords : provides the documents which do not contain the words +// - oneword : provides the document which contain at least one word +// Default: 'oneword' +$cfg['advSearch'] = isset($advSearch) ? $advSearch : (isset($__advSearch) ? $__advSearch : $dcfg['advSearch']); + +// &asId - Unique id for AjaxSearch instance +// this allows to distinguish several Ajaxsearch instances on the same page +// Any combination of characters a-z, underscores, and numbers 0-9 +// This is case sensitive. Default = empty string +// With ajax mode, the first snippet call of the page shouldn't use the asId parameter +$cfg['asId'] = isset($asId) ? $asId : (isset($__asId) ? $__asId : $dcfg['asId']); + +// &whereSearch +// Define where should occur the search +// a separated list of keywords describing the tables where to search +// keywords allowed : +// "content" for site_content, "tv" for site_tmplvar_contentvalues, "jot" for jot_content, "maxigallery" for maxigallery +// you could add your own keywords. But the keyword should be a user function which describes the tables to use +// all the text fields are searchable but you could specify the fields like this: +// whereSearch=`content:pagetitle,introtext,content|tv:tv_value|maxigallery:gal_title` +// Default: 'content|tv' +$cfg['whereSearch'] = isset($whereSearch) ? $whereSearch : (isset($__whereSearch) ? $__whereSearch : $dcfg['whereSearch']); + +// &sites : [comma separated list of sites] +// sites allow to define sites where to do the search +$cfg['sites'] = isset($sites) ? $sites : (isset($__sites) ? $__sites : $dcfg['sites']); + +// &subSearch [comma separated list of subsites] +// subSearch allow to define sub-domains or subsites where to do the search +$cfg['subSearch'] = isset($subSearch) ? $subSearch : (isset($__subSearch) ? $__subSearch : $dcfg['subSearch']); + +// &category [ tv_name ] +// Any combination of characters a-z, underscores, and numbers 0-9 +// This is case sensitive. Default = empty string +// Name of a TV. The category of a MODx document is provided by this TV content +$cfg['category'] = isset($category) ? $category : (isset($__category) ? $__category : $dcfg['category']); + +// &display [ 'mixed' | 'unmixed' ] +// When results comes from differents sites, subsites or categories, you could choose to display the results mixed or unmixed. +// Default: unmixed +// Unmixed mode display the results grouped by site, subsite or category. Each group of results could be paginated. +// Mixed mode mixe all the results coming from the differents area. +// With unmixed mode, results are ordered by the field provided by the first field of the order parameter +$cfg['display'] = isset($display) ? $display : (isset($__display) ? $__display : $dcfg['display']); + +// &init [ 'none' | 'all' ] +// init defines if the search display all the results or none when the search term is an empty string +// Default: none +$cfg['init'] = isset($init) ? $init : (isset($__init) ? $__init : $dcfg['init']); + +// &withTvs - Define which Tvs are used for the search in Tvs +// a comma separated list of TV names +// Default: '' - all TVs are used (empty list) +$cfg['withTvs'] = isset($withTvs) ? $withTvs : (isset($__withTvs) ? $__withTvs : $dcfg['withTvs']); + +// &order - Define the sort order of results +// Comma separated list of fields defined as searchable in the table definition +// to suppress the sorting, use &order=`` +// Default: 'pub_date,pagetitle' +$cfg['order'] = isset($order) ? $order : (isset($__order) ? $__order : $dcfg['order']); + +// &rank - Define the rank of search results. Results are sorted by rank value +// Comma separated list of fields with optionally user defined weight +// Default: 'pagetitle:100,extract' +// to suppress the rank sorting, use &rank=``; +// &rank sort occurs after the &order sort +$cfg['rank'] = isset($rank) ? $rank : (isset($__rank) ? $__rank : $dcfg['rank']); + +// &maxWords [ 1 < int < 10 ] +// Maximum number of words for searching +// Default: 5 +$cfg['maxWords'] = isset($maxWords) ? intval($maxWords) : (isset($__maxWords) ? intval($__maxWords) : $dcfg['maxWords']); + +// &minChars [ 2 < int < 100 ] +// Minimum number of characters to require for a word to be valid for searching. +// length of each word with $advSearch = 'allwords', 'oneword' or 'nowords' +// length of the search string with possible spaces with $advSearch = 'exactphrase' +// Default: 3 +$cfg['minChars'] = isset($minChars) ? intval($minChars) : (isset($__minChars) ? intval($__minChars) : $dcfg['minChars']); + +// &showInputForm [0 | 1] +// If you would like to turn off the search form when showing results you can set this to false.(1=true, 0=false) +// Default: 1 +$cfg['showInputForm'] = isset($showInputForm) ? $showInputForm : (isset($__showInputForm) ? $__showInputForm : $dcfg['showInputForm']); + +// &showIntro [0 | 1] +// If you would like to turn off the intro message beyond the input form you can set this to false.(1=true, 0=false) +// Default: 1 +$cfg['showIntro'] = isset($showIntro) ? $showIntro : (isset($__showIntro) ? $__showIntro : $dcfg['showIntro']); + +// &grabMax [ int ] +// Set to the max number of records you would like on each page. Set to 0 if unlimited. +// Default: 10 +$cfg['grabMax'] = isset($grabMax) ? intval($grabMax) : (isset($__grabMax) ? intval($__grabMax) : $dcfg['grabMax']); + +// &extract [ n:searchable fields list | 1:content,description,introtext,tv_content] +// show the search terms highlighted in a little extract +// n : maximum number of extracts displayed +// ordered searchable fields list : separated list of fields define as searchable in the table definition +// Default: '1:content,description,introtext,tv_value' - One extract from content then description,introtext,tv_value +$cfg['extract'] = isset($extract) ? $extract : (isset($__extract) ? $__extract : $dcfg['extract']); + +// &extractLength [ 50 < int < 800] +// Length of extract around the search words found - between 50 and 800 characters +// Default: 200 +$cfg['extractLength'] = isset($extractLength) ? intval($extractLength) : (isset($__extractLength) ? intval($__extractLength) : $dcfg['extractLength']); + +// &extractEllips [ string ] +// Ellipside to mark the star and the end of an extract when the sentence is cutting +// Default: '...' +$cfg['extractEllips'] = isset($extractEllips) ? $extractEllips : (isset($__extractEllips) ? $__extractEllips : $dcfg['extractEllips']); + +// &extractSeparator [ string ] +// Any html tag to mark the separation between extracts +// Default: '
    ' - but you could also choose for instance '
    ' +$cfg['extractSeparator'] = isset($extractSeparator) ? $extractSeparator : (isset($__extractSeparator) ? $__extractSeparator : $dcfg['extractSeparator']); + +// &formatDate [ string ] +// The format of outputted dates. See http://www.php.net/manual/en/function.date.php +// Default: 'd/m/y : H:i:s' - e.g: 21/01/08 : 23:09:22 +$cfg['formatDate'] = isset($formatDate) ? $formatDate : (isset($__formatDate) ? $__formatDate : $dcfg['formatDate']); + +// &highlightResult [1 | 0] +// create links so that search terms will be highlighted when linked page clicked +// Default: 1 - Results highlighted +$cfg['highlightResult'] = isset($highlightResult) ? $highlightResult : (isset($__highlightResult) ? $__highlightResult : $dcfg['highlightResult']); + +// &pagingType[ 0 | 1 | 2 ] +// Determine the pagination type used - Default 1 : Previous - X-Y/Z - Next +$cfg['pagingType'] = isset($pagingType) ? $pagingType : (isset($__pagingType) ? $__pagingType : $dcfg['pagingType']); + +// &pageLinkSeparator [ string ] +// What you want, if anything, between your page link numbers +// Default: ' | ' +$cfg['pageLinkSeparator'] = isset($pageLinkSeparator) ? $pageLinkSeparator : (isset($__pageLinkSeparator) ? $__pageLinkSeparator : $dcfg['pageLinkSeparator']); + +// &showPagingAlways[1 | 0] +// Determine whether or not to always show paging +$cfg['showPagingAlways'] = isset($showPagingAlways) ? $showPagingAlways : (isset($__showPagingAlways) ? $__showPagingAlways : $dcfg['showPagingAlways']); + +// &landingPage [int] set the page to show the results page (non Ajax search) +// Default: false +$cfg['landingPage'] = isset($landingPage) ? $landingPage : (isset($__landingPage) ? $__landingPage : $dcfg['landingPage']); + +// &showResults [1 | 0] establish whether to show the results or not +// Default: 1 +$cfg['showResults'] = isset($showResults) ? $showResults : (isset($__showResults) ? $__showResults : $dcfg['showResults']); + +// &parents [ [ in | not in ] : comma separated list of Ids | '' ] +// Ids of documents to retrieve their children to &depth depth where to do the search in or not in +// Default: '' - empty list +$cfg['parents'] = isset($parents) ? $parents : (isset($__parents) ? $__parents : $dcfg['parents']); + +// &documents [ [ in | not in ] : comma separated list of Ids | '' ] +// Ids of documents where to do the search in or not in +// Default: '' - empty list +$cfg['documents'] = isset($documents) ? $documents : (isset($__documents) ? $__documents : $dcfg['documents']); + +// &depth [ 0 < int ] Number of levels deep to retrieve documents +// Default: 10 +$cfg['depth'] = isset($depth) ? intval($depth) : (isset($__depth) ? intval($__depth) : $dcfg['depth']); + +// &hideMenu [0 | 1| 2] Search in hidden documents from menu. +// 0 - search only in documents visible from menu +// 1 - search only in documents hidden from menu +// 2 - search in hidden or visible documents from menu +// Default: 2 +$cfg['hideMenu'] = isset($hideMenu) ? $hideMenu : (isset($__hideMenu) ? $__hideMenu : $dcfg['hideMenu']); + +// &hideLink [0 | 1 ] Search in content of type reference (link) +// 0 - search in content of type document AND reference +// 1 - search only in content of type document +// Default: 1 +$cfg['hideLink'] = isset($hideLink) ? $hideLink : (isset($__hideLink) ? $__hideLink : $dcfg['hideLink']); + +// &filter - Basic filtering : remove unwanted documents that meets the criteria of the filter +// See Ditto 2 Basic filtering and the ajaxSearch demo site for more information +// Default: '' - empty list +$cfg['filter'] = isset($filter) ? $filter : (isset($__filter) ? $__filter : $dcfg['filter']); + +// &output [0 | 1 ]Custom layout +// Default: 0 - Results are listed just under the input form +// 1 - custom layout. put [+as.inputForm+] and [+as.results+] where you want to define the layout +$cfg['output'] = isset($output) ? $output : (isset($__output) ? $__output : $dcfg['output']); + +// &tplInput - Chunk to style the ajaxSearch input form +// Default: '@FILE:' . AS_SPATH . 'templates/input.tpl.html' +$cfg['tplInput'] = isset($tplInput) ? $tplInput : (isset($__tplInput) ? $__tplInput : $dcfg['tplInput']); + +// &tplResults - Chunk to style the non-ajax output results outer +// Default: '@FILE:' . AS_SPATH . 'templates/results.tpl.html' +$cfg['tplResults'] = isset($tplResults) ? $tplResults : (isset($__tplResults) ? $__tplResults : $dcfg['tplResults']); + +// &tplGrpResult - Chunk to style the non-ajax output group result outer +// Default: '@FILE:' . AS_SPATH . 'templates/grpResult.tpl.html' +$cfg['tplGrpResult'] = isset($tplGrpResult) ? $tplGrpResult : (isset($__tplGrpResult) ? $__tplGrpResult : $dcfg['tplGrpResult']); + +// &tplResult - Chunk to style each output result +// Default: "@FILE:" . AS_SPATH . 'templates/result.tpl.html' +$cfg['tplResult'] = isset($tplResult) ? $tplResult : (isset($__tplResult) ? $__tplResult : $dcfg['tplResult']); + +// &tplComment - Chunk to style the comment form (Also used with the ajax mode) +// Default: '@FILE:' . AS_SPATH . 'templates/comment.tpl.html' +$cfg['tplComment'] = isset($tplComment) ? $tplComment : (isset($__tplComment) ? $__tplComment : $dcfg['tplComment']); + +// &tplPaging0 - Chunk to style the paging links - type 0 +// Default: '@FILE:' . AS_SPATH . 'templates/paging0.tpl.html' +$cfg['tplPaging0'] = isset($tplPaging0) ? $tplPaging0 : (isset($__tplPaging0) ? $__tplPaging0 : $dcfg['tplPaging0']); + +// &tplPaging1 - Chunk to style the paging links - type 1 +// Default: '@FILE:' . AS_SPATH . 'templates/paging1.tpl.html' +$cfg['tplPaging1'] = isset($tplPaging1) ? $tplPaging1 : (isset($__tplPaging1) ? $__tplPaging1 : $dcfg['tplPaging1']); + +// &tplPaging2 - Chunk to style the paging links - type 2 +// Default: '@FILE:' . AS_SPATH . 'templates/paging2.tpl.html' +$cfg['tplPaging2'] = isset($tplPaging2) ? $tplPaging2 : (isset($__tplPaging2) ? $__tplPaging2 : $dcfg['tplPaging2']); + +// &stripInput - stripInput user function name +// Default: 'defaultStripInput' +$cfg['stripInput'] = isset($stripInput) ? $stripInput : (isset($__stripInput) ? $__stripInput : $dcfg['stripInput']); + +// &stripOutput - stripOutput user function name +// Default: 'defaultStripOutput' +$cfg['stripOutput'] = isset($stripOutput) ? $stripOutput : (isset($__stripOutput) ? $__stripOutput : $dcfg['stripOutput']); + +// &breadcrumbs +// 0 : disallow the breadcrumbs link +// Name of the breadcrumbs function : allow the breadcrumbs link +// The function name could be followed by some parameter initialization +// e.g: &breadcrumbs=`Breadcrumbs,showHomeCrumb:0,showCrumbsAtHome:1` +// Default: '' - empty string +$cfg['breadcrumbs'] = isset($breadcrumbs) ? $breadcrumbs : (isset($__breadcrumbs) ? $__breadcrumbs : $dcfg['breadcrumbs']); + +// &tvPhx - display and set placeHolders for TV (template variables) +// 0 : disallow the feature +// 1 : allow the display of all Modx TVs of the document found (default) +// 'tb_alias:display_function_name[,[tb_alias:display_function_name]*]' : set up placeholders for custom joined tables +// Default: 1 - tvPhx allowed for TV only +$cfg['tvPhx'] = isset($tvPhx) ? $tvPhx : (isset($__tvPhx) ? $__tvPhx : $dcfg['tvPhx']); + +// &clearDefault - Clearing default text +// Set this to 1 if you would like to include the clear default js function +// add the class "cleardefault" to your input text form and set this parameter +// Default: 0 +$cfg['clearDefault'] = isset($clearDefault) ? $clearDefault : (isset($__clearDefault) ? $__clearDefault : $dcfg['clearDefault']); + +// &jsClearDefault - Location of the js library +// Default: AS_SPATH . 'js/clearDefault.js' +$cfg['jsClearDefault'] = $dcfg['jsClearDefault']; + +// &mbstring - php_mbstring extension available [0 | 1] +// Default: 1 - extension available +$cfg['mbstring'] = isset($mbstring) ? $mbstring : (isset($__mbstring) ? $__mbstring : $dcfg['mbstring']); + +// &asLog - ajaxSearch log [ level [: comment [: purge]]] +// level: +// 0 : disallow the ajaxSearch log (Default) +// 1 : failed search requests are logged +// 2 : all ajaxSearch requests are logged +// comment: +// 0 : user comment not allowed (Default) +// 1 : user comment allowed +// purge: number of logs allowed before to do an automatic purge of the table +// Default: 200 +$cfg['asLog'] = isset($asLog) ? $asLog : (isset($__asLog) ? $__asLog : $dcfg['asLog']); + + +//------------------------------------------------------------------------------ +// Configuration - Simple Ajax mode +//------------------------------------------------------------------------------ + +if ($cfg['ajaxSearch']) { + + // $liveSearch [1 | 0] (as passed in snippet variable ONLY) + // Set this to 1 if you would like to use the live search (i.e. results as you type) + // Default: 0 - livesearch mode inactivated + $cfg['liveSearch'] = isset($liveSearch) ? $liveSearch : (isset($__liveSearch) ? $__liveSearch : $dcfg['liveSearch']); + + // &ajaxMax [int] - The maximum number of results to show for the ajaxsearch + // Default: 6 + $cfg['ajaxMax'] = isset($ajaxMax) ? $ajaxMax : (isset($__ajaxMax) ? $__ajaxMax : $dcfg['ajaxMax']); + + // &moreResultsPage [int] + // The document id of the page you want the more results link to point to + // Default: 0 + $cfg['moreResultsPage'] = isset($moreResultsPage) ? $moreResultsPage : (isset($__moreResultsPage) ? $__moreResultsPage : $dcfg['moreResultsPage']); + + // &opacity - set the opacity of the div ajaxSearch_output + // Should be a float value: [ 0. < float <= 1. ] + // Default: 1. + $cfg['opacity'] = isset($opacity) ? $opacity : (isset($__opacity) ? $__opacity : $dcfg['opacity']); + + // &tplAjaxResults - Chunk to style the ajax output results outer + // Default: '' - empty string + $cfg['tplAjaxResults'] = isset($tplAjaxResults) ? $tplAjaxResults : (isset($__tplAjaxResults) ? $__tplAjaxResults : $dcfg['tplAjaxResults']); + + // &tplAjaxGrpResult - Chunk to style each ajax output group result outer + // Default: '' - empty string + $cfg['tplAjaxGrpResult'] = isset($tplAjaxGrpResult) ? $tplAjaxGrpResult : (isset($__tplAjaxGrpResult) ? $__tplAjaxGrpResult : $dcfg['tplAjaxGrpResult']); + + // &tplAjaxResult - Chunk to style each ajax output result + // Default: '' - empty string + $cfg['tplAjaxResult'] = isset($tplAjaxResult) ? $tplAjaxResult : (isset($__tplAjaxResult) ? $__tplAjaxResult : $dcfg['tplAjaxResult']); + + // &jscript ['jquery'|'mootools2'|'mootools'] + // Set this to jquery if you would like use the jquery library + // set mootools2 to use the version 1.2 of mootools (limited to JS functions used by AS) + // Default: 'mootools' - use the version 1.11 of mootools provided with MODx + $cfg['jscript'] = isset($jscript) ? $jscript : (isset($__jscript) ? $__jscript : $dcfg['jscript']); + + // &addJscript [1 | 0] + // Set this to 1 if you would like to include or not the mootool/jquery library in the header of your pages automatically + // Default: 1 + $cfg['addJscript'] = isset($addJscript) ? $addJscript : (isset($__addJscript) ? $__addJscript : $dcfg['addJscript']); + + // &jsMooTools - Location of the mootools javascript library (current version of MODx) + // Default: MGR_DIR.'media/script/mootools/mootools.js' + $cfg['jsMooTools'] = isset($jsMooTools) ? $jsMooTools : (isset($__jsMooTools) ? $__jsMooTools : $dcfg['jsMooTools']); + + // &jsMooTools2 - Location of an alternative mootools javascript library + // Default: AS_SPATH . 'js/mootools1.2/mootools.js' - contains only the required functions for AS + // to use an another library, use this parameter and change the ajaxSearch/js/ajaxSearch1/ajaxSearch-mootools2.js file + $cfg['jsMooTools2'] = isset($jsMooTools2) ? $jsMooTools2 : (isset($__jsMooTools2) ? $__jsMooTools2 : $dcfg['jsMooTools2']); + + // &jsQuery - Location of the jquery javascript library + // Default: AS_SPATH . 'js/jquery/jquery.js' + $cfg['jsJquery'] = isset($jsJquery) ? $jsJquery : (isset($__jsJquery) ? $__jsJquery : $dcfg['jsJquery']); +} + +// ========================================================== End of config +include_once AS_PATH . "classes/ajaxSearch.class.inc.php"; +if (class_exists('AjaxSearch')) { + $as = new AjaxSearch(); + $output = $as->run($tstart, $dcfg, $cfg); +} else { + $output = "

    error: AjaxSearch class not found

    "; +} +$elapsedTime = $modx->getMicroTime() - $tstart; +$etime = sprintf("%.4fs",$elapsedTime); +//$f=fopen('test.txt','a+');fwrite($f,"etime=".$etime."\n\n"); +return $output; \ No newline at end of file diff --git a/install/assets/plugins/searchhighlight.tpl b/install/assets/plugins/searchhighlight.tpl index eb447d76cb..19e7dd9b30 100644 --- a/install/assets/plugins/searchhighlight.tpl +++ b/install/assets/plugins/searchhighlight.tpl @@ -11,6 +11,7 @@ * @internal @modx_category Search * @internal @legacy_names Search Highlighting * @internal @installset base, sample + * @internal @disabled 1 */ /* diff --git a/install/assets/snippets/ajaxSearch.tpl b/install/assets/snippets/ajaxSearch.tpl index 13bb38b6ad..5f4411e81e 100755 --- a/install/assets/snippets/ajaxSearch.tpl +++ b/install/assets/snippets/ajaxSearch.tpl @@ -14,472 +14,5 @@ * @date 20/11/2012 * ----------------------------------------------------------------------------- */ -/** --------------------------------------------------------------------------------- -:: Preamble --------------------------------------------------------------------------------- -The release 1.9 looks like the previous release, but it is a completely -refactored development. - -It is partially based on the previous releases of AjaxSearch written by the -following authors: - - Coroico - Jason Coward - Kyle Jaebker - Ryan Thrash - --------------------------------------------------------------------------------- -:: Description --------------------------------------------------------------------------------- - - Ajax and non-Ajax search that supports results highlighting. - -This snippet adds AJAX functionality on top of the robust content searching. - -What AjaxSearch do: -- search in fields of the content an TV MODx tables -- several customizable input forms available -- search in a subset of documents -- highlighting of searchword in the results returned -- allow a filtering of search results -- displaying of search results customizable thru templates -- group the search results by categories -- filter features (allow to set up specific search forms) - -It could works in two modes: - -ajax mode : -- search results displayed in current page through AJAX request -- multiple search options including live search -- available link to view all results in a new page when only a subset is returned -- customize the number of results returned -- offer two types for paginating the results -- uses the MooTools or JQuery js library for AJAX and visual effects - -non-ajax mode : -- search results displayed in a new page or below on the same page -- offer two types for paginating the results -- works without JS enabled - -What AjaxSearch don't : -- search in dynamic content. AjaxSearch could retreive only data stored in -database. It can't find something stored in a chunk or generated by a snippet. - -MORE : See the ajaxSearch.readme.txt file for more informations. - ------------------------------------------------------------------------------ */ - -// ajaxSearch version being executed -define('AS_VERSION', '1.9.3'); -// Path where ajaxSearch is installed -define('AS_SPATH', 'assets/snippets/ajaxSearch/'); -//include snippet file -define('AS_PATH', MODX_BASE_PATH . AS_SPATH); - -//------------------------------------------------------------------------------ -// Configuration - general AjaxSearch snippet setup options -//------------------------------------------------------------------------------ -global $modx; -$tstart = $modx->getMicroTime(); - -$cfg = array(); // current configuration -$cfg['version'] = AS_VERSION; - -// Load the default configuration $dcfg to get the default values -$default = AS_PATH . 'configs/default.config.php'; -if (file_exists($default)) include $default; -else return "

    AjaxSearch error: $default not found !
    Check the existing of this file!

    "; -if (!isset($dcfg)) return "

    AjaxSearch error: default configuration array not defined in $default!
    Check the content of this file!

    "; - -if ($dcfg['version'] != AS_VERSION) return "

    AjaxSearch error: Version number mismatch. Check the content of the default configuration file!

    "; - -// check the possible use of deprecated parameters (since 1.8.5) -$readme = "ajaxSearch_version_193.txt"; -if (isset($searchWordList)) return "

    AjaxSearch error: searchWordList is a deprecated parameter. Read " . $readme . " file.

    "; -if (isset($resultsPage)) return "

    AjaxSearch error: resultsPage is a deprecated parameter. Read " . $readme . " file.

    "; -if (isset($AS_showForm)) return "

    AjaxSearch error: AS_showForm parameter has been renamed showInputForm. Read " . $readme . " file.

    "; -if (isset($AS_landing)) return "

    AjaxSearch error: AS_landing parameter has been renamed landingPage. Read " . $readme . " file.

    "; -if (isset($AS_showResults)) return "

    AjaxSearch error: AS_showResults parameter has been renamed showResults. Read " . $readme . " file.

    "; - -// Load a custom configuration file if required -// config_name - Other config installed in the configs folder or in any folder within the MODx base path via @FILE -// Configuration files should be named in the form: .config.php -// Default: '' - no custom config -$cfg['config'] = isset($config) ? $config : $dcfg['config']; -if ($cfg['config']) { - $config = $cfg['config']; - $lconfig = (substr($config, 0, 6) != "@FILE:") ? AS_PATH . "configs/$config.config.php" : $modx->config['base_path'] . trim(substr($config, 6, strlen($config)-6)); - if (file_exists($lconfig)) include $lconfig; - else return "

    AjaxSearch error: " . $lconfig . " not found !
    Check your config parameter or your config file name!

    "; -} - -// &debug = [ 0 | 1 | 2 | 3 ] -// 1,2,3 : File mode - Output logged into a file named ajaxSearch_log.txt in ajaxSearch/debug/ directory. -// this directory should be writable. -// Default: 0 - no logs -$cfg['debug'] = isset($debug) ? $debug : (isset($__debug) ? $__debug : $dcfg['debug']); - -// &timeLimit = [ int | 60 ] -// Max execution time in seconds for the AjaxSearch script -// 0 - If set to zero, no time limit is imposed -// Default: 60 - 1 minute. -$cfg['timeLimit'] = isset($timeLimit) ? $timeLimit : (isset($__timeLimit) ? $__timeLimit : $dcfg['timeLimit']); - -// &language [ language_name | manager_language ] (optional) -// Default: $modx->config['manager_language'] - manager language used -$cfg['language'] = isset($language) ? $language : (isset($__language) ? $__language : $dcfg['language']); - -// &ajaxSearch [1 | 0] (as passed in snippet variable ONLY) -// Use this to display the search results using ajax You must include the Mootools library in your template -// Default: 1 - ajax mode selected -$cfg['ajaxSearch'] = isset($ajaxSearch) ? $ajaxSearch : (isset($__ajaxSearch) ? $__ajaxSearch : $dcfg['ajaxSearch']); -// avoid the use of @FILE: prefix with ajax mode -if ((substr($cfg['config'], 0, 6) == "@FILE:") && $cfg['ajaxSearch']) - return "

    AjaxSearch error: @FILE: prefix not allowed !
    Check your config parameter or your config file name!

    "; - -// &advSearch [ 'exactphrase' | 'allwords' | 'nowords' | 'oneword' ] -// Advanced search: -// - exactphrase : provides the documents which contain the exact phrase -// - allwords : provides the documents which contain all the words -// - nowords : provides the documents which do not contain the words -// - oneword : provides the document which contain at least one word -// Default: 'oneword' -$cfg['advSearch'] = isset($advSearch) ? $advSearch : (isset($__advSearch) ? $__advSearch : $dcfg['advSearch']); - -// &asId - Unique id for AjaxSearch instance -// this allows to distinguish several Ajaxsearch instances on the same page -// Any combination of characters a-z, underscores, and numbers 0-9 -// This is case sensitive. Default = empty string -// With ajax mode, the first snippet call of the page shouldn't use the asId parameter -$cfg['asId'] = isset($asId) ? $asId : (isset($__asId) ? $__asId : $dcfg['asId']); - -// &whereSearch -// Define where should occur the search -// a separated list of keywords describing the tables where to search -// keywords allowed : -// "content" for site_content, "tv" for site_tmplvar_contentvalues, "jot" for jot_content, "maxigallery" for maxigallery -// you could add your own keywords. But the keyword should be a user function which describes the tables to use -// all the text fields are searchable but you could specify the fields like this: -// whereSearch=`content:pagetitle,introtext,content|tv:tv_value|maxigallery:gal_title` -// Default: 'content|tv' -$cfg['whereSearch'] = isset($whereSearch) ? $whereSearch : (isset($__whereSearch) ? $__whereSearch : $dcfg['whereSearch']); - -// &sites : [comma separated list of sites] -// sites allow to define sites where to do the search -$cfg['sites'] = isset($sites) ? $sites : (isset($__sites) ? $__sites : $dcfg['sites']); - -// &subSearch [comma separated list of subsites] -// subSearch allow to define sub-domains or subsites where to do the search -$cfg['subSearch'] = isset($subSearch) ? $subSearch : (isset($__subSearch) ? $__subSearch : $dcfg['subSearch']); - -// &category [ tv_name ] -// Any combination of characters a-z, underscores, and numbers 0-9 -// This is case sensitive. Default = empty string -// Name of a TV. The category of a MODx document is provided by this TV content -$cfg['category'] = isset($category) ? $category : (isset($__category) ? $__category : $dcfg['category']); - -// &display [ 'mixed' | 'unmixed' ] -// When results comes from differents sites, subsites or categories, you could choose to display the results mixed or unmixed. -// Default: unmixed -// Unmixed mode display the results grouped by site, subsite or category. Each group of results could be paginated. -// Mixed mode mixe all the results coming from the differents area. -// With unmixed mode, results are ordered by the field provided by the first field of the order parameter -$cfg['display'] = isset($display) ? $display : (isset($__display) ? $__display : $dcfg['display']); - -// &init [ 'none' | 'all' ] -// init defines if the search display all the results or none when the search term is an empty string -// Default: none -$cfg['init'] = isset($init) ? $init : (isset($__init) ? $__init : $dcfg['init']); - -// &withTvs - Define which Tvs are used for the search in Tvs -// a comma separated list of TV names -// Default: '' - all TVs are used (empty list) -$cfg['withTvs'] = isset($withTvs) ? $withTvs : (isset($__withTvs) ? $__withTvs : $dcfg['withTvs']); - -// &order - Define the sort order of results -// Comma separated list of fields defined as searchable in the table definition -// to suppress the sorting, use &order=`` -// Default: 'pub_date,pagetitle' -$cfg['order'] = isset($order) ? $order : (isset($__order) ? $__order : $dcfg['order']); - -// &rank - Define the rank of search results. Results are sorted by rank value -// Comma separated list of fields with optionally user defined weight -// Default: 'pagetitle:100,extract' -// to suppress the rank sorting, use &rank=``; -// &rank sort occurs after the &order sort -$cfg['rank'] = isset($rank) ? $rank : (isset($__rank) ? $__rank : $dcfg['rank']); - -// &maxWords [ 1 < int < 10 ] -// Maximum number of words for searching -// Default: 5 -$cfg['maxWords'] = isset($maxWords) ? intval($maxWords) : (isset($__maxWords) ? intval($__maxWords) : $dcfg['maxWords']); - -// &minChars [ 2 < int < 100 ] -// Minimum number of characters to require for a word to be valid for searching. -// length of each word with $advSearch = 'allwords', 'oneword' or 'nowords' -// length of the search string with possible spaces with $advSearch = 'exactphrase' -// Default: 3 -$cfg['minChars'] = isset($minChars) ? intval($minChars) : (isset($__minChars) ? intval($__minChars) : $dcfg['minChars']); - -// &showInputForm [0 | 1] -// If you would like to turn off the search form when showing results you can set this to false.(1=true, 0=false) -// Default: 1 -$cfg['showInputForm'] = isset($showInputForm) ? $showInputForm : (isset($__showInputForm) ? $__showInputForm : $dcfg['showInputForm']); - -// &showIntro [0 | 1] -// If you would like to turn off the intro message beyond the input form you can set this to false.(1=true, 0=false) -// Default: 1 -$cfg['showIntro'] = isset($showIntro) ? $showIntro : (isset($__showIntro) ? $__showIntro : $dcfg['showIntro']); - -// &grabMax [ int ] -// Set to the max number of records you would like on each page. Set to 0 if unlimited. -// Default: 10 -$cfg['grabMax'] = isset($grabMax) ? intval($grabMax) : (isset($__grabMax) ? intval($__grabMax) : $dcfg['grabMax']); - -// &extract [ n:searchable fields list | 1:content,description,introtext,tv_content] -// show the search terms highlighted in a little extract -// n : maximum number of extracts displayed -// ordered searchable fields list : separated list of fields define as searchable in the table definition -// Default: '1:content,description,introtext,tv_value' - One extract from content then description,introtext,tv_value -$cfg['extract'] = isset($extract) ? $extract : (isset($__extract) ? $__extract : $dcfg['extract']); - -// &extractLength [ 50 < int < 800] -// Length of extract around the search words found - between 50 and 800 characters -// Default: 200 -$cfg['extractLength'] = isset($extractLength) ? intval($extractLength) : (isset($__extractLength) ? intval($__extractLength) : $dcfg['extractLength']); - -// &extractEllips [ string ] -// Ellipside to mark the star and the end of an extract when the sentence is cutting -// Default: '...' -$cfg['extractEllips'] = isset($extractEllips) ? $extractEllips : (isset($__extractEllips) ? $__extractEllips : $dcfg['extractEllips']); - -// &extractSeparator [ string ] -// Any html tag to mark the separation between extracts -// Default: '
    ' - but you could also choose for instance '
    ' -$cfg['extractSeparator'] = isset($extractSeparator) ? $extractSeparator : (isset($__extractSeparator) ? $__extractSeparator : $dcfg['extractSeparator']); - -// &formatDate [ string ] -// The format of outputted dates. See http://www.php.net/manual/en/function.date.php -// Default: 'd/m/y : H:i:s' - e.g: 21/01/08 : 23:09:22 -$cfg['formatDate'] = isset($formatDate) ? $formatDate : (isset($__formatDate) ? $__formatDate : $dcfg['formatDate']); - -// &highlightResult [1 | 0] -// create links so that search terms will be highlighted when linked page clicked -// Default: 1 - Results highlighted -$cfg['highlightResult'] = isset($highlightResult) ? $highlightResult : (isset($__highlightResult) ? $__highlightResult : $dcfg['highlightResult']); - -// &pagingType[ 0 | 1 | 2 ] -// Determine the pagination type used - Default 1 : Previous - X-Y/Z - Next -$cfg['pagingType'] = isset($pagingType) ? $pagingType : (isset($__pagingType) ? $__pagingType : $dcfg['pagingType']); - -// &pageLinkSeparator [ string ] -// What you want, if anything, between your page link numbers -// Default: ' | ' -$cfg['pageLinkSeparator'] = isset($pageLinkSeparator) ? $pageLinkSeparator : (isset($__pageLinkSeparator) ? $__pageLinkSeparator : $dcfg['pageLinkSeparator']); - -// &showPagingAlways[1 | 0] -// Determine whether or not to always show paging -$cfg['showPagingAlways'] = isset($showPagingAlways) ? $showPagingAlways : (isset($__showPagingAlways) ? $__showPagingAlways : $dcfg['showPagingAlways']); - -// &landingPage [int] set the page to show the results page (non Ajax search) -// Default: false -$cfg['landingPage'] = isset($landingPage) ? $landingPage : (isset($__landingPage) ? $__landingPage : $dcfg['landingPage']); - -// &showResults [1 | 0] establish whether to show the results or not -// Default: 1 -$cfg['showResults'] = isset($showResults) ? $showResults : (isset($__showResults) ? $__showResults : $dcfg['showResults']); - -// &parents [ [ in | not in ] : comma separated list of Ids | '' ] -// Ids of documents to retrieve their children to &depth depth where to do the search in or not in -// Default: '' - empty list -$cfg['parents'] = isset($parents) ? $parents : (isset($__parents) ? $__parents : $dcfg['parents']); - -// &documents [ [ in | not in ] : comma separated list of Ids | '' ] -// Ids of documents where to do the search in or not in -// Default: '' - empty list -$cfg['documents'] = isset($documents) ? $documents : (isset($__documents) ? $__documents : $dcfg['documents']); - -// &depth [ 0 < int ] Number of levels deep to retrieve documents -// Default: 10 -$cfg['depth'] = isset($depth) ? intval($depth) : (isset($__depth) ? intval($__depth) : $dcfg['depth']); - -// &hideMenu [0 | 1| 2] Search in hidden documents from menu. -// 0 - search only in documents visible from menu -// 1 - search only in documents hidden from menu -// 2 - search in hidden or visible documents from menu -// Default: 2 -$cfg['hideMenu'] = isset($hideMenu) ? $hideMenu : (isset($__hideMenu) ? $__hideMenu : $dcfg['hideMenu']); - -// &hideLink [0 | 1 ] Search in content of type reference (link) -// 0 - search in content of type document AND reference -// 1 - search only in content of type document -// Default: 1 -$cfg['hideLink'] = isset($hideLink) ? $hideLink : (isset($__hideLink) ? $__hideLink : $dcfg['hideLink']); - -// &filter - Basic filtering : remove unwanted documents that meets the criteria of the filter -// See Ditto 2 Basic filtering and the ajaxSearch demo site for more information -// Default: '' - empty list -$cfg['filter'] = isset($filter) ? $filter : (isset($__filter) ? $__filter : $dcfg['filter']); - -// &output [0 | 1 ]Custom layout -// Default: 0 - Results are listed just under the input form -// 1 - custom layout. put [+as.inputForm+] and [+as.results+] where you want to define the layout -$cfg['output'] = isset($output) ? $output : (isset($__output) ? $__output : $dcfg['output']); - -// &tplInput - Chunk to style the ajaxSearch input form -// Default: '@FILE:' . AS_SPATH . 'templates/input.tpl.html' -$cfg['tplInput'] = isset($tplInput) ? $tplInput : (isset($__tplInput) ? $__tplInput : $dcfg['tplInput']); - -// &tplResults - Chunk to style the non-ajax output results outer -// Default: '@FILE:' . AS_SPATH . 'templates/results.tpl.html' -$cfg['tplResults'] = isset($tplResults) ? $tplResults : (isset($__tplResults) ? $__tplResults : $dcfg['tplResults']); - -// &tplGrpResult - Chunk to style the non-ajax output group result outer -// Default: '@FILE:' . AS_SPATH . 'templates/grpResult.tpl.html' -$cfg['tplGrpResult'] = isset($tplGrpResult) ? $tplGrpResult : (isset($__tplGrpResult) ? $__tplGrpResult : $dcfg['tplGrpResult']); - -// &tplResult - Chunk to style each output result -// Default: "@FILE:" . AS_SPATH . 'templates/result.tpl.html' -$cfg['tplResult'] = isset($tplResult) ? $tplResult : (isset($__tplResult) ? $__tplResult : $dcfg['tplResult']); - -// &tplComment - Chunk to style the comment form (Also used with the ajax mode) -// Default: '@FILE:' . AS_SPATH . 'templates/comment.tpl.html' -$cfg['tplComment'] = isset($tplComment) ? $tplComment : (isset($__tplComment) ? $__tplComment : $dcfg['tplComment']); - -// &tplPaging0 - Chunk to style the paging links - type 0 -// Default: '@FILE:' . AS_SPATH . 'templates/paging0.tpl.html' -$cfg['tplPaging0'] = isset($tplPaging0) ? $tplPaging0 : (isset($__tplPaging0) ? $__tplPaging0 : $dcfg['tplPaging0']); - -// &tplPaging1 - Chunk to style the paging links - type 1 -// Default: '@FILE:' . AS_SPATH . 'templates/paging1.tpl.html' -$cfg['tplPaging1'] = isset($tplPaging1) ? $tplPaging1 : (isset($__tplPaging1) ? $__tplPaging1 : $dcfg['tplPaging1']); - -// &tplPaging2 - Chunk to style the paging links - type 2 -// Default: '@FILE:' . AS_SPATH . 'templates/paging2.tpl.html' -$cfg['tplPaging2'] = isset($tplPaging2) ? $tplPaging2 : (isset($__tplPaging2) ? $__tplPaging2 : $dcfg['tplPaging2']); - -// &stripInput - stripInput user function name -// Default: 'defaultStripInput' -$cfg['stripInput'] = isset($stripInput) ? $stripInput : (isset($__stripInput) ? $__stripInput : $dcfg['stripInput']); - -// &stripOutput - stripOutput user function name -// Default: 'defaultStripOutput' -$cfg['stripOutput'] = isset($stripOutput) ? $stripOutput : (isset($__stripOutput) ? $__stripOutput : $dcfg['stripOutput']); - -// &breadcrumbs -// 0 : disallow the breadcrumbs link -// Name of the breadcrumbs function : allow the breadcrumbs link -// The function name could be followed by some parameter initialization -// e.g: &breadcrumbs=`Breadcrumbs,showHomeCrumb:0,showCrumbsAtHome:1` -// Default: '' - empty string -$cfg['breadcrumbs'] = isset($breadcrumbs) ? $breadcrumbs : (isset($__breadcrumbs) ? $__breadcrumbs : $dcfg['breadcrumbs']); - -// &tvPhx - display and set placeHolders for TV (template variables) -// 0 : disallow the feature -// 1 : allow the display of all Modx TVs of the document found (default) -// 'tb_alias:display_function_name[,[tb_alias:display_function_name]*]' : set up placeholders for custom joined tables -// Default: 1 - tvPhx allowed for TV only -$cfg['tvPhx'] = isset($tvPhx) ? $tvPhx : (isset($__tvPhx) ? $__tvPhx : $dcfg['tvPhx']); - -// &clearDefault - Clearing default text -// Set this to 1 if you would like to include the clear default js function -// add the class "cleardefault" to your input text form and set this parameter -// Default: 0 -$cfg['clearDefault'] = isset($clearDefault) ? $clearDefault : (isset($__clearDefault) ? $__clearDefault : $dcfg['clearDefault']); - -// &jsClearDefault - Location of the js library -// Default: AS_SPATH . 'js/clearDefault.js' -$cfg['jsClearDefault'] = $dcfg['jsClearDefault']; - -// &mbstring - php_mbstring extension available [0 | 1] -// Default: 1 - extension available -$cfg['mbstring'] = isset($mbstring) ? $mbstring : (isset($__mbstring) ? $__mbstring : $dcfg['mbstring']); - -// &asLog - ajaxSearch log [ level [: comment [: purge]]] -// level: -// 0 : disallow the ajaxSearch log (Default) -// 1 : failed search requests are logged -// 2 : all ajaxSearch requests are logged -// comment: -// 0 : user comment not allowed (Default) -// 1 : user comment allowed -// purge: number of logs allowed before to do an automatic purge of the table -// Default: 200 -$cfg['asLog'] = isset($asLog) ? $asLog : (isset($__asLog) ? $__asLog : $dcfg['asLog']); - - -//------------------------------------------------------------------------------ -// Configuration - Simple Ajax mode -//------------------------------------------------------------------------------ - -if ($cfg['ajaxSearch']) { - - // $liveSearch [1 | 0] (as passed in snippet variable ONLY) - // Set this to 1 if you would like to use the live search (i.e. results as you type) - // Default: 0 - livesearch mode inactivated - $cfg['liveSearch'] = isset($liveSearch) ? $liveSearch : (isset($__liveSearch) ? $__liveSearch : $dcfg['liveSearch']); - - // &ajaxMax [int] - The maximum number of results to show for the ajaxsearch - // Default: 6 - $cfg['ajaxMax'] = isset($ajaxMax) ? $ajaxMax : (isset($__ajaxMax) ? $__ajaxMax : $dcfg['ajaxMax']); - - // &moreResultsPage [int] - // The document id of the page you want the more results link to point to - // Default: 0 - $cfg['moreResultsPage'] = isset($moreResultsPage) ? $moreResultsPage : (isset($__moreResultsPage) ? $__moreResultsPage : $dcfg['moreResultsPage']); - - // &opacity - set the opacity of the div ajaxSearch_output - // Should be a float value: [ 0. < float <= 1. ] - // Default: 1. - $cfg['opacity'] = isset($opacity) ? $opacity : (isset($__opacity) ? $__opacity : $dcfg['opacity']); - - // &tplAjaxResults - Chunk to style the ajax output results outer - // Default: '' - empty string - $cfg['tplAjaxResults'] = isset($tplAjaxResults) ? $tplAjaxResults : (isset($__tplAjaxResults) ? $__tplAjaxResults : $dcfg['tplAjaxResults']); - - // &tplAjaxGrpResult - Chunk to style each ajax output group result outer - // Default: '' - empty string - $cfg['tplAjaxGrpResult'] = isset($tplAjaxGrpResult) ? $tplAjaxGrpResult : (isset($__tplAjaxGrpResult) ? $__tplAjaxGrpResult : $dcfg['tplAjaxGrpResult']); - - // &tplAjaxResult - Chunk to style each ajax output result - // Default: '' - empty string - $cfg['tplAjaxResult'] = isset($tplAjaxResult) ? $tplAjaxResult : (isset($__tplAjaxResult) ? $__tplAjaxResult : $dcfg['tplAjaxResult']); - - // &jscript ['jquery'|'mootools2'|'mootools'] - // Set this to jquery if you would like use the jquery library - // set mootools2 to use the version 1.2 of mootools (limited to JS functions used by AS) - // Default: 'mootools' - use the version 1.11 of mootools provided with MODx - $cfg['jscript'] = isset($jscript) ? $jscript : (isset($__jscript) ? $__jscript : $dcfg['jscript']); - - // &addJscript [1 | 0] - // Set this to 1 if you would like to include or not the mootool/jquery library in the header of your pages automatically - // Default: 1 - $cfg['addJscript'] = isset($addJscript) ? $addJscript : (isset($__addJscript) ? $__addJscript : $dcfg['addJscript']); - - // &jsMooTools - Location of the mootools javascript library (current version of MODx) - // Default: MGR_DIR.'media/script/mootools/mootools.js' - $cfg['jsMooTools'] = isset($jsMooTools) ? $jsMooTools : (isset($__jsMooTools) ? $__jsMooTools : $dcfg['jsMooTools']); - - // &jsMooTools2 - Location of an alternative mootools javascript library - // Default: AS_SPATH . 'js/mootools1.2/mootools.js' - contains only the required functions for AS - // to use an another library, use this parameter and change the ajaxSearch/js/ajaxSearch1/ajaxSearch-mootools2.js file - $cfg['jsMooTools2'] = isset($jsMooTools2) ? $jsMooTools2 : (isset($__jsMooTools2) ? $__jsMooTools2 : $dcfg['jsMooTools2']); - - // &jsQuery - Location of the jquery javascript library - // Default: AS_SPATH . 'js/jquery/jquery.js' - $cfg['jsJquery'] = isset($jsJquery) ? $jsJquery : (isset($__jsJquery) ? $__jsJquery : $dcfg['jsJquery']); -} - -// ========================================================== End of config -include_once AS_PATH . "classes/ajaxSearch.class.inc.php"; -if (class_exists('AjaxSearch')) { - $as = new AjaxSearch(); - $output = $as->run($tstart, $dcfg, $cfg); -} else { - $output = "

    error: AjaxSearch class not found

    "; -} -$elapsedTime = $modx->getMicroTime() - $tstart; -$etime = sprintf("%.4fs",$elapsedTime); -//$f=fopen('test.txt','a+');fwrite($f,"etime=".$etime."\n\n"); -return $output; \ No newline at end of file + +return require MODX_BASE_PATH.'assets/snippets/ajaxSearch/snippet.ajaxSearch.php'; \ No newline at end of file From a8604ef8f6f2b1822729245382021f54cdf963ac Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:12:59 +0300 Subject: [PATCH 225/530] Refactor #10071 breadcrumbs --- .../breadcrumbs/snippet.breadcrumbs.php | 302 +++++++++++ install/assets/snippets/breadcrumbs.tpl | 477 +----------------- 2 files changed, 303 insertions(+), 476 deletions(-) create mode 100644 assets/snippets/breadcrumbs/snippet.breadcrumbs.php diff --git a/assets/snippets/breadcrumbs/snippet.breadcrumbs.php b/assets/snippets/breadcrumbs/snippet.breadcrumbs.php new file mode 100644 index 0000000000..0a2046d1dc --- /dev/null +++ b/assets/snippets/breadcrumbs/snippet.breadcrumbs.php @@ -0,0 +1,302 @@ +config['site_start']; +( isset($homeCrumbTitle) ) ? $homeCrumbTitle : $homeCrumbTitle = ''; +( isset($homeCrumbDescription) ) ? $homeCrumbDescription : $homeCrumbDescription = ''; +( isset($showCrumbsAtHome) ) ? $showCrumbsAtHome : $showCrumbsAtHome = 0; +( isset($hideOn) ) ? $hideOn : $hideOn = ''; +( isset($hideUnder) ) ? $hideUnder : $hideUnder = ''; +( isset($stopIds) ) ? $stopIds : $stopIds = ''; +( isset($ignoreIds) ) ? $ignoreids : $ignoreids = ''; +( isset($crumbSeparator) ) ? $separator = $crumbSeparator : $separator = ' » '; +( isset($separator) ) ? $separator : $separator = ' » '; +$templates = array( + 'defaultString' => array( + 'crumb' => '[+crumb+]', + 'separator' => ' '.$separator.' ', + 'crumbContainer' => '[+crumbs+]', + 'lastCrumbWrapper' => '[+lastCrumbSpanA+]', + 'firstCrumbWrapper' => '[+firstCrumbSpanA+]' + ), + 'defaultList' => array( + 'crumb' => '
  • [+crumb+]
    • ', + 'separator' => '', + 'crumbContainer' => '
      [+crumbs+]
    ', + 'lastCrumbWrapper' => '[+lastCrumbSpanA+]', + 'firstCrumbWrapper' => '[+firstCrumbSpanA+]' + ), +); +// Return blank if necessary: on home page +if ( !$showCrumbsAtHome && $homeId == $modx->documentObject['id'] ) +{ + return ''; +} +// Return blank if necessary: specified pages +if ( $hideOn || $hideUnder ) +{ + // Create array of hide pages + $hideOn = str_replace(' ','',$hideOn); + $hideOn = explode(',',$hideOn); + + // Get more hide pages based on parents if needed + if ( $hideUnder ) + { + $hiddenKids = array(); + // Get child pages to hide + $hideKidsQuery = $modx->db->select('id',$modx->getFullTableName("site_content"),"parent IN ($hideUnder)"); + while ( $hideKid = $modx->db->getRow($hideKidsQuery) ) + { + $hiddenKids[] = $hideKid['id']; + } + // Merge with hideOn pages + $hideOn = array_merge($hideOn,$hiddenKids); + } + + if ( in_array($modx->documentObject['id'],$hideOn) ) + { + return ''; + } + +} +// Initialize ------------------------------------------------------------------ +// Put certain parameters in arrays +$stopIds = str_replace(' ','',$stopIds); +$stopIds = explode(',',$stopIds); +$linkTextField = str_replace(' ','',$linkTextField); +$linkTextField = explode(',',$linkTextField); +$linkDescField = str_replace(' ','',$linkDescField); +$linkDescField = explode(',',$linkDescField); +$ignoreIds = str_replace(' ','',$ignoreIds); +$ignoreIds = explode(',',$ignoreIds); + +/* $crumbs + * Crumb elements are: id, parent, pagetitle, longtitle, menutitle, description, + * published, hidemenu + */ +$crumbs = array(); +$parent = $modx->documentObject['parent']; +$output = ''; +$maxCrumbs += ($showCurrentCrumb) ? 1 : 0; + +// Replace || in snippet parameters that accept them with = +$crumbGap = str_replace('||','=',$crumbGap); + +// Curent crumb ---------------------------------------------------------------- + +// Decide if current page is to be a crumb +if ( $showCurrentCrumb ) +{ + $crumbs[] = array( + 'id' => $modx->documentObject['id'], + 'parent' => $modx->documentObject['parent'], + 'pagetitle' => $modx->documentObject['pagetitle'], + 'longtitle' => $modx->documentObject['longtitle'], + 'menutitle' => $modx->documentObject['menutitle'], + 'description' => $modx->documentObject['description']); +} + +// Intermediate crumbs --------------------------------------------------------- + + +// Iterate through parents till we hit root or a reason to stop +$loopSafety = 0; +while ( $parent && $parent!=$modx->config['site_start'] && $loopSafety < 1000 ) +{ + // Get next crumb + $tempCrumb = $modx->getPageInfo($parent,0,"id,parent,pagetitle,longtitle,menutitle,description,published,hidemenu"); + + // Check for include conditions & add to crumbs + if ( + $tempCrumb['published'] && + ( !$tempCrumb['hidemenu'] || !$respectHidemenu ) && + !in_array($tempCrumb['id'],$ignoreIds) + ) + { + // Add crumb + $crumbs[] = array( + 'id' => $tempCrumb['id'], + 'parent' => $tempCrumb['parent'], + 'pagetitle' => $tempCrumb['pagetitle'], + 'longtitle' => $tempCrumb['longtitle'], + 'menutitle' => $tempCrumb['menutitle'], + 'description' => $tempCrumb['description']); + } + + // Check stop conditions + if ( + in_array($tempCrumb['id'],$stopIds) || // Is one of the stop IDs + !$tempCrumb['parent'] || // At root + ( !$tempCrumb['published'] && !$pathThruUnPub ) // Unpublished + ) + { + // Halt making crumbs + break; + } + + // Reset parent + $parent = $tempCrumb['parent']; + + // Increment loop safety + $loopSafety++; +} + +// Home crumb ------------------------------------------------------------------ + +if ( $showHomeCrumb && $homeId != $modx->documentObject['id'] && $homeCrumb = $modx->getPageInfo($homeId,0,"id,parent,pagetitle,longtitle,menutitle,description,published,hidemenu") ) +{ + $crumbs[] = array( + 'id' => $homeCrumb['id'], + 'parent' => $homeCrumb['parent'], + 'pagetitle' => $homeCrumb['pagetitle'], + 'longtitle' => $homeCrumb['longtitle'], + 'menutitle' => $homeCrumb['menutitle'], + 'description' => $homeCrumb['description']); +} + + +// Process each crumb ---------------------------------------------------------- +$pretemplateCrumbs = array(); + +foreach ( $crumbs as $c ) +{ + + // Skip if we've exceeded our crumb limit but we're waiting to get to home + if ( count($pretemplateCrumbs) > $maxCrumbs && $c['id'] != $homeId ) + { + continue; + } + + $text = ''; + $title = ''; + $pretemplateCrumb = ''; + + // Determine appropriate span/link text: home link specified + if ( $c['id'] == $homeId && $homeCrumbTitle ) + { + $text = $homeCrumbTitle; + } + else + // Determine appropriate span/link text: home link not specified + { + for ($i = 0; !$text && $i < count($linkTextField); $i++) + { + if ( $c[$linkTextField[$i]] ) + { + $text = $c[$linkTextField[$i]]; + } + } + } + + // Determine link/span class(es) + if ( $c['id'] == $homeId ) + { + $crumbClass = $stylePrefix.'homeCrumb'; + } + else if ( $modx->documentObject['id'] == $c['id'] ) + { + $crumbClass = $stylePrefix.'currentCrumb'; + } + else + { + $crumbClass = $stylePrefix.'crumb'; + } + + // Make link + if ( + ( $c['id'] != $modx->documentObject['id'] && $showCrumbsAsLinks ) || + ( $c['id'] == $modx->documentObject['id'] && $currentAsLink ) + ) + { + // Determine appropriate title for link: home link specified + if ( $c['id'] == $homeId && $homeCrumbDescription ) + { + $title = htmlspecialchars($homeCrumbDescription); + } + else + // Determine appropriate title for link: home link not specified + { + for ($i = 0; !$title && $i < count($linkDescField); $i++) + { + if ( $c[$linkDescField[$i]] ) + { + $title = htmlspecialchars($c[$linkDescField[$i]]); + } + } + } + + + $pretemplateCrumb .= ''.$text.''; + } + else + // Make a span instead of a link + { + $pretemplateCrumb .= ''.$text.''; + } + + // Add crumb to pretemplate crumb array + $pretemplateCrumbs[] = $pretemplateCrumb; + + // If we have hit the crumb limit + if ( count($pretemplateCrumbs) == $maxCrumbs ) + { + if ( count($crumbs) > ($maxCrumbs + (($showHomeCrumb) ? 1 : 0)) ) + { + // Add gap + $pretemplateCrumbs[] = ''.$crumbGap.''; + } + + // Stop here if we're not looking for the home crumb + if ( !$showHomeCrumb ) + { + break; + } + } +} + +// Put in correct order for output +$pretemplateCrumbs = array_reverse($pretemplateCrumbs); + +// Wrap first/last spans +$pretemplateCrumbs[0] = str_replace( + array('[+firstCrumbClass+]','[+firstCrumbSpanA+]'), + array($stylePrefix.'firstCrumb',$pretemplateCrumbs[0]), + $templates[$templateSet]['firstCrumbWrapper'] +); +$pretemplateCrumbs[(count($pretemplateCrumbs)-1)] = str_replace( + array('[+lastCrumbClass+]','[+lastCrumbSpanA+]'), + array($stylePrefix.'lastCrumb',$pretemplateCrumbs[(count($pretemplateCrumbs)-1)]), + $templates[$templateSet]['lastCrumbWrapper'] +); + +// Insert crumbs into crumb template +$processedCrumbs = array(); +foreach ( $pretemplateCrumbs as $pc ) +{ + $processedCrumbs[] = str_replace('[+crumb+]',$pc,$templates[$templateSet]['crumb']); +} + +// Combine crumbs together into one string with separator +$processedCrumbs = implode($templates[$templateSet]['separator'],$processedCrumbs); + +// Put crumbs into crumb container template +$container = str_replace( + array('[+crumbBoxClass+]','[+crumbs+]'), + array($stylePrefix.'crumbBox',$processedCrumbs), + $templates[$templateSet]['crumbContainer'] + ); + +// Return crumbs +return $container; +?> \ No newline at end of file diff --git a/install/assets/snippets/breadcrumbs.tpl b/install/assets/snippets/breadcrumbs.tpl index 4c7478842a..db388e402f 100644 --- a/install/assets/snippets/breadcrumbs.tpl +++ b/install/assets/snippets/breadcrumbs.tpl @@ -12,479 +12,4 @@ * @internal @installset base, sample */ -/* - * This snippet shows the path through the various levels of site structure. It - * is NOT necessarily the path the user took to arrive at a given page. - */ - -/* ----------------------------------------------------------------------------- - * CONFIGURATION - * ----------------------------------------------------------------------------- - * This section contains brief explanations of the available parameters. - */ - -/* General setup - * ----------------------------------------------------------------------------- - */ - -/* $maxCrumbs [ integer ] - * Max number of elemetns to have in a breadcrumb path. The default 100 is an - * arbitrarily high number that will essentially include everything. If you were - * to set it to 2, and you were 5 levels deep, it would appear like: - * HOME > ... > Level 3 > Level 4 > CURRENT PAGE - * It should be noted that the "home" link, and the current page do not count as - * they are managed by their own configuration settings. - */ -( isset($maxCrumbs) ) ? $maxCrumbs : $maxCrumbs = 100; - -/* $pathThruUnPub [ 1 | 0 ] - * When your path includes an unpublished folder, setting this to 1 (true) will - * show all documents in path EXCEPT the unpublished. When set to 0 (false), the - * path will not go "through" that unpublished folder and will stop there. - */ -( isset($pathThruUnPub) ) ? $pathThruUnPub : $pathThruUnPub = 1; - -/* $respectHidemenu [ 0 | 1 ] - * Setting this to 1 (true) will respect the hidemenu setting of the document - * and not include it in trail. - */ -( isset($respectHidemenu) ) ? (int)$respectHidemenu : $respectHidemenu = 1; - -/* $showCurrentCrumb [ 1 | 0 ] - * Include the current page at the end of the trail. On by default. - */ -( isset($showCurrentCrumb) ) ? $showCurrentCrumb : $showCurrentCrumb = 1; - -/* $currentAsLink [ 1 | 0 ] - * If the current page is included, this parameter will show it as a link (1) or - * just plain text (0). - */ -( $currentAsLink ) ? $currentAsLink : $currentAsLink = 0; - -/* $linkTextField [ string ] - * Prioritized list of fields to use as link text. Options are: pagetitle, - * longtitle, description, menutitle. The first of these fields that has a value - * will be the title. - */ -( isset($linkTextField) ) ? $linkTextField : $linkTextField = 'menutitle,pagetitle,longtitle'; - -/* $linkDescField [ string ] - * Prioritized list of fields to use as link title text. Options are: pagetitle, - * longtitle, description, menutitle. The first of these fields that has a value - * will be the title. - */ -( isset($linkDescField) ) ? $linkDescField : $linkDescField = 'description,longtitle,pagetitle,menutitle'; - -/* $showCrumbsAsLinks [ 1 | 0 ] - * If for some reason you want breadcrumbs to be text and not links, set to 0 - * (false). - */ -( isset($showCrumbsAsLinks) ) ? $showCrumbsAsLinks : $showCrumbsAsLinks = 1; - -/* $templateSet [ string ] - * The set of templates you'd like to use. (Templates are defined below.) It - * will default to defaultString which replicates the output of previous - * versions. - */ -( isset($templateSet) ) ? $templateSet : $templateSet = 'defaultString'; - -/* $crumbGap [ string ] - * String to be shown to represent gap if there are more crumbs in trail than - * can be shown. Note: if you would like to use an image, the entire image tag - * must be provided. When making a snippet call, you cannot use "=", so use "||" - * instead and it will be converted for you. - */ -( isset($crumbGap) ) ? $crumbGap : $crumbGap = '...'; - -/* $stylePrefix [ string ] - * Breadcrumbs will add style classes to various parts of the trail. To avoid - * class name conflicts, you can determine your own prefix. The following - * classes will be attached: - * crumbBox: Span that surrounds all crumb output - * hideCrumb: Span that surrounds the "..." if there are more crumbs than will - * be shown - * currentCrumb: Span or A tag surrounding the current crumb - * firstCrumb: Span that will be applied to first crumb, whether it is "home" or - * not - * lastCrumb: Span surrounding last crumb, whether it is the current page or - * not - * crumb: Class given to each A tag surrounding the intermediate crumbs (not - * "home", "current", or "hide") - * homeCrumb: Class given to the home crumb - */ -( isset($stylePrefix) ) ? $stylePrefix : $stylePrefix = 'B_'; - - - -/* Home link parameters - * ----------------------------------------------------------------------------- - * The home link is unique. It is a link that can be placed at the head of the - * breadcrumb trail, even if it is not truly in the hierarchy. - */ - -/* $showHomeCrumb [ 1 | 0 ] - * This toggles the "home" crumb to be added to the beginning of your trail. - */ -( isset($showHomeCrumb) ) ? $showHomeCrumb : $showHomeCrumb = 1; - -/* $homeId [ integer ] - * Usually the page designated as "site start" in MODx configuration is - * considered the home page. But if you would like to use some other document, - * you may explicitly define it. - */ -( isset($homeId) ) ? (int)$homeId : $homeId = $modx->config['site_start']; - -/* $homeCrumbTitle [ string ] - * If you'd like to use something other than the menutitle (or pagetitle) for - * the home link. - */ -( isset($homeCrumbTitle) ) ? $homeCrumbTitle : $homeCrumbTitle = ''; - -/* $homeCrumbDescription [ string ] - * If you'd like to use a custom description (link title) on the home link. If - * left blank, the title will follow the title order set in $titleField. - */ -( isset($homeCrumbDescription) ) ? $homeCrumbDescription : $homeCrumbDescription = ''; - - -/* Custom behaviors - * ----------------------------------------------------------------------------- - * The following parameters will alter the behavior of the Breadcrumbs based on - * the page it is on. - */ - -/* $showCrumbsAtHome [ 1 | 0 ] - * You can turn off Breadcrumbs all together on the home page by setting this to - * 1 (true); - */ -( isset($showCrumbsAtHome) ) ? $showCrumbsAtHome : $showCrumbsAtHome = 0; - -/* $hideOn [ string ] - * Comma separated list of documents you don't want Breadcrumbs on at all. If - * you have a LOT of pages like this, you might try $hideUnder or use another - * template. This parameter is best for those rare odd balls - otherwise it will - * become a pain to manage. - */ -( isset($hideOn) ) ? $hideOn : $hideOn = ''; - -/* $hideUnder [ string ] - * Comma separated list of parent documents, whose CHILDREN you don't want - * Breadcrumbs to appear on at all. This enables you to hide Breadcrumbs on a - * whole folders worth of documents by specifying the parent only. The PARENT - * will not have Breadcrumbs hidden however. If you wanted to hide the parent - * and the children, put the parent ID in hideUnder AND hideOn. - */ -( isset($hideUnder) ) ? $hideUnder : $hideUnder = ''; - -/* $stopIds [ string ] - * Comma separated list of document IDs that when reached, stops Breadcrumbs - * from going any further. This is useful in situations like where you have - * language branches, and you don't want the Breadcrumbs going past the "home" - * of the language you're in. - */ -( isset($stopIds) ) ? $stopIds : $stopIds = ''; - -/* $ignoreIds [ string ] - * Comma separated list of document IDs to explicitly ignore. - */ -( isset($ignoreIds) ) ? $ignoreids : $ignoreids = ''; - -/* $crumbSeparator [ string ] - * The set of templates you'd like to use for crumbSeparator. - */ -( isset($crumbSeparator) ) ? $crumbSeparator : $crumbSeparator = '»'; - -/* Templates - * ----------------------------------------------------------------------------- - * In an effort to keep the MODx chunks manager from getting mired down in lots - * of templates, Breadcrumbs templates are included here. Two sets are provided - * prefixed with defaultString, and defaultList. You can create as many more as - * you like, each set with it's own prefix - */ -$templates = array( - 'defaultString' => array( - 'crumb' => '[+crumb+]', - 'separator' => ' '.$crumbSeparator.' ', - 'crumbContainer' => '[+crumbs+]', - 'lastCrumbWrapper' => '[+lastCrumbSpanA+]', - 'firstCrumbWrapper' => '[+firstCrumbSpanA+]' - ), - 'defaultList' => array( - 'crumb' => '
  • [+crumb+]
    • ', - 'separator' => '', - 'crumbContainer' => '
      [+crumbs+]
    ', - 'lastCrumbWrapper' => '[+lastCrumbSpanA+]', - 'firstCrumbWrapper' => '[+firstCrumbSpanA+]' - ), -); - - -/* ----------------------------------------------------------------------------- - * END CONFIGURATION - * ----------------------------------------------------------------------------- - */ - -// Return blank if necessary: on home page -if ( !$showCrumbsAtHome && $homeId == $modx->documentObject['id'] ) -{ - return ''; -} -// Return blank if necessary: specified pages -if ( $hideOn || $hideUnder ) -{ - // Create array of hide pages - $hideOn = str_replace(' ','',$hideOn); - $hideOn = explode(',',$hideOn); - - // Get more hide pages based on parents if needed - if ( $hideUnder ) - { - $hiddenKids = array(); - // Get child pages to hide - $hideKidsQuery = $modx->db->select('id',$modx->getFullTableName("site_content"),"parent IN ($hideUnder)"); - while ( $hideKid = $modx->db->getRow($hideKidsQuery) ) - { - $hiddenKids[] = $hideKid['id']; - } - // Merge with hideOn pages - $hideOn = array_merge($hideOn,$hiddenKids); - } - - if ( in_array($modx->documentObject['id'],$hideOn) ) - { - return ''; - } - -} - - -// Initialize ------------------------------------------------------------------ - -// Put certain parameters in arrays -$stopIds = str_replace(' ','',$stopIds); -$stopIds = explode(',',$stopIds); -$linkTextField = str_replace(' ','',$linkTextField); -$linkTextField = explode(',',$linkTextField); -$linkDescField = str_replace(' ','',$linkDescField); -$linkDescField = explode(',',$linkDescField); -$ignoreIds = str_replace(' ','',$ignoreIds); -$ignoreIds = explode(',',$ignoreIds); - -/* $crumbs - * Crumb elements are: id, parent, pagetitle, longtitle, menutitle, description, - * published, hidemenu - */ -$crumbs = array(); -$parent = $modx->documentObject['parent']; -$output = ''; -$maxCrumbs += ($showCurrentCrumb) ? 1 : 0; - -// Replace || in snippet parameters that accept them with = -$crumbGap = str_replace('||','=',$crumbGap); - -// Curent crumb ---------------------------------------------------------------- - -// Decide if current page is to be a crumb -if ( $showCurrentCrumb ) -{ - $crumbs[] = array( - 'id' => $modx->documentObject['id'], - 'parent' => $modx->documentObject['parent'], - 'pagetitle' => $modx->documentObject['pagetitle'], - 'longtitle' => $modx->documentObject['longtitle'], - 'menutitle' => $modx->documentObject['menutitle'], - 'description' => $modx->documentObject['description']); -} - -// Intermediate crumbs --------------------------------------------------------- - - -// Iterate through parents till we hit root or a reason to stop -$loopSafety = 0; -while ( $parent && $parent!=$modx->config['site_start'] && $loopSafety < 1000 ) -{ - // Get next crumb - $tempCrumb = $modx->getPageInfo($parent,0,"id,parent,pagetitle,longtitle,menutitle,description,published,hidemenu"); - - // Check for include conditions & add to crumbs - if ( - $tempCrumb['published'] && - ( !$tempCrumb['hidemenu'] || !$respectHidemenu ) && - !in_array($tempCrumb['id'],$ignoreIds) - ) - { - // Add crumb - $crumbs[] = array( - 'id' => $tempCrumb['id'], - 'parent' => $tempCrumb['parent'], - 'pagetitle' => $tempCrumb['pagetitle'], - 'longtitle' => $tempCrumb['longtitle'], - 'menutitle' => $tempCrumb['menutitle'], - 'description' => $tempCrumb['description']); - } - - // Check stop conditions - if ( - in_array($tempCrumb['id'],$stopIds) || // Is one of the stop IDs - !$tempCrumb['parent'] || // At root - ( !$tempCrumb['published'] && !$pathThruUnPub ) // Unpublished - ) - { - // Halt making crumbs - break; - } - - // Reset parent - $parent = $tempCrumb['parent']; - - // Increment loop safety - $loopSafety++; -} - -// Home crumb ------------------------------------------------------------------ - -if ( $showHomeCrumb && $homeId != $modx->documentObject['id'] && $homeCrumb = $modx->getPageInfo($homeId,0,"id,parent,pagetitle,longtitle,menutitle,description,published,hidemenu") ) -{ - $crumbs[] = array( - 'id' => $homeCrumb['id'], - 'parent' => $homeCrumb['parent'], - 'pagetitle' => $homeCrumb['pagetitle'], - 'longtitle' => $homeCrumb['longtitle'], - 'menutitle' => $homeCrumb['menutitle'], - 'description' => $homeCrumb['description']); -} - - -// Process each crumb ---------------------------------------------------------- -$pretemplateCrumbs = array(); - -foreach ( $crumbs as $c ) -{ - - // Skip if we've exceeded our crumb limit but we're waiting to get to home - if ( count($pretemplateCrumbs) > $maxCrumbs && $c['id'] != $homeId ) - { - continue; - } - - $text = ''; - $title = ''; - $pretemplateCrumb = ''; - - // Determine appropriate span/link text: home link specified - if ( $c['id'] == $homeId && $homeCrumbTitle ) - { - $text = $homeCrumbTitle; - } - else - // Determine appropriate span/link text: home link not specified - { - for ($i = 0; !$text && $i < count($linkTextField); $i++) - { - if ( $c[$linkTextField[$i]] ) - { - $text = $c[$linkTextField[$i]]; - } - } - } - - // Determine link/span class(es) - if ( $c['id'] == $homeId ) - { - $crumbClass = $stylePrefix.'homeCrumb'; - } - else if ( $modx->documentObject['id'] == $c['id'] ) - { - $crumbClass = $stylePrefix.'currentCrumb'; - } - else - { - $crumbClass = $stylePrefix.'crumb'; - } - - // Make link - if ( - ( $c['id'] != $modx->documentObject['id'] && $showCrumbsAsLinks ) || - ( $c['id'] == $modx->documentObject['id'] && $currentAsLink ) - ) - { - // Determine appropriate title for link: home link specified - if ( $c['id'] == $homeId && $homeCrumbDescription ) - { - $title = htmlspecialchars($homeCrumbDescription); - } - else - // Determine appropriate title for link: home link not specified - { - for ($i = 0; !$title && $i < count($linkDescField); $i++) - { - if ( $c[$linkDescField[$i]] ) - { - $title = htmlspecialchars($c[$linkDescField[$i]]); - } - } - } - - - $pretemplateCrumb .= ''.$text.''; - } - else - // Make a span instead of a link - { - $pretemplateCrumb .= ''.$text.''; - } - - // Add crumb to pretemplate crumb array - $pretemplateCrumbs[] = $pretemplateCrumb; - - // If we have hit the crumb limit - if ( count($pretemplateCrumbs) == $maxCrumbs ) - { - if ( count($crumbs) > ($maxCrumbs + (($showHomeCrumb) ? 1 : 0)) ) - { - // Add gap - $pretemplateCrumbs[] = ''.$crumbGap.''; - } - - // Stop here if we're not looking for the home crumb - if ( !$showHomeCrumb ) - { - break; - } - } -} - -// Put in correct order for output -$pretemplateCrumbs = array_reverse($pretemplateCrumbs); - -// Wrap first/last spans -$pretemplateCrumbs[0] = str_replace( - array('[+firstCrumbClass+]','[+firstCrumbSpanA+]'), - array($stylePrefix.'firstCrumb',$pretemplateCrumbs[0]), - $templates[$templateSet]['firstCrumbWrapper'] -); -$pretemplateCrumbs[(count($pretemplateCrumbs)-1)] = str_replace( - array('[+lastCrumbClass+]','[+lastCrumbSpanA+]'), - array($stylePrefix.'lastCrumb',$pretemplateCrumbs[(count($pretemplateCrumbs)-1)]), - $templates[$templateSet]['lastCrumbWrapper'] -); - -// Insert crumbs into crumb template -$processedCrumbs = array(); -foreach ( $pretemplateCrumbs as $pc ) -{ - $processedCrumbs[] = str_replace('[+crumb+]',$pc,$templates[$templateSet]['crumb']); -} - -// Combine crumbs together into one string with separator -$processedCrumbs = implode($templates[$templateSet]['separator'],$processedCrumbs); - -// Put crumbs into crumb container template -$container = str_replace( - array('[+crumbBoxClass+]','[+crumbs+]'), - array($stylePrefix.'crumbBox',$processedCrumbs), - $templates[$templateSet]['crumbContainer'] - ); - -// Return crumbs -return $container; \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/breadcrumbs/snippet.breadcrumbs.php'; \ No newline at end of file From e27106662d35796ce96d21aac55ba9f608b72fef Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:18:02 +0300 Subject: [PATCH 226/530] Refactor #10071 Ditto --- assets/snippets/ditto/snippet.ditto.php | 1091 +++++++++++++++++++++++ install/assets/snippets/ditto.tpl | 1090 +--------------------- 2 files changed, 1097 insertions(+), 1084 deletions(-) create mode 100644 assets/snippets/ditto/snippet.ditto.php diff --git a/assets/snippets/ditto/snippet.ditto.php b/assets/snippets/ditto/snippet.ditto.php new file mode 100644 index 0000000000..728a5c44bb --- /dev/null +++ b/assets/snippets/ditto/snippet.ditto.php @@ -0,0 +1,1091 @@ +config['base_path'].$ditto_base : $modx->config['base_path']."assets/snippets/ditto/"; +/* + Param: ditto_base + + Purpose: + Location of Ditto files + + Options: + Any valid folder location containing the Ditto source code with a trailing slash + + Default: + [(base_path)]assets/snippets/ditto/ +*/ +$dittoID = (!isset($id)) ? "" : $id."_"; +$GLOBALS["dittoID"] = $dittoID; +/* + Param: id + + Purpose: + Unique ID for this Ditto instance for connection with other scripts (like Reflect) and unique URL parameters + + Options: + Any combination of characters a-z, underscores, and numbers 0-9 + + Note: + This is case sensitive + + Default: + "" - blank +*/ +$language = (isset($language))? $language : $modx->config['manager_language']; +if (!file_exists($ditto_base."lang/".$language.".inc.php")) { + $language ="english"; +} +/* + Param: language + + Purpose: + language for defaults, debug, and error messages + + Options: + Any language name with a corresponding file in the &ditto_base/lang folder + + Default: + "english" +*/ +$format = (isset($format)) ? strtolower($format) : "html" ; +/* + Param: format + + Purpose: + Output format to use + + Options: + - "html" + - "json" + - "xml" + - "atom" + - "rss" + + Default: + "html" +*/ +$config = (isset($config)) ? $config : "default"; +/* + Param: config + + Purpose: + Load a custom configuration + + Options: + "default" - default blank config file + CONFIG_NAME - Other configs installed in the configs folder or in any folder within the MODx base path via @FILE + + Default: + "default" + + Related: + - +*/ +$debug = isset($debug)? $debug : 0; +/* + Param: debug + + Purpose: + Output debugging information + + Options: + 0 - off + 1 - on + + Default: + 0 - off + + Related: + - +*/ +$phx = (isset($phx))? $phx : 1; +/* + Param: phx + + Purpose: + Use PHx formatting + + Options: + 0 - off + 1 - on + + Default: + 1 - on +*/ +$extenders = isset($extenders) ? explode(",",$extenders) : array(); +/* + Param: extenders + + Purpose: + Load an extender which adds functionality to Ditto + + Options: + Any extender in the extenders folder or in any folder within the MODx base path via @FILE + + Default: + [NULL] + + Related: + - +*/ + // Variable: extenders + // Array that can be added to by configs or formats to load that extender + +$placeholders = array(); + // Variable: placeholders + // Initialize custom placeholders array for configs or extenders to add to + +$filters = array("custom"=>array(),"parsed"=>array()); + // Variable: filters + // Holds both the custom filters array for configs or extenders to add to + // and the parsed filters array. To add to this array, use the following format + // (code) + // $filters["parsed"][] = array("name" => array("source"=>$source,"value"=>$value,"mode"=>$mode)); + // $filters["custom"][] = array("source","callback_function"); + +$orderBy = array('parsed'=>array(),'custom'=>array(),'unparsed'=>$orderBy); + // Variable: orderBy + // An array that holds all criteria to sort the result set by. + // Note that using a custom sort will disable all other sorting. + // (code) + // $orderBy["parsed"][] = array("sortBy","sortDir"); + // $orderBy["custom"][] = array("sortBy","callback_function"); + +//---Includes-------------------------------------------------------- // + +$files = array ( + "base_language" => $ditto_base."lang/english.inc.php", + "language" => $ditto_base."lang/$language.inc.php", + "main_class" => $ditto_base."classes/ditto.class.inc.php", + "template_class" => $ditto_base."classes/template.class.inc.php", + "filter_class" => $ditto_base."classes/filter.class.inc.php", + "format" => $ditto_base."formats/$format.format.inc.php", + "config" => $ditto_base."configs/default.config.php", + "user_config" => (substr($config, 0, 5) != "@FILE") ? $ditto_base."configs/$config.config.php" : $modx->config['base_path'].trim(substr($config, 5)) +); + +if ($phx == 1) { + $files["prePHx_class"] = $ditto_base."classes/phx.pre.class.inc.php"; +} +if (isset($randomize)) { + $files["randomize_class"] = $ditto_base."classes/random.class.inc.php"; +} +if ($debug == 1) { + $files["modx_debug_class"] = $ditto_base."debug/modxDebugConsole.class.php"; + $files["debug_class"] = $ditto_base."classes/debug.class.inc.php"; + $files["debug_templates"] = $ditto_base."debug/debug.templates.php"; +} + +$files = array_unique($files); +foreach ($files as $filename => $filevalue) { + if (file_exists($filevalue) && strpos($filename,"class")) { + include_once($filevalue); + } else if (file_exists($filevalue)) { + include($filevalue); + } else if ($filename == "language") { + $modx->logEvent(1, 3, "Language file does not exist Please check: " . $filevalue, "Ditto " . $ditto_version); + return "Language file does not exist Please check: " . $filevalue; + } else { + $modx->logEvent(1, 3, $filevalue . " " . $_lang['file_does_not_exist'], "Ditto " . $ditto_version); + return $filevalue . " " . $_lang['file_does_not_exist']; + } +} + +//---Initiate Class-------------------------------------------------- // +if (class_exists('ditto')) { + $ditto = new ditto($dittoID,$format,$_lang,$dbg_templates); + // create a new Ditto instance in the specified format and language with the requested debug level +} else { + $modx->logEvent(1,3,$_lang['invalid_class'],"Ditto ".$ditto_version); + return $_lang['invalid_class']; +} + +//---Initiate Extenders---------------------------------------------- // +if (isset($tagData)) { + $extenders[] = "tagging"; +} +if(count($extenders) > 0) { + $extenders = array_unique($extenders); + foreach ($extenders as $extender) { + if(substr($extender, 0, 5) != "@FILE") { + $extender_path = $ditto_base."extenders/".$extender.".extender.inc.php"; + } else { + $extender_path = $modx->config['base_path'].trim(substr($extender, 5)); + } + + if (file_exists($extender_path)){ + include($extender_path); + } else { + $modx->logEvent(1, 3, $extender . " " . $_lang['extender_does_not_exist'], "Ditto ".$ditto_version); + return $extender . " " . $_lang['extender_does_not_exist']; + } + } +} + +//---Parameters------------------------------------------------------- /* +if (isset($startID)) {$parents = $startID;} +if (isset($summarize)) {$display = $summarize;} +if (isset($limit)) {$queryLimit = $limit;} +if (isset($sortBy) || isset($sortDir) || is_null($orderBy['unparsed'])) { + $sortDir = isset($sortDir) ? strtoupper($sortDir) : 'DESC'; + $sortBy = isset($sortBy) ? $sortBy : "createdon"; + $orderBy['parsed'][]=array($sortBy,$sortDir); +} + // Allow backwards compatibility + +$idType = isset($documents) ? "documents" : "parents"; + // Variable: idType + // type of IDs provided; can be either parents or documents + +$parents = isset($parents) ? $ditto->cleanIDs($parents) : $modx->documentIdentifier; + +/* + Param: parents + + Purpose: + IDs of containers for Ditto to retrieve their children to &depth depth + + Options: + Any valid MODx document marked as a container + + Default: + Current MODx Document + + Related: + - + - +*/ +$documents = isset($documents) ? $ditto->cleanIDs($documents) : false; +/* + Param: documents + + Purpose: + IDs of documents for Ditto to retrieve + + Options: + Any valid MODx document marked as a container + + Default: + None + + Related: + - +*/ + +$IDs = ($idType == "parents") ? $parents : $documents; + // Variable: IDs + // Internal variable which holds the set of IDs for Ditto to fetch + +$depth = isset($depth) ? $depth : 1; +/* + Param: depth + + Purpose: + Number of levels deep to retrieve documents + + Options: + Any number greater than or equal to 1 + 0 - infinite depth + + Default: + 1 + + Related: + - +*/ +$paginate = isset($paginate)? $paginate : 0; +/* + Param: paginate + + Purpose: + Paginate the results set into pages of &display length. + Use &total to limit the number of documents retreived. + + Options: + 0 - off + 1 - on + + Default: + 0 - off + + Related: + - + - + - +*/ +$dateSource = isset($dateSource) ? $dateSource : "createdon"; +/* + Param: dateSource + + Purpose: + Source of the [+date+] placeholder + + Options: + # - Any UNIX timestamp from MODx fields or TVs such as createdon, pub_date, or editedon + + Default: + "createdon" + + Related: + - +*/ +$dateFormat = isset($dateFormat)? $dateFormat : $_lang["dateFormat"]; +/* + Param: dateFormat + + Purpose: + Format the [+date+] placeholder in human readable form + + Options: + Any PHP valid strftime option + + Default: + [LANG] + + Related: + - +*/ +$display = isset($display) ? $display : "all"; +/* + Param: display + + Purpose: + Number of documents to display in the results + + Options: + # - Any number + "all" - All documents found + + Default: + "all" + + Related: + - + - +*/ +$total = isset($total) ? $total : "all"; +/* + Param: total + + Purpose: + Number of documents to retrieve + + Options: + # - Any number + "all" - All documents found + + Default: + "all" - All documents found + + Related: + - + - +*/ +$showPublishedOnly = isset($showPublishedOnly) ? $showPublishedOnly : 1; +/* + Param: showPublishedOnly + + Purpose: + Show only published documents + + Options: + 0 - show only unpublished documents + 1 - show both published and unpublished documents + + Default: + 1 - show both published and unpublished documents + + Related: + - + - + - + - +*/ +$showInMenuOnly = isset($showInMenuOnly) ? $showInMenuOnly : 0; +/* + Param: showInMenuOnly + + Purpose: + Show only documents visible in the menu + + Options: + 0 - show all documents + 1 - show only documents with the show in menu flag checked + + Default: + 0 - show all documents + + Related: + - + - + - +*/ +$hideFolders = isset($hideFolders)? $hideFolders : 0; +/* + Param: hideFolders + + Purpose: + Don't show folders in the returned results + + Options: + 0 - keep folders + 1 - remove folders + + Default: + 0 - keep folders + + Related: + - + - + - +*/ +$hidePrivate = isset($hidePrivate)? $hidePrivate : 1; +/* + Param: hidePrivate + + Purpose: + Don't show documents the guest or user does not have permission to see + + Options: + 0 - show private documents + 1 - hide private documents + + Default: + 1 - hide private documents + + Related: + - + - + - +*/ +$seeThruUnpub = (isset($seeThruUnpub))? $seeThruUnpub : 1 ; +/* + Param: seeThruUnpub + + Purpose: + See through unpublished folders to retrive their children + Used when depth is greater than 1 + + Options: + 0 - off + 1 - on + + Default: + 0 - off + + Related: + - + - + - +*/ +$queryLimit = (isset($queryLimit))? $queryLimit : 0; +/* + Param: queryLimit + + Purpose: + Number of documents to retrieve from the database, same as MySQL LIMIT + + Options: + # - Any number + 0 - automatic + + Default: + 0 - automatic + + Related: + - +*/ +$where = (isset($where))? $where : ""; +/* + Param: where + + Purpose: + Custom MySQL WHERE statement + + Options: + A valid MySQL WHERE statement using only document object items (no TVs) + + Default: + [NULL] + + Related: + - +*/ +$noResults = isset($noResults)? $ditto->getParam($noResults,"no_documents") : $_lang['no_documents']; +/* + Param: noResults + + Purpose: + Text or chunk to display when there are no results + + Options: + Any valid chunk name or text + + Default: + [LANG] +*/ +$removeChunk = isset($removeChunk) ? explode(",",$removeChunk) : false; +/* + Param: removeChunk + + Purpose: + Name of chunks to be stripped from content separated by commas + - Commonly used to remove comments + + Options: + Any valid chunkname that appears in the output + + Default: + [NULL] +*/ +$hiddenFields = isset($hiddenFields) ? explode(",",$hiddenFields) : false; +/* + Param: hiddenFields + + Purpose: + Allow Ditto to retrieve fields its template parser cannot handle such as nested placeholders and [*fields*] + + Options: + Any valid MODx fieldnames or TVs comma separated + + Default: + [NULL] +*/ +$offset = isset($start) ? $start : 0; +$start = (isset($_GET[$dittoID.'start'])) ? intval($_GET[$dittoID.'start']) : 0; +/* + Param: start + + Purpose: + Number of documents to skip in the results + + Options: + Any number + + Default: + 0 +*/ +$globalFilterDelimiter = isset($globalFilterDelimiter) ? $globalFilterDelimiter : "|"; +/* + Param: globalFilterDelimiter + + Purpose: + Filter delimiter used to separate filters in the filter string + + Options: + Any character not used in the filters + + Default: + "|" + + Related: + - + - + - +*/ + +$localFilterDelimiter = isset($localFilterDelimiter) ? $localFilterDelimiter : ","; +/* + Param: localFilterDelimiter + + Purpose: + Delimiter used to separate individual parameters within each filter string + + Options: + Any character not used in the filter itself + + Default: + "," + + Related: + - + - + - +*/ +$filters["custom"] = isset($cFilters) ? array_merge($filters["custom"],$cFilters) : $filters["custom"]; +$filters["parsed"] = isset($parsedFilters) ? array_merge($filters["parsed"],$parsedFilters) : $filters["parsed"]; + // handle 2.0.0 compatibility +$filter = (isset($filter) || ($filters["custom"] != false) || ($filters["parsed"] != false)) ? $ditto->parseFilters($filter,$filters["custom"],$filters["parsed"],$globalFilterDelimiter,$localFilterDelimiter) : false; +/* + Param: filter + + Purpose: + Removes items not meeting a critera. Thus, if pagetitle == joe then it will be removed. + Use in the format field,criteria,mode with the comma being the local delimiter + + *Mode* *Meaning* + + 1 - != + 2 - == + 3 - < + 4 - > + 5 - <= + 6 - >= + 7 - Text not in field value + 8 - Text in field value + 9 - case insenstive version of #7 + 10 - case insenstive version of #8 + 11 - checks leading character of the field + + @EVAL: + @EVAL in filters works the same as it does in MODx exect it can only be used + with basic filtering, not custom filtering (tagging, etc). Make sure that + you return the value you wish Ditto to filter by and that the code is valid PHP. + + Default: + [NULL] + + Related: + - + - + - +*/ +$keywords = (isset($keywords))? $keywords : 0; +/* + Param: keywords + + Purpose: + Enable fetching of associated keywords for each document + Can be used as [+keywords+] or as a tagData source + + Options: + 0 - off + 1 - on + + Default: + 0 - off +*/ + +$randomize = (isset($randomize))? $randomize : 0; +/* + Param: randomize + + Purpose: + Randomize the order of the output + + Options: + 0 - off + 1 - on + Any MODx field or TV for weighted random + + Default: + 0 - off +*/ +$save = (isset($save))? $save : 0; +/* + Param: save + + Purpose: + Saves the ditto object and results set to placeholders + for use by other snippets + + Options: + 0 - off; returns output + 1 - remaining; returns output + 2 - all; + 3 - all; returns ph only + + Default: + 0 - off; returns output +*/ +$templates = array( + "default" => "@CODE".$_lang['default_template'], + "base" => $tpl, + "alt" => $tplAlt, + "first" => $tplFirst, + "last" => $tplLast, + "current" => $tplCurrentDocument +); +/* + Param: tpl + + Purpose: + User defined chunk to format the documents + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Default: + [LANG] +*/ +/* + Param: tplAlt + + Purpose: + User defined chunk to format every other document + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Default: + &tpl +*/ +/* + Param: tplFirst + + Purpose: + User defined chunk to format the first document + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Default: + &tpl +*/ +/* + Param: tplLast + + Purpose: + User defined chunk to format the last document + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Default: + &tpl +*/ +/* + Param: tplCurrentDocument + + Purpose: + User defined chunk to format the current document + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Default: + &tpl +*/ +$orderBy = $ditto->parseOrderBy($orderBy,$randomize); +/* + Param: orderBy + + Purpose: + Sort the result set + + Options: + Any valid MySQL style orderBy statement + + Default: + createdon DESC +*/ +//-------------------------------------------------------------------- */ +$templates = $ditto->template->process($templates); + // parse the templates for TV's and store them for later use + +$ditto->setDisplayFields($ditto->template->fields,$hiddenFields); + // parse hidden fields + +$ditto->parseFields($placeholders,$seeThruUnpub,$dateSource,$randomize); + // parse the fields into the field array + +$documentIDs = $ditto->determineIDs($IDs, $idType, $ditto->fields["backend"]["tv"], $orderBy, $depth, $showPublishedOnly, $seeThruUnpub, $hideFolders, $hidePrivate, $showInMenuOnly, $where, $keywords, $dateSource, $queryLimit, $display, $filter,$paginate, $randomize); + // retrieves a list of document IDs that meet the criteria and populates the $resources array with them +$count = count($documentIDs); + // count the number of documents to be retrieved +$count = $count-$offset; + // handle the offset + +if ($count > 0) { + // if documents are returned continue with execution + + $total = ($total == "all") ? $count : min($total,$count); + // set total equal to count if all documents are to be included + + $display = ($display == "all") ? min($count,$total) : min($display,$total); + // allow show to use all option + + $stop = ($save != "1") ? min($total-$start,$display) : min($count,$total); + // set initial stop count + + if($paginate == 1) { + $paginateAlwaysShowLinks = isset($paginateAlwaysShowLinks)? $paginateAlwaysShowLinks : 0; + /* + Param: paginateAlwaysShowLinks + + Purpose: + Determine whether or not to always show previous next links + + Options: + 0 - off + 1 - on + + Default: + 0 - off + + Related: + - + - + */ + $paginateSplitterCharacter = isset($paginateSplitterCharacter)? $paginateSplitterCharacter : $_lang['button_splitter']; + /* + Param: paginateSplitterCharacter + + Purpose: + Splitter to use if always show is disabled + + Options: + Any valid character + + Default: + [LANG] + + Related: + - + - + */ + $tplPaginatePrevious = isset($tplPaginatePrevious)? $ditto->template->fetch($tplPaginatePrevious) : "[+lang:previous+]"; + /* + Param: tplPaginatePrevious + + Purpose: + Template for the previous link + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Placeholders: + url - URL for the previous link + lang:previous - value of 'prev' from the language file + + Related: + - + - + */ + $tplPaginateNext = isset($tplPaginateNext)? $ditto->template->fetch($tplPaginateNext) : "[+lang:next+]"; + /* + Param: tplPaginateNext + + Purpose: + Template for the next link + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Placeholders: + url - URL for the next link + lang:next - value of 'next' from the language file + + Related: + - + - + */ + $tplPaginateNextOff = isset($tplPaginateNextOff)? $ditto->template->fetch($tplPaginateNextOff) : "[+lang:next+]"; + /* + Param: tplPaginateNextOff + + Purpose: + Template for the inside of the next link + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Placeholders: + lang:next - value of 'next' from the language file + + Related: + - + - + */ + $tplPaginatePreviousOff = isset($tplPaginatePreviousOff)? $ditto->template->fetch($tplPaginatePreviousOff) : "[+lang:previous+]"; + /* + Param: tplPaginatePreviousOff + + Purpose: + Template for the previous link when it is off + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Placeholders: + lang:previous - value of 'prev' from the language file + + Related: + - + - + */ + $tplPaginatePage = isset($tplPaginatePage)? $ditto->template->fetch($tplPaginatePage) : "[+page+]"; + /* + Param: tplPaginatePage + + Purpose: + Template for the page link + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Placeholders: + url - url for the page + page - number of the page + + Related: + - + - + */ + $tplPaginateCurrentPage = isset($tplPaginateCurrentPage)? $ditto->template->fetch($tplPaginateCurrentPage) : "[+page+]"; + /* + Param: tplPaginateCurrentPage + + Purpose: + Template for the current page link + + Options: + - Any valid chunk name + - Code via @CODE + - File via @FILE + + Placeholders: + page - number of the page + + Related: + - + - + */ + + $ditto->paginate($start, $stop, $total, $display, $tplPaginateNext, $tplPaginatePrevious, $tplPaginateNextOff, $tplPaginatePreviousOff, $tplPaginatePage, $tplPaginateCurrentPage, $paginateAlwaysShowLinks, $paginateSplitterCharacter); + // generate the pagination placeholders + } + + $dbFields = $ditto->fields["display"]["db"]; + // get the database fields + $TVs = $ditto->fields["display"]["tv"]; + // get the TVs + + switch($orderBy['parsed'][0][1]) { + case "DESC": + $stop = ($ditto->prefetch === false) ? $stop + $start + $offset : $stop + $offset; + $start += $offset; + break; + case "ASC": + $start += $offset; + $stop += $start; + break; + } + + if ($ditto->prefetch !== false) { + $documentIDs = array_slice($documentIDs,$start,$stop); + // set the document IDs equal to the trimmed array + $dbFields = array_diff($dbFields,$ditto->prefetch["fields"]["db"]); + // calculate the difference between the database fields and those already prefetched + $dbFields[] = "id"; + // append id to the db fields array + $TVs = array_diff($TVs,$ditto->prefetch["fields"]["tv"]); + // calculate the difference between the tv fields and those already prefetched + $start = 0; + $stop = min($display,($queryLimit != 0) ? $queryLimit : $display,count($documentIDs)); + } else { + $queryLimit = ($queryLimit == 0) ? "" : $queryLimit; + } + + $resource = $ditto->getDocuments($documentIDs, $dbFields, $TVs, $orderBy, $showPublishedOnly, 0, $hidePrivate, $where, $queryLimit, $keywords, $randomize, $dateSource); + // retrieves documents + $output = $header; + // initialize the output variable and send the header + + if ($resource) { + if ($randomize != "0" && $randomize != "1") { + $resource = $ditto->weightedRandom($resource,$randomize,$stop); + // randomize the documents + } + + $resource = array_values($resource); + + for ($x=$start;$x<$stop;$x++) { + $template = $ditto->template->determine($templates,$x,0,$stop,$resource[$x]["id"]); + // choose the template to use and set the code of that template to the template variable + $renderedOutput = $ditto->render($resource[$x], $template, $removeChunk, $dateSource, $dateFormat, $placeholders,$phx,abs($start-$x),$stop); + // render the output using the correct template, in the correct format and language + $modx->setPlaceholder($dittoID."item[".abs($start-$x)."]",$renderedOutput); + /* + Placeholder: item[x] + + Content: + Individual items rendered output + */ + $output .= $renderedOutput; + // send the rendered output to the buffer + } + } else { + $output .= $ditto->noResults($noResults,$paginate); + // if no documents are found return a no documents found string + } + $output .= $footer; + // send the footer + + // --------------------------------------------------- + // Save Object + // --------------------------------------------------- + + if($save) { + $modx->setPlaceholder($dittoID."ditto_object", $ditto); + $modx->setPlaceholder($dittoID."ditto_resource", ($save == "1") ? array_slice($resource,$display) : $resource); + } +} else { + $output = $header.$ditto->noResults($noResults,$paginate).$footer; +} +// --------------------------------------------------- +// Handle Debugging +// --------------------------------------------------- + +if ($debug == 1) { + $ditto_params =& $modx->event_params; + if (!isset($_GET["ditto_".$dittoID."debug"])) { + $_SESSION["ditto_debug_$dittoID"] = $ditto->debug->render_popup($ditto, $ditto_base, $ditto_version, $ditto_params, $documentIDs, array("db"=>$dbFields,"tv"=>$TVs), $display, $templates, $orderBy, $start, $stop, $total,$filter,$resource); + } + if (isset($_GET["ditto_".$dittoID."debug"])) { + switch ($_GET["ditto_".$dittoID."debug"]) { + case "open" : + exit($_SESSION["ditto_debug_$dittoID"]); + break; + case "save" : + $ditto->debug->save($_SESSION["ditto_debug_$dittoID"],"ditto".strtolower($ditto_version)."_debug_doc".$modx->documentIdentifier.".html"); + break; + } + } else { + $output = $ditto->debug->render_link($dittoID,$ditto_base).$output; + } +} +//outerTpl by Dmi3yy +if ($outerTpl && $resource) { + if ($modx->getChunk($outerTpl) != "") { + $outerTpl = $modx->getChunk($outerTpl); + } else if(substr($outerTpl, 0, 5) == "@CODE") { + $outerTpl = trim(substr($outerTpl, 6)); + } + $output = str_replace('[+ditto+]',$output,$outerTpl); +} + +return ($save != 3) ? $output : "";?> \ No newline at end of file diff --git a/install/assets/snippets/ditto.tpl b/install/assets/snippets/ditto.tpl index 1cf45d2325..3348751f5b 100755 --- a/install/assets/snippets/ditto.tpl +++ b/install/assets/snippets/ditto.tpl @@ -4,1090 +4,12 @@ * * Summarizes and lists pages to create blogs, catalogs, PR archives, bio listings and more * - * @category snippet - * @version 2.1.0 - * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) - * @internal @properties - * @internal @modx_category Content + * @category snippet + * @version 2.1.0 + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) + * @internal @properties + * @internal @modx_category Content * @internal @installset base, sample */ -/* Description: - * Aggregates documents to create blogs, article/news - * collections, and more,with full support for templating. - * - * Author: - * Mark Kaplan for MODx CMF -*/ - -//---Core Settings---------------------------------------------------- // - -$ditto_version = "2.1.0"; - // Ditto version being executed - -$ditto_base = isset($ditto_base) ? $modx->config['base_path'].$ditto_base : $modx->config['base_path']."assets/snippets/ditto/"; -/* - Param: ditto_base - - Purpose: - Location of Ditto files - - Options: - Any valid folder location containing the Ditto source code with a trailing slash - - Default: - [(base_path)]assets/snippets/ditto/ -*/ -$dittoID = (!isset($id)) ? "" : $id."_"; -$GLOBALS["dittoID"] = $dittoID; -/* - Param: id - - Purpose: - Unique ID for this Ditto instance for connection with other scripts (like Reflect) and unique URL parameters - - Options: - Any combination of characters a-z, underscores, and numbers 0-9 - - Note: - This is case sensitive - - Default: - "" - blank -*/ -$language = (isset($language))? $language : $modx->config['manager_language']; -if (!file_exists($ditto_base."lang/".$language.".inc.php")) { - $language ="english"; -} -/* - Param: language - - Purpose: - language for defaults, debug, and error messages - - Options: - Any language name with a corresponding file in the &ditto_base/lang folder - - Default: - "english" -*/ -$format = (isset($format)) ? strtolower($format) : "html" ; -/* - Param: format - - Purpose: - Output format to use - - Options: - - "html" - - "json" - - "xml" - - "atom" - - "rss" - - Default: - "html" -*/ -$config = (isset($config)) ? $config : "default"; -/* - Param: config - - Purpose: - Load a custom configuration - - Options: - "default" - default blank config file - CONFIG_NAME - Other configs installed in the configs folder or in any folder within the MODx base path via @FILE - - Default: - "default" - - Related: - - -*/ -$debug = isset($debug)? $debug : 0; -/* - Param: debug - - Purpose: - Output debugging information - - Options: - 0 - off - 1 - on - - Default: - 0 - off - - Related: - - -*/ -$phx = (isset($phx))? $phx : 1; -/* - Param: phx - - Purpose: - Use PHx formatting - - Options: - 0 - off - 1 - on - - Default: - 1 - on -*/ -$extenders = isset($extenders) ? explode(",",$extenders) : array(); -/* - Param: extenders - - Purpose: - Load an extender which adds functionality to Ditto - - Options: - Any extender in the extenders folder or in any folder within the MODx base path via @FILE - - Default: - [NULL] - - Related: - - -*/ - // Variable: extenders - // Array that can be added to by configs or formats to load that extender - -$placeholders = array(); - // Variable: placeholders - // Initialize custom placeholders array for configs or extenders to add to - -$filters = array("custom"=>array(),"parsed"=>array()); - // Variable: filters - // Holds both the custom filters array for configs or extenders to add to - // and the parsed filters array. To add to this array, use the following format - // (code) - // $filters["parsed"][] = array("name" => array("source"=>$source,"value"=>$value,"mode"=>$mode)); - // $filters["custom"][] = array("source","callback_function"); - -$orderBy = array('parsed'=>array(),'custom'=>array(),'unparsed'=>$orderBy); - // Variable: orderBy - // An array that holds all criteria to sort the result set by. - // Note that using a custom sort will disable all other sorting. - // (code) - // $orderBy["parsed"][] = array("sortBy","sortDir"); - // $orderBy["custom"][] = array("sortBy","callback_function"); - -//---Includes-------------------------------------------------------- // - -$files = array ( - "base_language" => $ditto_base."lang/english.inc.php", - "language" => $ditto_base."lang/$language.inc.php", - "main_class" => $ditto_base."classes/ditto.class.inc.php", - "template_class" => $ditto_base."classes/template.class.inc.php", - "filter_class" => $ditto_base."classes/filter.class.inc.php", - "format" => $ditto_base."formats/$format.format.inc.php", - "config" => $ditto_base."configs/default.config.php", - "user_config" => (substr($config, 0, 5) != "@FILE") ? $ditto_base."configs/$config.config.php" : $modx->config['base_path'].trim(substr($config, 5)) -); - -if ($phx == 1) { - $files["prePHx_class"] = $ditto_base."classes/phx.pre.class.inc.php"; -} -if (isset($randomize)) { - $files["randomize_class"] = $ditto_base."classes/random.class.inc.php"; -} -if ($debug == 1) { - $files["modx_debug_class"] = $ditto_base."debug/modxDebugConsole.class.php"; - $files["debug_class"] = $ditto_base."classes/debug.class.inc.php"; - $files["debug_templates"] = $ditto_base."debug/debug.templates.php"; -} - -$files = array_unique($files); -foreach ($files as $filename => $filevalue) { - if (file_exists($filevalue) && strpos($filename,"class")) { - include_once($filevalue); - } else if (file_exists($filevalue)) { - include($filevalue); - } else if ($filename == "language") { - $modx->logEvent(1, 3, "Language file does not exist Please check: " . $filevalue, "Ditto " . $ditto_version); - return "Language file does not exist Please check: " . $filevalue; - } else { - $modx->logEvent(1, 3, $filevalue . " " . $_lang['file_does_not_exist'], "Ditto " . $ditto_version); - return $filevalue . " " . $_lang['file_does_not_exist']; - } -} - -//---Initiate Class-------------------------------------------------- // -if (class_exists('ditto')) { - $ditto = new ditto($dittoID,$format,$_lang,$dbg_templates); - // create a new Ditto instance in the specified format and language with the requested debug level -} else { - $modx->logEvent(1,3,$_lang['invalid_class'],"Ditto ".$ditto_version); - return $_lang['invalid_class']; -} - -//---Initiate Extenders---------------------------------------------- // -if (isset($tagData)) { - $extenders[] = "tagging"; -} -if(count($extenders) > 0) { - $extenders = array_unique($extenders); - foreach ($extenders as $extender) { - if(substr($extender, 0, 5) != "@FILE") { - $extender_path = $ditto_base."extenders/".$extender.".extender.inc.php"; - } else { - $extender_path = $modx->config['base_path'].trim(substr($extender, 5)); - } - - if (file_exists($extender_path)){ - include($extender_path); - } else { - $modx->logEvent(1, 3, $extender . " " . $_lang['extender_does_not_exist'], "Ditto ".$ditto_version); - return $extender . " " . $_lang['extender_does_not_exist']; - } - } -} - -//---Parameters------------------------------------------------------- /* -if (isset($startID)) {$parents = $startID;} -if (isset($summarize)) {$display = $summarize;} -if (isset($limit)) {$queryLimit = $limit;} -if (isset($sortBy) || isset($sortDir) || is_null($orderBy['unparsed'])) { - $sortDir = isset($sortDir) ? strtoupper($sortDir) : 'DESC'; - $sortBy = isset($sortBy) ? $sortBy : "createdon"; - $orderBy['parsed'][]=array($sortBy,$sortDir); -} - // Allow backwards compatibility - -$idType = isset($documents) ? "documents" : "parents"; - // Variable: idType - // type of IDs provided; can be either parents or documents - -$parents = isset($parents) ? $ditto->cleanIDs($parents) : $modx->documentIdentifier; - -/* - Param: parents - - Purpose: - IDs of containers for Ditto to retrieve their children to &depth depth - - Options: - Any valid MODx document marked as a container - - Default: - Current MODx Document - - Related: - - - - -*/ -$documents = isset($documents) ? $ditto->cleanIDs($documents) : false; -/* - Param: documents - - Purpose: - IDs of documents for Ditto to retrieve - - Options: - Any valid MODx document marked as a container - - Default: - None - - Related: - - -*/ - -$IDs = ($idType == "parents") ? $parents : $documents; - // Variable: IDs - // Internal variable which holds the set of IDs for Ditto to fetch - -$depth = isset($depth) ? $depth : 1; -/* - Param: depth - - Purpose: - Number of levels deep to retrieve documents - - Options: - Any number greater than or equal to 1 - 0 - infinite depth - - Default: - 1 - - Related: - - -*/ -$paginate = isset($paginate)? $paginate : 0; -/* - Param: paginate - - Purpose: - Paginate the results set into pages of &display length. - Use &total to limit the number of documents retreived. - - Options: - 0 - off - 1 - on - - Default: - 0 - off - - Related: - - - - - - -*/ -$dateSource = isset($dateSource) ? $dateSource : "createdon"; -/* - Param: dateSource - - Purpose: - Source of the [+date+] placeholder - - Options: - # - Any UNIX timestamp from MODx fields or TVs such as createdon, pub_date, or editedon - - Default: - "createdon" - - Related: - - -*/ -$dateFormat = isset($dateFormat)? $dateFormat : $_lang["dateFormat"]; -/* - Param: dateFormat - - Purpose: - Format the [+date+] placeholder in human readable form - - Options: - Any PHP valid strftime option - - Default: - [LANG] - - Related: - - -*/ -$display = isset($display) ? $display : "all"; -/* - Param: display - - Purpose: - Number of documents to display in the results - - Options: - # - Any number - "all" - All documents found - - Default: - "all" - - Related: - - - - -*/ -$total = isset($total) ? $total : "all"; -/* - Param: total - - Purpose: - Number of documents to retrieve - - Options: - # - Any number - "all" - All documents found - - Default: - "all" - All documents found - - Related: - - - - -*/ -$showPublishedOnly = isset($showPublishedOnly) ? $showPublishedOnly : 1; -/* - Param: showPublishedOnly - - Purpose: - Show only published documents - - Options: - 0 - show only unpublished documents - 1 - show both published and unpublished documents - - Default: - 1 - show both published and unpublished documents - - Related: - - - - - - - - -*/ -$showInMenuOnly = isset($showInMenuOnly) ? $showInMenuOnly : 0; -/* - Param: showInMenuOnly - - Purpose: - Show only documents visible in the menu - - Options: - 0 - show all documents - 1 - show only documents with the show in menu flag checked - - Default: - 0 - show all documents - - Related: - - - - - - -*/ -$hideFolders = isset($hideFolders)? $hideFolders : 0; -/* - Param: hideFolders - - Purpose: - Don't show folders in the returned results - - Options: - 0 - keep folders - 1 - remove folders - - Default: - 0 - keep folders - - Related: - - - - - - -*/ -$hidePrivate = isset($hidePrivate)? $hidePrivate : 1; -/* - Param: hidePrivate - - Purpose: - Don't show documents the guest or user does not have permission to see - - Options: - 0 - show private documents - 1 - hide private documents - - Default: - 1 - hide private documents - - Related: - - - - - - -*/ -$seeThruUnpub = (isset($seeThruUnpub))? $seeThruUnpub : 1 ; -/* - Param: seeThruUnpub - - Purpose: - See through unpublished folders to retrive their children - Used when depth is greater than 1 - - Options: - 0 - off - 1 - on - - Default: - 0 - off - - Related: - - - - - - -*/ -$queryLimit = (isset($queryLimit))? $queryLimit : 0; -/* - Param: queryLimit - - Purpose: - Number of documents to retrieve from the database, same as MySQL LIMIT - - Options: - # - Any number - 0 - automatic - - Default: - 0 - automatic - - Related: - - -*/ -$where = (isset($where))? $where : ""; -/* - Param: where - - Purpose: - Custom MySQL WHERE statement - - Options: - A valid MySQL WHERE statement using only document object items (no TVs) - - Default: - [NULL] - - Related: - - -*/ -$noResults = isset($noResults)? $ditto->getParam($noResults,"no_documents") : $_lang['no_documents']; -/* - Param: noResults - - Purpose: - Text or chunk to display when there are no results - - Options: - Any valid chunk name or text - - Default: - [LANG] -*/ -$removeChunk = isset($removeChunk) ? explode(",",$removeChunk) : false; -/* - Param: removeChunk - - Purpose: - Name of chunks to be stripped from content separated by commas - - Commonly used to remove comments - - Options: - Any valid chunkname that appears in the output - - Default: - [NULL] -*/ -$hiddenFields = isset($hiddenFields) ? explode(",",$hiddenFields) : false; -/* - Param: hiddenFields - - Purpose: - Allow Ditto to retrieve fields its template parser cannot handle such as nested placeholders and [*fields*] - - Options: - Any valid MODx fieldnames or TVs comma separated - - Default: - [NULL] -*/ -$offset = isset($start) ? $start : 0; -$start = (isset($_GET[$dittoID.'start'])) ? intval($_GET[$dittoID.'start']) : 0; -/* - Param: start - - Purpose: - Number of documents to skip in the results - - Options: - Any number - - Default: - 0 -*/ -$globalFilterDelimiter = isset($globalFilterDelimiter) ? $globalFilterDelimiter : "|"; -/* - Param: globalFilterDelimiter - - Purpose: - Filter delimiter used to separate filters in the filter string - - Options: - Any character not used in the filters - - Default: - "|" - - Related: - - - - - - -*/ - -$localFilterDelimiter = isset($localFilterDelimiter) ? $localFilterDelimiter : ","; -/* - Param: localFilterDelimiter - - Purpose: - Delimiter used to separate individual parameters within each filter string - - Options: - Any character not used in the filter itself - - Default: - "," - - Related: - - - - - - -*/ -$filters["custom"] = isset($cFilters) ? array_merge($filters["custom"],$cFilters) : $filters["custom"]; -$filters["parsed"] = isset($parsedFilters) ? array_merge($filters["parsed"],$parsedFilters) : $filters["parsed"]; - // handle 2.0.0 compatibility -$filter = (isset($filter) || ($filters["custom"] != false) || ($filters["parsed"] != false)) ? $ditto->parseFilters($filter,$filters["custom"],$filters["parsed"],$globalFilterDelimiter,$localFilterDelimiter) : false; -/* - Param: filter - - Purpose: - Removes items not meeting a critera. Thus, if pagetitle == joe then it will be removed. - Use in the format field,criteria,mode with the comma being the local delimiter - - *Mode* *Meaning* - - 1 - != - 2 - == - 3 - < - 4 - > - 5 - <= - 6 - >= - 7 - Text not in field value - 8 - Text in field value - 9 - case insenstive version of #7 - 10 - case insenstive version of #8 - 11 - checks leading character of the field - - @EVAL: - @EVAL in filters works the same as it does in MODx exect it can only be used - with basic filtering, not custom filtering (tagging, etc). Make sure that - you return the value you wish Ditto to filter by and that the code is valid PHP. - - Default: - [NULL] - - Related: - - - - - - -*/ -$keywords = (isset($keywords))? $keywords : 0; -/* - Param: keywords - - Purpose: - Enable fetching of associated keywords for each document - Can be used as [+keywords+] or as a tagData source - - Options: - 0 - off - 1 - on - - Default: - 0 - off -*/ - -$randomize = (isset($randomize))? $randomize : 0; -/* - Param: randomize - - Purpose: - Randomize the order of the output - - Options: - 0 - off - 1 - on - Any MODx field or TV for weighted random - - Default: - 0 - off -*/ -$save = (isset($save))? $save : 0; -/* - Param: save - - Purpose: - Saves the ditto object and results set to placeholders - for use by other snippets - - Options: - 0 - off; returns output - 1 - remaining; returns output - 2 - all; - 3 - all; returns ph only - - Default: - 0 - off; returns output -*/ -$templates = array( - "default" => "@CODE".$_lang['default_template'], - "base" => $tpl, - "alt" => $tplAlt, - "first" => $tplFirst, - "last" => $tplLast, - "current" => $tplCurrentDocument -); -/* - Param: tpl - - Purpose: - User defined chunk to format the documents - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Default: - [LANG] -*/ -/* - Param: tplAlt - - Purpose: - User defined chunk to format every other document - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Default: - &tpl -*/ -/* - Param: tplFirst - - Purpose: - User defined chunk to format the first document - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Default: - &tpl -*/ -/* - Param: tplLast - - Purpose: - User defined chunk to format the last document - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Default: - &tpl -*/ -/* - Param: tplCurrentDocument - - Purpose: - User defined chunk to format the current document - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Default: - &tpl -*/ -$orderBy = $ditto->parseOrderBy($orderBy,$randomize); -/* - Param: orderBy - - Purpose: - Sort the result set - - Options: - Any valid MySQL style orderBy statement - - Default: - createdon DESC -*/ -//-------------------------------------------------------------------- */ -$templates = $ditto->template->process($templates); - // parse the templates for TV's and store them for later use - -$ditto->setDisplayFields($ditto->template->fields,$hiddenFields); - // parse hidden fields - -$ditto->parseFields($placeholders,$seeThruUnpub,$dateSource,$randomize); - // parse the fields into the field array - -$documentIDs = $ditto->determineIDs($IDs, $idType, $ditto->fields["backend"]["tv"], $orderBy, $depth, $showPublishedOnly, $seeThruUnpub, $hideFolders, $hidePrivate, $showInMenuOnly, $where, $keywords, $dateSource, $queryLimit, $display, $filter,$paginate, $randomize); - // retrieves a list of document IDs that meet the criteria and populates the $resources array with them -$count = count($documentIDs); - // count the number of documents to be retrieved -$count = $count-$offset; - // handle the offset - -if ($count > 0) { - // if documents are returned continue with execution - - $total = ($total == "all") ? $count : min($total,$count); - // set total equal to count if all documents are to be included - - $display = ($display == "all") ? min($count,$total) : min($display,$total); - // allow show to use all option - - $stop = ($save != "1") ? min($total-$start,$display) : min($count,$total); - // set initial stop count - - if($paginate == 1) { - $paginateAlwaysShowLinks = isset($paginateAlwaysShowLinks)? $paginateAlwaysShowLinks : 0; - /* - Param: paginateAlwaysShowLinks - - Purpose: - Determine whether or not to always show previous next links - - Options: - 0 - off - 1 - on - - Default: - 0 - off - - Related: - - - - - */ - $paginateSplitterCharacter = isset($paginateSplitterCharacter)? $paginateSplitterCharacter : $_lang['button_splitter']; - /* - Param: paginateSplitterCharacter - - Purpose: - Splitter to use if always show is disabled - - Options: - Any valid character - - Default: - [LANG] - - Related: - - - - - */ - $tplPaginatePrevious = isset($tplPaginatePrevious)? $ditto->template->fetch($tplPaginatePrevious) : "[+lang:previous+]"; - /* - Param: tplPaginatePrevious - - Purpose: - Template for the previous link - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Placeholders: - url - URL for the previous link - lang:previous - value of 'prev' from the language file - - Related: - - - - - */ - $tplPaginateNext = isset($tplPaginateNext)? $ditto->template->fetch($tplPaginateNext) : "[+lang:next+]"; - /* - Param: tplPaginateNext - - Purpose: - Template for the next link - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Placeholders: - url - URL for the next link - lang:next - value of 'next' from the language file - - Related: - - - - - */ - $tplPaginateNextOff = isset($tplPaginateNextOff)? $ditto->template->fetch($tplPaginateNextOff) : "[+lang:next+]"; - /* - Param: tplPaginateNextOff - - Purpose: - Template for the inside of the next link - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Placeholders: - lang:next - value of 'next' from the language file - - Related: - - - - - */ - $tplPaginatePreviousOff = isset($tplPaginatePreviousOff)? $ditto->template->fetch($tplPaginatePreviousOff) : "[+lang:previous+]"; - /* - Param: tplPaginatePreviousOff - - Purpose: - Template for the previous link when it is off - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Placeholders: - lang:previous - value of 'prev' from the language file - - Related: - - - - - */ - $tplPaginatePage = isset($tplPaginatePage)? $ditto->template->fetch($tplPaginatePage) : "[+page+]"; - /* - Param: tplPaginatePage - - Purpose: - Template for the page link - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Placeholders: - url - url for the page - page - number of the page - - Related: - - - - - */ - $tplPaginateCurrentPage = isset($tplPaginateCurrentPage)? $ditto->template->fetch($tplPaginateCurrentPage) : "[+page+]"; - /* - Param: tplPaginateCurrentPage - - Purpose: - Template for the current page link - - Options: - - Any valid chunk name - - Code via @CODE - - File via @FILE - - Placeholders: - page - number of the page - - Related: - - - - - */ - - $ditto->paginate($start, $stop, $total, $display, $tplPaginateNext, $tplPaginatePrevious, $tplPaginateNextOff, $tplPaginatePreviousOff, $tplPaginatePage, $tplPaginateCurrentPage, $paginateAlwaysShowLinks, $paginateSplitterCharacter); - // generate the pagination placeholders - } - - $dbFields = $ditto->fields["display"]["db"]; - // get the database fields - $TVs = $ditto->fields["display"]["tv"]; - // get the TVs - - switch($orderBy['parsed'][0][1]) { - case "DESC": - $stop = ($ditto->prefetch === false) ? $stop + $start + $offset : $stop + $offset; - $start += $offset; - break; - case "ASC": - $start += $offset; - $stop += $start; - break; - } - - if ($ditto->prefetch !== false) { - $documentIDs = array_slice($documentIDs,$start,$stop); - // set the document IDs equal to the trimmed array - $dbFields = array_diff($dbFields,$ditto->prefetch["fields"]["db"]); - // calculate the difference between the database fields and those already prefetched - $dbFields[] = "id"; - // append id to the db fields array - $TVs = array_diff($TVs,$ditto->prefetch["fields"]["tv"]); - // calculate the difference between the tv fields and those already prefetched - $start = 0; - $stop = min($display,($queryLimit != 0) ? $queryLimit : $display,count($documentIDs)); - } else { - $queryLimit = ($queryLimit == 0) ? "" : $queryLimit; - } - - $resource = $ditto->getDocuments($documentIDs, $dbFields, $TVs, $orderBy, $showPublishedOnly, 0, $hidePrivate, $where, $queryLimit, $keywords, $randomize, $dateSource); - // retrieves documents - $output = $header; - // initialize the output variable and send the header - - if ($resource) { - if ($randomize != "0" && $randomize != "1") { - $resource = $ditto->weightedRandom($resource,$randomize,$stop); - // randomize the documents - } - - $resource = array_values($resource); - - for ($x=$start;$x<$stop;$x++) { - $template = $ditto->template->determine($templates,$x,0,$stop,$resource[$x]["id"]); - // choose the template to use and set the code of that template to the template variable - $renderedOutput = $ditto->render($resource[$x], $template, $removeChunk, $dateSource, $dateFormat, $placeholders,$phx,abs($start-$x)); - // render the output using the correct template, in the correct format and language - $modx->setPlaceholder($dittoID."item[".abs($start-$x)."]",$renderedOutput); - /* - Placeholder: item[x] - - Content: - Individual items rendered output - */ - $output .= $renderedOutput; - // send the rendered output to the buffer - } - } else { - $output .= $ditto->noResults($noResults,$paginate); - // if no documents are found return a no documents found string - } - $output .= $footer; - // send the footer - - // --------------------------------------------------- - // Save Object - // --------------------------------------------------- - - if($save) { - $modx->setPlaceholder($dittoID."ditto_object", $ditto); - $modx->setPlaceholder($dittoID."ditto_resource", ($save == "1") ? array_slice($resource,$display) : $resource); - } -} else { - $output = $header.$ditto->noResults($noResults,$paginate).$footer; -} -// --------------------------------------------------- -// Handle Debugging -// --------------------------------------------------- - -if ($debug == 1) { - $ditto_params =& $modx->event_params; - if (!isset($_GET["ditto_".$dittoID."debug"])) { - $_SESSION["ditto_debug_$dittoID"] = $ditto->debug->render_popup($ditto, $ditto_base, $ditto_version, $ditto_params, $documentIDs, array("db"=>$dbFields,"tv"=>$TVs), $display, $templates, $orderBy, $start, $stop, $total,$filter,$resource); - } - if (isset($_GET["ditto_".$dittoID."debug"])) { - switch ($_GET["ditto_".$dittoID."debug"]) { - case "open" : - exit($_SESSION["ditto_debug_$dittoID"]); - break; - case "save" : - $ditto->debug->save($_SESSION["ditto_debug_$dittoID"],"ditto".strtolower($ditto_version)."_debug_doc".$modx->documentIdentifier.".html"); - break; - } - } else { - $output = $ditto->debug->render_link($dittoID,$ditto_base).$output; - } -} - -return ($save != 3) ? $output : ""; \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/ditto/snippet.ditto.php'; \ No newline at end of file From 1fc9a9b4fd2439e5c79ddd4d55c0492e953e51d1 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:29:28 +0300 Subject: [PATCH 227/530] upadate ditto to 2.1.1and Refactor #10071 Eform --- .../ditto/classes/ditto.class.inc.php | 95 ++++++++------- assets/snippets/ditto/snippet.ditto.php | 9 +- assets/snippets/eform/snippet.eform.php | 109 +++++++++++++++++ install/assets/snippets/ditto.tpl | 2 +- install/assets/snippets/eform.tpl | 110 +----------------- 5 files changed, 169 insertions(+), 156 deletions(-) create mode 100644 assets/snippets/eform/snippet.eform.php diff --git a/assets/snippets/ditto/classes/ditto.class.inc.php b/assets/snippets/ditto/classes/ditto.class.inc.php index 3155257057..d12d461d0f 100644 --- a/assets/snippets/ditto/classes/ditto.class.inc.php +++ b/assets/snippets/ditto/classes/ditto.class.inc.php @@ -256,7 +256,7 @@ function parseFilters($filter=false,$cFilters=false,$pFilters = false,$globalDel // Render the document output // --------------------------------------------------- - function render($resource, $template, $removeChunk,$dateSource,$dateFormat,$ph=array(),$phx=1,$x=0) { + function render($resource, $template, $removeChunk,$dateSource,$dateFormat,$ph=array(),$phx=1,$x=0,$stop) { global $modx,$ditto_lang; if (!is_array($resource)) { @@ -789,7 +789,7 @@ function appendTV($tvname="",$docIDs){ $tot = $modx->db->getRecordCount($rs); $resourceArray = array(); for($i=0;$i<$tot;$i++) { - $row = @$modx->fetchRow($rs); + $row = @$modx->db->getRow($rs); $resourceArray["#".$row['contentid']][$row['name']] = getTVDisplayFormat($row['name'], $row['value'], $row['display'], $row['display_params'], $row['type'],$row['contentid']); $resourceArray["#".$row['contentid']]["tv".$row['name']] = $resourceArray["#".$row['contentid']][$row['name']]; } @@ -798,7 +798,7 @@ function appendTV($tvname="",$docIDs){ $query .= " FROM $tb2"; $query .= " WHERE name='".$tvname."' LIMIT 1"; $rs = $modx->db->query($query); - $row = @$modx->fetchRow($rs); + $row = @$modx->db->getRow($rs); if (strtoupper($row['default_text']) == '@INHERIT') { foreach ($docIDs as $id) { $defaultOutput = getTVDisplayFormat($row['name'], $row['default_text'], $row['display'], $row['display_params'], $row['type'], $id); @@ -856,7 +856,7 @@ function fetchKeywords($resource) { // --------------------------------------------------- // Function: getChildIDs // Get the IDs ready to be processed - // Similar to the modx version by the same name but much faster + // --------------------------------------------------- function getChildIDs($IDs, $depth) { @@ -864,45 +864,11 @@ function getChildIDs($IDs, $depth) { $depth = intval($depth); $kids = array(); $docIDs = array(); - - if ($depth == 0 && $IDs[0] == 0 && count($IDs) == 1) { - foreach ($modx->documentMap as $null => $document) { - foreach ($document as $parent => $id) { - $kids[] = $id; - } - } - return $kids; - } else if ($depth == 0) { - $depth = 10000; - // Impliment unlimited depth... - } - - foreach ($modx->documentMap as $null => $document) { - foreach ($document as $parent => $id) { - $kids[$parent][] = $id; - } - } - - foreach ($IDs AS $seed) { - if (!empty($kids[intval($seed)])) { - $docIDs = array_merge($docIDs,$kids[intval($seed)]); - unset($kids[intval($seed)]); - } + // RedCat + foreach($IDs as $id) { + $kids = $modx->getChildIds($id,$depth); + $docIDs = array_merge($docIDs,$kids); } - $depth--; - - while($depth != 0) { - $valid = $docIDs; - foreach ($docIDs as $child=>$id) { - if (!empty($kids[intval($id)])) { - $docIDs = array_merge($docIDs,$kids[intval($id)]); - unset($kids[intval($id)]); - } - } - $depth--; - if ($valid == $docIDs) $depth = 0; - } - return array_unique($docIDs); } @@ -921,6 +887,7 @@ function getDocuments($ids= array (), $fields, $TVs, $orderBy, $published= 1, $d $limit= ($limit != "") ? "LIMIT $limit" : ""; // LIMIT capabilities - rad14701 $tblsc= $modx->getFullTableName("site_content"); $tbldg= $modx->getFullTableName("document_groups"); + $tbltvc = $modx->getFullTableName("site_tmplvar_contentvalues"); // modify field names to use sc. table reference $fields= "sc.".implode(",sc.",$fields); if ($randomize != 0) { @@ -928,7 +895,16 @@ function getDocuments($ids= array (), $fields, $TVs, $orderBy, $published= 1, $d } else { $sort= $orderBy['sql']; } + + //Added by Andchir (http://modx-shopkeeper.ru/) + if(substr($where, 0, 5)=="@SQL:"){ + $where = ($where == "") ? "" : substr(str_replace('@eq','=',$where), 5); + $left_join_tvc = "LEFT JOIN $tbltvc tvc ON sc.id = tvc.contentid"; + }else{ $where= ($where == "") ? "" : 'AND sc.' . implode('AND sc.', preg_replace("/^\s/i", "", explode('AND', $where))); + $left_join_tvc = ''; + } + if ($public) { // get document groups for current user if ($docgrp= $modx->getUserDocGroups()) @@ -939,7 +915,8 @@ function getDocuments($ids= array (), $fields, $TVs, $orderBy, $published= 1, $d $published = ($published) ? "AND sc.published=1" : ""; - $sql = "SELECT DISTINCT $fields FROM $tblsc sc + //$sql = "SELECT DISTINCT $fields FROM $tblsc sc + $sql = "SELECT DISTINCT $fields FROM $tblsc sc $left_join_tvc LEFT JOIN $tbldg dg on dg.document = sc.id WHERE sc.id IN (" . join($ids, ",") . ") $published AND sc.deleted=$deleted $where ".($public ? 'AND ('.$access.')' : '')." GROUP BY sc.id" . @@ -952,7 +929,7 @@ function getDocuments($ids= array (), $fields, $TVs, $orderBy, $published= 1, $d $TVIDs = array(); if ($cnt) { for ($i= 0; $i < $cnt; $i++) { - $resource = $modx->fetchRow($result); + $resource = $modx->db->getRow($result); if ($modx->config["server_offset_time"] != 0 && $dateSource !== false) { $dateValue = (is_int($resource[$dateSource]) !== true) ? $resource[$dateSource] : strtotime($resource[$dateSource]); $resource[$dateSource] = $dateValue + $modx->config["server_offset_time"]; @@ -1057,18 +1034,26 @@ public static function buildURL($args,$id=false,$dittoIdentifier=false) { $query = array(); foreach ($_GET as $param=>$value) { if ($param != 'id' && $param != 'q') { - $query[htmlspecialchars($param, ENT_QUOTES)] = htmlspecialchars($value, ENT_QUOTES); + $clean_param = htmlspecialchars($param, ENT_QUOTES, $modx->config['modx_charset']); + if(is_array($value)) { + //$query[$param] = $value; + foreach($value as $key => $val) { + $query[$clean_param][htmlspecialchars($key, ENT_QUOTES)] = htmlspecialchars($val, ENT_QUOTES, $modx->config['modx_charset']); + } + }else{ + $query[$clean_param] = htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']); + } } } if (!is_array($args)) { $args = explode("&",$args); foreach ($args as $arg) { $arg = explode("=",$arg); - $query[$dittoID.$arg[0]] = urlencode(trim($arg[1])); + $query[$dittoID.$arg[0]] = rawurlencode(trim($arg[1])); } } else { foreach ($args as $name=>$value) { - $query[$dittoID.$name] = urlencode(trim($value)); + $query[$dittoID.$name] = rawurlencode(trim($value)); } } $queryString = ""; @@ -1112,7 +1097,7 @@ function getParam($param,$langString){ // Paginate the documents // --------------------------------------------------- - function paginate($start, $stop, $total, $summarize, $tplPaginateNext, $tplPaginatePrevious, $tplPaginateNextOff, $tplPaginatePreviousOff, $tplPaginatePage, $tplPaginateCurrentPage, $paginateAlwaysShowLinks, $paginateSplitterCharacter) { + function paginate($start, $stop, $total, $summarize, $tplPaginateNext, $tplPaginatePrevious, $tplPaginateNextOff, $tplPaginatePreviousOff, $tplPaginatePage, $tplPaginateCurrentPage, $paginateAlwaysShowLinks, $paginateSplitterCharacter, $max_paginate, $max_previous) { global $modx, $dittoID,$ditto_lang; if ($stop == 0 || $total == 0 || $summarize==0) { @@ -1146,9 +1131,23 @@ function paginate($start, $stop, $total, $summarize, $tplPaginateNext, $tplPagin } $totalpages = ceil($total / $summarize); + $cur_x = floor($start / $summarize); + $min_x = $cur_x - $max_previous; + + if ($min_x < 0) $min_x = 0; + + $max_x = $min_x + $max_paginate - 1; + if ($max_x > $totalpages - 1) { + $max_x = $totalpages - 1; + $min_x = $max_x - $max_paginate + 1; + } + for ($x = 0; $x <= $totalpages -1; $x++) { $inc = $x * $summarize; $display = $x +1; + + if (($x < $min_x) || ($x > $max_x)) continue; + if ($inc != $start) { $pages .= $this->template->replace(array('url'=>$this->buildURL("start=$inc"),'page'=>$display),$tplPaginatePage); } else { diff --git a/assets/snippets/ditto/snippet.ditto.php b/assets/snippets/ditto/snippet.ditto.php index 728a5c44bb..79caa5fcf7 100644 --- a/assets/snippets/ditto/snippet.ditto.php +++ b/assets/snippets/ditto/snippet.ditto.php @@ -11,7 +11,7 @@ //---Core Settings---------------------------------------------------- // -$ditto_version = "2.1.0"; +$ditto_version = "2.1.1"; // Ditto version being executed $ditto_base = isset($ditto_base) ? $modx->config['base_path'].$ditto_base : $modx->config['base_path']."assets/snippets/ditto/"; @@ -822,6 +822,8 @@ // set initial stop count if($paginate == 1) { + $max_paginate = isset($max_paginate)? $max_paginate : 50; + $max_previous = isset($max_previous)? $max_previous : 25; $paginateAlwaysShowLinks = isset($paginateAlwaysShowLinks)? $paginateAlwaysShowLinks : 0; /* Param: paginateAlwaysShowLinks @@ -975,7 +977,7 @@ - */ - $ditto->paginate($start, $stop, $total, $display, $tplPaginateNext, $tplPaginatePrevious, $tplPaginateNextOff, $tplPaginatePreviousOff, $tplPaginatePage, $tplPaginateCurrentPage, $paginateAlwaysShowLinks, $paginateSplitterCharacter); + $ditto->paginate($start, $stop, $total, $display, $tplPaginateNext, $tplPaginatePrevious, $tplPaginateNextOff, $tplPaginatePreviousOff, $tplPaginatePage, $tplPaginateCurrentPage, $paginateAlwaysShowLinks, $paginateSplitterCharacter, $max_paginate, $max_previous); // generate the pagination placeholders } @@ -1088,4 +1090,5 @@ $output = str_replace('[+ditto+]',$output,$outerTpl); } -return ($save != 3) ? $output : "";?> \ No newline at end of file +return ($save != 3) ? $output : ""; +?> \ No newline at end of file diff --git a/assets/snippets/eform/snippet.eform.php b/assets/snippets/eform/snippet.eform.php new file mode 100644 index 0000000000..ff9b568494 --- /dev/null +++ b/assets/snippets/eform/snippet.eform.php @@ -0,0 +1,109 @@ +config["base_path"].'assets/snippets/'.$snipFolder.'/'; + + +# check if inside manager +if ($modx->isBackend()) { +return ''; # don't go any further when inside manager +} + +//tidying up some casing errors in parameters +if(isset($eformOnValidate)) $eFormOnValidate = $eformOnValidate; +if(isset($eformOnBeforeMailSent)) $eFormOnBeforeMailSent = $eformOnBeforeMailSent; +if(isset($eformOnMailSent)) $eFormOnMailSent = $eformOnMailSent; +if(isset($eformOnValidate)) $eFormOnValidate = $eformOnValidate; +if(isset($eformOnBeforeFormMerge)) $eFormOnBeforeFormMerge = $eformOnBeforeFormMerge; +if(isset($eformOnBeforeFormParse)) $eFormOnBeforeFormParse = $eformOnBeforeFormParse; +//for sottwell :) +if(isset($eFormCSS)) $cssStyle = $eFormCSS; + +# Snippet customize settings +$params = array ( + // Snippet Path + 'snipPath' => $snipPath, //includes $snipFolder + 'snipFolder' => $snipFolder, + +// eForm Params + 'vericode' => isset($vericode)? $vericode:"", + 'formid' => isset($formid)? $formid:"", + 'from' => isset($from)? $from:$modx->config['emailsender'], + + 'smtp' => isset($smtp)? $smtp:$modx->config['email_method'], + 'smtpfrom' => isset($smtpfrom)? $smtpfrom:$modx->config['email_smtp_sender'], + 'smtphost' => isset($smtphost)? $smtphost:$modx->config['email_host'], + 'smtppass' => isset($smtppass)? $smtppass:$modx->config['email_pass'], + 'smtpport' => isset($smtpport)? $smtpport:$modx->config['email_port'], + + 'fromname' => isset($fromname)? $fromname:$modx->config['site_name'], + 'to' => isset($to)? $to:$modx->config['emailsender'], + 'cc' => isset($cc)? $cc:"", + 'bcc' => isset($bcc)? $bcc:"", + 'subject' => isset($subject)? $subject:"", + 'ccsender' => isset($ccsender)?$ccsender:0, + 'sendirect' => isset($sendirect)? $sendirect:0, + 'mselector' => isset($mailselector)? $mailselector:0, + 'mobile' => isset($mobile)? $mobile:'', + 'mobiletext' => isset($mobiletext)? $mobiletext:'', + 'autosender' => isset($autosender)? $autosender:$from, + 'autotext' => isset($automessage)? $automessage:"", + 'category' => isset($category)? $category:0, + 'keywords' => isset($keywords)? $keywords:"", + 'gid' => isset($gotoid)? $gotoid:$modx->documentIdentifier, + 'noemail' => isset($noemail)? ($noemail):false, + 'saveform' => isset($saveform)? ($saveform? true:false):true, + 'tpl' => isset($tpl)? $tpl:"", + 'report' => isset($report)? $report:"", + 'allowhtml' => isset($allowhtml)? $allowhtml:0, + //Added by JJ + 'replyto' => isset($replyto)? $replyto:"", + 'language' => isset($language)? $language:$modx->config['manager_language'], + 'thankyou' => isset($thankyou)? $thankyou:"", + 'isDebug' => isset($debug)? $debug:0, + 'reportAbuse' => isset($reportAbuse)? $reportAbuse:false, + 'disclaimer' => isset($disclaimer)?$disclaimer:'', + 'sendAsHtml' => isset($sendAsHtml)?$sendAsHtml:false, + 'sendAsText' => isset($sendAsText)?$sendAsText:false, + 'sessionVars' => isset($sessionVars)?$sessionVars:false, + 'postOverides' => isset($postOverides)?$postOverides:0, + 'eFormOnBeforeMailSent' => isset($eFormOnBeforeMailSent)?$eFormOnBeforeMailSent:'', + 'eFormOnMailSent' => isset($eFormOnMailSent)?$eFormOnMailSent:'', + 'eFormOnValidate' => isset($eFormOnValidate)?$eFormOnValidate:'', + 'eFormOnBeforeFormMerge' => isset($eFormOnBeforeFormMerge)?$eFormOnBeforeFormMerge:'', + 'eFormOnBeforeFormParse' => isset($eFormOnBeforeFormParse)?$eFormOnBeforeFormParse:'', + 'cssStyle' => isset($cssStyle)?$cssStyle:'', + 'jScript' => isset($jScript)?$jScript:'', + 'submitLimit' => (isset($submitLimit) && is_numeric($submitLimit))?$submitLimit*60:0, + 'protectSubmit' => isset($protectSubmit)?$protectSubmit:1, + 'requiredClass' => isset($requiredClass)?$requiredClass:"required", + 'invalidClass' => isset($invalidClass)?$invalidClass:"invalid", + 'runSnippet' => ( isset($runSnippet) && !is_numeric($runSnippet) )?$runSnippet:'', + 'autoSenderName' => isset($autoSenderName)?$autoSenderName:'', + 'version' => '1.4.4' +); + +// pixelchutes PHx workaround +foreach( $params as $key=>$val ) $params[ $key ] = str_replace( array('((','))'), array('[+','+]'), $val ); + +# Start processing + +include_once ($snipPath."eform.inc.php"); + +$output = eForm($modx,$params); + +# Return +return $output; +?> \ No newline at end of file diff --git a/install/assets/snippets/ditto.tpl b/install/assets/snippets/ditto.tpl index 3348751f5b..078931a36d 100755 --- a/install/assets/snippets/ditto.tpl +++ b/install/assets/snippets/ditto.tpl @@ -5,7 +5,7 @@ * Summarizes and lists pages to create blogs, catalogs, PR archives, bio listings and more * * @category snippet - * @version 2.1.0 + * @version 2.1.1 * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) * @internal @properties * @internal @modx_category Content diff --git a/install/assets/snippets/eform.tpl b/install/assets/snippets/eform.tpl index 4d64b5b95e..8ad330eb6c 100755 --- a/install/assets/snippets/eform.tpl +++ b/install/assets/snippets/eform.tpl @@ -4,110 +4,12 @@ * * Robust form parser/processor with validation, multiple sending options, chunk/page support for forms and reports, and file uploads * - * @category snippet - * @version 1.4.4.7 - * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) - * @internal @properties - * @internal @modx_category Forms + * @category snippet + * @version 1.4.4.7 + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) + * @internal @properties + * @internal @modx_category Forms * @internal @installset base, sample */ -# eForm 1.4.4.7 - Electronic Form Snippet -# Original created by Raymond Irving 15-Dec-2004. -# Version 1.3+ extended by Jelle Jager (TobyL) September 2006 -# ----------------------------------------------------- -# Captcha image support - thanks to Djamoer -# Multi checkbox, radio, select support - thanks to Djamoer -# Form Parser and extened validation - by Jelle Jager -# -# see eform/docs/eform.htm for history, usage and examples -# - -# Set Snippet Paths -$snipFolder = isset($snipFolder)?$snipFolder:'eform'; -$snipPath = $modx->config["base_path"].'assets/snippets/'.$snipFolder.'/'; - - -# check if inside manager -if ($modx->isBackend()) { -return ''; # don't go any further when inside manager -} - -//tidying up some casing errors in parameters -if(isset($eformOnValidate)) $eFormOnValidate = $eformOnValidate; -if(isset($eformOnBeforeMailSent)) $eFormOnBeforeMailSent = $eformOnBeforeMailSent; -if(isset($eformOnMailSent)) $eFormOnMailSent = $eformOnMailSent; -if(isset($eformOnValidate)) $eFormOnValidate = $eformOnValidate; -if(isset($eformOnBeforeFormMerge)) $eFormOnBeforeFormMerge = $eformOnBeforeFormMerge; -if(isset($eformOnBeforeFormParse)) $eFormOnBeforeFormParse = $eformOnBeforeFormParse; -//for sottwell :) -if(isset($eFormCSS)) $cssStyle = $eFormCSS; - -# Snippet customize settings -$params = array ( - // Snippet Path - 'snipPath' => $snipPath, //includes $snipFolder - 'snipFolder' => $snipFolder, - -// eForm Params - 'vericode' => isset($vericode)? $vericode:"", - 'formid' => isset($formid)? $formid:"", - 'from' => isset($from)? $from:$modx->config['emailsender'], - 'fromname' => isset($fromname)? $fromname:$modx->config['site_name'], - 'to' => isset($to)? $to:$modx->config['emailsender'], - 'cc' => isset($cc)? $cc:"", - 'bcc' => isset($bcc)? $bcc:"", - 'subject' => isset($subject)? $subject:"", - 'ccsender' => isset($ccsender)?$ccsender:0, - 'sendirect' => isset($sendirect)? $sendirect:0, - 'mselector' => isset($mailselector)? $mailselector:0, - 'mobile' => isset($mobile)? $mobile:'', - 'mobiletext' => isset($mobiletext)? $mobiletext:'', - 'autosender' => isset($autosender)? $autosender:$from, - 'autotext' => isset($automessage)? $automessage:"", - 'category' => isset($category)? $category:0, - 'keywords' => isset($keywords)? $keywords:"", - 'gid' => isset($gotoid)? $gotoid:$modx->documentIdentifier, - 'noemail' => isset($noemail)? ($noemail):false, - 'saveform' => isset($saveform)? ($saveform? true:false):true, - 'tpl' => isset($tpl)? $tpl:"", - 'report' => isset($report)? $report:"", - 'allowhtml' => isset($allowhtml)? $allowhtml:0, - //Added by JJ - 'replyto' => isset($replyto)? $replyto:"", - 'language' => isset($language)? $language:$modx->config['manager_language'], - 'thankyou' => isset($thankyou)? $thankyou:"", - 'isDebug' => isset($debug)? $debug:0, - 'reportAbuse' => isset($reportAbuse)? $reportAbuse:false, - 'disclaimer' => isset($disclaimer)?$disclaimer:'', - 'sendAsHtml' => isset($sendAsHtml)?$sendAsHtml:false, - 'sendAsText' => isset($sendAsText)?$sendAsText:false, - 'sessionVars' => isset($sessionVars)?$sessionVars:false, - 'postOverides' => isset($postOverides)?$postOverides:0, - 'eFormOnBeforeMailSent' => isset($eFormOnBeforeMailSent)?$eFormOnBeforeMailSent:'', - 'eFormOnMailSent' => isset($eFormOnMailSent)?$eFormOnMailSent:'', - 'eFormOnValidate' => isset($eFormOnValidate)?$eFormOnValidate:'', - 'eFormOnBeforeFormMerge' => isset($eFormOnBeforeFormMerge)?$eFormOnBeforeFormMerge:'', - 'eFormOnBeforeFormParse' => isset($eFormOnBeforeFormParse)?$eFormOnBeforeFormParse:'', - 'cssStyle' => isset($cssStyle)?$cssStyle:'', - 'jScript' => isset($jScript)?$jScript:'', - 'submitLimit' => (isset($submitLimit) && is_numeric($submitLimit))?$submitLimit*60:0, - 'protectSubmit' => isset($protectSubmit)?$protectSubmit:1, - 'requiredClass' => isset($requiredClass)?$requiredClass:"required", - 'invalidClass' => isset($invalidClass)?$invalidClass:"invalid", - 'runSnippet' => ( isset($runSnippet) && !is_numeric($runSnippet) )?$runSnippet:'', - 'autoSenderName' => isset($autoSenderName)?$autoSenderName:'', - 'version' => '1.4.4' -); - -// pixelchutes PHx workaround -foreach( $params as $key=>$val ) $params[ $key ] = str_replace( array('((','))'), array('[+','+]'), $val ); - -# Start processing - -include_once ($snipPath."eform.inc.php"); - -$output = eForm($modx,$params); - -# Return -return $output; \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/eform/snippet.eform.php'; \ No newline at end of file From bc5405335d8f553820590a4d752b4dc32d9ae5be Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:31:00 +0300 Subject: [PATCH 228/530] small fix --- assets/snippets/eform/eform.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/snippets/eform/eform.inc.php b/assets/snippets/eform/eform.inc.php index 5fb7542046..5e0377fb1a 100644 --- a/assets/snippets/eform/eform.inc.php +++ b/assets/snippets/eform/eform.inc.php @@ -49,6 +49,9 @@ function eForm($modx,$params) { $fields = array(); //reset fields array - needed in case of multiple forms +// define some variables used as array index +$_dfnMaxlength = 6; + extract($params,EXTR_SKIP); // extract params into variables $fileVersion = '1.4.4'; From 2da2d887a560191fd3551d7daa5459fbc11aaa7f Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:36:07 +0300 Subject: [PATCH 229/530] Refactor #10071 firstchildredirect --- .../snippet.firstchildredirect.php | 34 +++++++++++++++++++ install/assets/snippets/firstchild.tpl | 32 +---------------- 2 files changed, 35 insertions(+), 31 deletions(-) create mode 100644 assets/snippets/firstchildredirect/snippet.firstchildredirect.php diff --git a/assets/snippets/firstchildredirect/snippet.firstchildredirect.php b/assets/snippets/firstchildredirect/snippet.firstchildredirect.php new file mode 100644 index 0000000000..f7c8e4e5a3 --- /dev/null +++ b/assets/snippets/firstchildredirect/snippet.firstchildredirect.php @@ -0,0 +1,34 @@ + + * @modified-by Ryan Thrash + * @license Public Domain + * @version 1.0 + * + * This snippet redirects to the first child document of a folder in which this + * snippet is included within the content (e.g. [!FirstChildRedirect!]). This + * allows MODx folders to emulate the behavior of real folders since MODx + * usually treats folders as actual documents with their own content. + * + * Modified to make Doc ID a required parameter... now defaults to the current + * Page/Folder you call the snippet from. + * + * &docid=`12` + * Use the docid parameter to have this snippet redirect to the + * first child document of the specified document. + */ + +$docid = (isset($docid))? $docid: $modx->documentIdentifier; + +$children= $modx->getActiveChildren($docid, 'menuindex', 'ASC'); +if (!$children === false) { + $firstChild= $children[0]; + $firstChildUrl= $modx->makeUrl($firstChild['id']); +} else { + $firstChildUrl= $modx->makeUrl($modx->config['site_start']); +} +// return $modx->sendRedirect($firstChildUrl); +return $modx->sendRedirect($firstChildUrl,0,'REDIRECT_HEADER','HTTP/1.1 301 Moved Permanently'); +?> \ No newline at end of file diff --git a/install/assets/snippets/firstchild.tpl b/install/assets/snippets/firstchild.tpl index 1022b9a3b3..d2c417764e 100644 --- a/install/assets/snippets/firstchild.tpl +++ b/install/assets/snippets/firstchild.tpl @@ -12,34 +12,4 @@ * @internal @installset base */ - -/* - * @name FirstChildRedirect - * @author Jason Coward - * @modified-by Ryan Thrash - * @license Public Domain - * @version 1.0 - * - * This snippet redirects to the first child document of a folder in which this - * snippet is included within the content (e.g. [!FirstChildRedirect!]). This - * allows MODx folders to emulate the behavior of real folders since MODx - * usually treats folders as actual documents with their own content. - * - * Modified to make Doc ID a required parameter... now defaults to the current - * Page/Folder you call the snippet from. - * - * &docid=`12` - * Use the docid parameter to have this snippet redirect to the - * first child document of the specified document. - */ - -$docid = (isset($docid))? $docid: $modx->documentIdentifier; - -$children= $modx->getActiveChildren($docid, 'menuindex', 'ASC'); -if (!$children === false) { - $firstChild= $children[0]; - $firstChildUrl= $modx->makeUrl($firstChild['id']); -} else { - $firstChildUrl= $modx->makeUrl($modx->config['site_start']); -} -return $modx->sendRedirect($firstChildUrl,0,'REDIRECT_HEADER','HTTP/1.1 301 Moved Permanently'); +return require MODX_BASE_PATH.'assets/snippets/firstchildredirect/snippet.firstchildredirect.php'; \ No newline at end of file From 54ea39d6ae6354d7f237f069f76aab89ec6ae265 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:47:14 +0300 Subject: [PATCH 230/530] Refactor #10071 --- assets/snippets/if/snippet.if.php | 176 +++++++ .../listindexer/snippet.listindexer.php | 487 +++++++++++++++++ .../membercheck/snippet.membercheck.php | 137 +++++ .../personalize/snippet.personalize.php | 163 ++++++ .../ultimateparent/snippet.ultimateparent.php | 49 ++ install/assets/snippets/if.tpl | 175 +------ install/assets/snippets/listindexer.tpl | 495 +----------------- install/assets/snippets/membercheck.tpl | 135 +---- install/assets/snippets/personalize.tpl | 179 +------ install/assets/snippets/ultparent.tpl | 58 +- 10 files changed, 1036 insertions(+), 1018 deletions(-) create mode 100644 assets/snippets/if/snippet.if.php create mode 100644 assets/snippets/listindexer/snippet.listindexer.php create mode 100644 assets/snippets/membercheck/snippet.membercheck.php create mode 100644 assets/snippets/personalize/snippet.personalize.php create mode 100644 assets/snippets/ultimateparent/snippet.ultimateparent.php diff --git a/assets/snippets/if/snippet.if.php b/assets/snippets/if/snippet.if.php new file mode 100644 index 0000000000..5d160cd540 --- /dev/null +++ b/assets/snippets/if/snippet.if.php @@ -0,0 +1,176 @@ + 300 <= 700 +* [[if? &is=`[*price*]:gt:300:and:[*price*]:lte:700` &then=`@TPL:chunk-name`]] +* +* Sample №6 +* Output in the multiplicity of records Ditto 3 +* [[if? &is=`[+ditto_iteration+]:%:3` &then=`true` &else=`false`]] +* +* Sample №7 +* Output in the multiplicity of records Ditto 3 but by multiplying the +* [[if? &is=`[+ditto_iteration+]*2:%:3` &then=`true` &else=`false` &math=`on`]] +* +* Sample №8 +* Print the value of the mathematical expression +* [[if? &is=`[+ditto_iteration+]*2` &math=`on`]] +* +* Operator: +* (is,=) , (not,!=) , (>,gt) , (<,lt) , (>=,gte) , (lte,<=) , (isempty,empty) , (not_empty,!empty) +* (null, is_null) , (in_array, inarray, in) , (not_in,!in) +* +* More samples +* [[if? &is=`eval('global $iteration;$iteration++;echo $iteration;')` &math=`on`]] // iteration in Ditto,Wayfinder and others +* [[if? &is=`:is:` &then=`@eval: echo str_replace('
    ','','[*pagetitle*]');`]] // 'our
    works' -> 'our works' +* [[if? &is=`:is:` &then=`@eval: echo number_format('[*price*]', 2, ',', ' ');`]] // '1000000,89' -> '1 000 000,89' +* +* RussAndRussky.org.ua +**/ +$s=empty($separator)?':':$separator; +$opers=explode($s,$is); +$subject=$opers[0]; +$eq=true; +$and=false; +for ($i=1;$i': + case 'gt':$output = ($subject > $operand) ? true : false;$i++; + break; + case '<=': + case 'lte':$output = ($subject <= $operand) ? true : false;$i++; + break; + case '>=': + case 'gte':$output = ($subject >= $operand) ? true : false;$i++; + break; + case 'isempty': + case 'empty':$output = empty($subject) ? true : false; + break; + case '!empty': + case 'notempty': + case 'isnotempty':$output = empty($subject) || $subject == '' ? false : true; + break; + case 'isnull': + case 'null':$output = $subject == null || strtolower($subject) == 'null' ? true : false; + break; + case 'inarray': + case 'in_array': + case 'in': + $operand = explode(',',$operand); + $output = in_array($subject,$operand) ? true : false; + $i++; + break; + case 'not_in': + case '!in': + case '!inarray': + $operand = explode(',',$operand); + $output = in_array($subject,$operand) ? false : true; + $i++; + break; + + case '==': + case '=': + case 'eq': + case 'is': + default: + $output = ((string)$subject == (string)$operand) ? true : false; + $i++; + break; + } + + $eq=$output?$eq:false; + + } + } +} +if ($lp==1){ + if ($left_part) { + if (!empty($part_eq)){ + if ($part_eq||$eq){$output=$then;} + } else { + $output=$eq?$then:$else; + } + } + else + { + $output=$else; + } +} else { + if (!empty($part_eq)){ + if ($part_eq||$eq){ + $output=$then; + } + } else {$output=$eq?$then:$else;} +} +if (strpos($output,'@TPL:')!==FALSE){$output='{{'.(str_replace('@TPL:','',$output)).'}}';} + +if (substr($output,0,6) == "@eval:") { + ob_start(); + eval(substr($output,6)); + $output = ob_get_contents(); + ob_end_clean(); +} +if (empty($then)&&empty($else)) { + if ($math=='on') {eval('$subject='.$subject.';');} + return $subject; +} + +return $output; +?> \ No newline at end of file diff --git a/assets/snippets/listindexer/snippet.listindexer.php b/assets/snippets/listindexer/snippet.listindexer.php new file mode 100644 index 0000000000..b8e75177d7 --- /dev/null +++ b/assets/snippets/listindexer/snippet.listindexer.php @@ -0,0 +1,487 @@ +s on new lines. Generally, if you + // are displaying then inline (horizontal, you do not want new + // lines, but standard vertical block styling you do. This is + // for IE, real browsers don't care. + $newLinesForLists = true; + +// Styles +// +// The following are the styles included in this snippet. It is up +// to you to include these styles in your stylesheet to get them to +// look the way you want. + + // div.LIn_title {} List title div + // ul.LIn_fullMode {} UL class + // ul.LIn_shortMode {} UL class + // span.LIn_date {} Span surrounding pub/created date + // span.LIn_desc {} Span surrounding description + // div.LIn_pagination Div surrounding pagination links + // span.LIn_currentPage {} Span surrounding current page of + // pagination (which wouldn't be css-able + // by virtue of its tag) + + +// ********************************************************************** +// END CONFIG SETTINGS +// THE REST SHOULD TAKE CARE OF ITSELF +// ********************************************************************** + +// Take care of IE list issue +$ie = ($newLinesForLists)? "\n" : '' ; + +// Use snippet call defined variables if set +$activeTitle = (isset($LIn_title))? $LIn_title : $defaultTitle ; +$mode = (isset($LIn_mode))? $LIn_mode : $mode ; +$descendentDepth = (isset($LIn_depth))? $LIn_depth : $descendentDepth ; +$seeThruUnpub = (isset($LIn_seeThru))? $LIn_seeThru : $seeThruUnpub ; +$seeShowInMenu = (isset($LIn_seeShowInMenu))? $LIn_seeShowInMenu : $seeShowInMenu ; +$hidePrivate = (isset($LIn_hidePrivate))? $LIn_hidePrivate : $hidePrivate; +$linkToIndex = (isset($LIn_link))? $LIn_link : $linkToIndex ; +$rootFolder = (isset($LIn_root))? $LIn_root : $rootFolder ; +$shortQty = (isset($LIn_sQty))? $LIn_sQty : $shortQty ; +$fullQty = (isset($LIn_fQty))? $LIn_fQty : $fullQty ; +$showCreationDate = (isset($LIn_showDate))? $LIn_showDate : $showCreationDate ; +$indexText = (isset($LIn_indexText))? $LIn_indexText : $indexText ; +$useFastUrls = (isset($LIn_fast))? $LIn_fast : $useFastUrls ; +$sortBy = (isset($LIn_sort))? $LIn_sort : $sortBy; +$shortDesc = (isset($LIn_sDesc))? $LIn_sDesc : $shortDesc ; +$fullDesc = (isset($LIn_fDesc))? $LIn_fDesc : $fullDesc ; +$sortDir = (isset($LIn_dir))? $LIn_dir : $sortDir ; +if ($sortDir == '') $sortDir = ($sortBy == 'date')? 'DESC' : 'ASC' ; + + +// Make useful variable shortcut for the content table +//$tbl = $modx->dbConfig['dbase'] . "." . $modx->dbConfig['table_prefix'] . "site_content"; +$tblsc = $modx->getFullTableName("site_content"); +$tbldg = $modx->getFullTableName("document_groups"); + +// Initialize output +$output = ''; + +// --------------------------------------------------- +// --------------------------------------------------- +// Query db for parent folders, or not. First check to +// see if a querystring cheat has been provided- this +// should speed things up considerably when using this +// in full mode. (a.k.a. fastUrls) +// --------------------------------------------------- +// --------------------------------------------------- +$inFolder= isset($_GET['LIn_f'])? $_GET['LIn_f']: 0; +if ((!$inFolder && $useFastUrls) || !$useFastUrls ){ + // Only run all the database queries if we don't already + // know the folders AND fastUrls are desired. + + // --------------------------------------------------- + // Seed list of viable parents + // --------------------------------------------------- + + if ($rootFolder == NULL){ + $rootFolder = $modx->documentIdentifier; + } + // Set root level parent array + $seedArray = explode(',',$rootFolder); + $parentsArray = array(); + foreach($seedArray AS $seed){ + $parentsArray['level_0'][] = $seed; + } + + // --------------------------------------------------- + // Make array of all allowed parents + // --------------------------------------------------- + + // Process valid parents + $levelCounter = 1; + + while (((count($parentsArray) < $descendentDepth) || ($descendentDepth == 0)) && ($levelCounter <= count($parentsArray)) && ($levelCounter < 10)){ + + // Find all decendant parents for this level + $pLevel = 'level_'.($levelCounter - 1); + $tempLevelArray = $parentsArray[$pLevel]; + + foreach($tempLevelArray AS $p){ + + // Get children who are parents (isfolder = 1) + $validParentSql = ""; + $validParentSql .= "SELECT id FROM $tblsc sc WHERE "; + $validParentSql .= "isfolder = 1 AND parent = $p "; + $validParentSql .= "AND sc.deleted=0 "; + $validParentSql .= ($seeThruUnpub)? ";" : "AND sc.published = 1;"; + + // Run statement + $rsTempParents = $modx->dbQuery($validParentSql); + // Get number of results + $countTempParents = $modx->recordCount($rsTempParents); + + // If there are results, put them in an array + $tempValidArray = false; + if ($countTempParents){ + for ($i=0;$i<$countTempParents;$i++){ + $tempId = $modx->fetchRow($rsTempParents); + $tempValidArray[] = $tempId['id']; + } // end while + } // end if + + // populate next level of array + if ($tempValidArray){ + foreach($tempValidArray AS $kid){ + $kidLevel = 'level_'.$levelCounter; + $parentsArray[$kidLevel][] = $kid; + } // end foreach + + } // end if + } // end foreach + + // Do next level + $levelCounter++; + + } // end while + + // Finalize list of parents + $validParents = ''; + foreach ($parentsArray AS $level){ + foreach ($level AS $validP){ + $validParents .= $validP . ','; + } + } + + // Remove trailing comma + $validParents = substr($validParents,0,strlen($validParents)-1); + +} else { + $validParents = $_GET['LIn_f']; +} + +// --------------------------------------------------- +// Make appropriate SQL statement to pull recent items +// --------------------------------------------------- + +// get document groups for current user +if($docgrp = $modx->getUserDocGroups()) $docgrp = implode(",",$docgrp); + +$access = " (".($modx->isFrontend() ? "sc.privateweb=0":"1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0"). + (!$docgrp ? "":" OR dg.document_group IN ($docgrp)").") AND "; + +// Initialize +$recentSql = ""; +$recentSql .= "SELECT sc.id, pagetitle, description"; +// Include pub_date or createdon date if date is desired +$recentSql .= ($showCreationDate)? ", IF(pub_date > 0, pub_date, createdon) AS pubDate ": " " ; +$recentSql .= "FROM $tblsc sc LEFT JOIN $tbldg dg on dg.document = sc.id "; +$recentSql .= "WHERE "; +$recentSql .= ($hidePrivate)? $access:""; +// Look everywhere, or just under valid parents +$recentSql .= (($rootFolder == 0) && $seeThruUnpub && ($descendentDepth == 0))? "" : "parent IN ($validParents) AND " ; +// Published +$recentSql .= "sc.published = 1 "; +// Show In Menu +$recentSql .= ($seeShowInMenu)? " " : " AND sc.hidemenu=0 " ; +// Not deleted +$recentSql .= "AND sc.deleted=0 "; +// Choose sort method +switch ($sortBy){ + case 'alpha': + $recentSql .= "ORDER BY pagetitle "; + break; + case 'menuindex': + $recentSql .= "ORDER BY menuindex "; + break; + default: + $recentSql .= "ORDER BY IF(pub_date>0, pub_date, createdon) "; + break; +} +// Provide a sort direction +$recentSql .= $sortDir; + +// If this is a short list, just pull a limited number +$recentSql .= ($mode == 'short')? " LIMIT $shortQty;" : ";" ; + +// Run statement +$rsRecent = $modx->dbQuery($recentSql); +// Count records +$recentLimit = $modx->recordCount($rsRecent); + +// --------------------------------------------------- +// Generate pagination string if needed +// --------------------------------------------------- +$offsetParam = isset($_GET['LIn_o'])? $_GET['LIn_o']: 0; +$offset = ($offsetParam && ($mode == 'full'))? $offsetParam : 0 ; +$pagination = ''; + +// Don't bother unless there are enough records to justify it +if ( ($mode == 'full') && ($recentLimit > $fullQty) && ($fullQty) ){ + $fullUrl = $_SERVER['REQUEST_URI']; + $urlPieces = parse_url($fullUrl); + $urlPath = $urlPieces['path']; + $otherQs = ''; + + if ($urlPieces['query']){ + foreach($_GET AS $qsKey=>$qsValue){ + if (($qsKey != 'LIn_o') && ($qsKey != 'LIn_f')){ + $otherQs .= '&'.$qsKey.'='.$qsValue; + } + } + } + + $fastUrl = $urlPath.'?LIn_f='.$validParents.$otherQs; + + // Determine number of pages needed to show results + $totalPages = ceil($recentLimit/$fullQty); + + // Make links + for ($j = 0 ; $j < $totalPages; $j++){ + // only include links to OTHER pages, not current page + if($offset == $j*$fullQty){ + $pagination .= ''.($j+1) .''; + } else { + $pagination .= ''.($j+1) .''; + } + if ($j < $totalPages-1){ + $pagination .= $pageSeparator; + } + } + + // Make final pagination link set in it's own div + $pagination = '
    '."\n".$pagination."\n
    \n"; + +} + + +// --------------------------------------------------- +// Create title if wanted +// --------------------------------------------------- + +if ($activeTitle){ + $output .= '
    '.$activeTitle.'
    '."\n"; +} + +// --------------------------------------------------- +// Create list of recent items +// --------------------------------------------------- + +// Include pagination +$output .= ($pgPosition == 'top' || $pgPosition == 'both')? $pagination : '' ; + +$output .= '
      ' . $ie; + +$recentCounter = $offset; +if ($mode == 'short') { + $recentCounterLimit = min($shortQty,$recentLimit); +} else { + $recentCounterLimit = ($fullQty)? min(($fullQty+$offset),$recentLimit) : $recentLimit ; +} + +while (($recentCounter < $recentCounterLimit) && $rsRecent && ($recentLimit > 0)){ + mysql_data_seek($rsRecent,$recentCounter); + $recentRecord = $modx->fetchRow($rsRecent); + $output .= '
    • '; + // Link to page + $output .= ''.$recentRecord['pagetitle'].' '; + // Date if desired + if ($showCreationDate){ + $output .= ''.date($dateFormat,$recentRecord['pubDate']).' '; + } + // Description if desired + if ((($mode == 'short') && ($shortDesc)) || (($mode == 'full') && ($fullDesc))){ + $output .= ''.$recentRecord['description'].''; + } + // wrap it up + $output .= '
      • ' . $ie; + $recentCounter ++; +} + +$output .= '
    ' . $ie; + +$output .= ($pgPosition == 'bottom' || $pgPosition == 'both')? $pagination : '' ; + +// --------------------------------------------------- +// Link to index +// --------------------------------------------------- + +if ($linkToIndex) { + + $output .= '
    '; + $output .= ''.$indexText.''; + $output .= '
    '; + +} + +// --------------------------------------------------- +// Send to browser +// --------------------------------------------------- + +return $output; +?> \ No newline at end of file diff --git a/assets/snippets/membercheck/snippet.membercheck.php b/assets/snippets/membercheck/snippet.membercheck.php new file mode 100644 index 0000000000..12d1b924dc --- /dev/null +++ b/assets/snippets/membercheck/snippet.membercheck.php @@ -0,0 +1,137 @@ +insideManager()) { + return ''; # don't go any further when inside manager +} + +if (!isset ($groups)) { + return $debug ? '

    Error: No Group Specified

    ' : ''; +} + +if (!isset ($chunk)) { + return $debug ? '

    Error: No Chunk Specified

    ' : ''; +} + +# turn comma-delimited list of groups into an array +$groups = explode(',', $groups); + +if (!class_exists('MemberCheck')) { + class MemberCheck { + var $allGroups = NULL; + var $debug; + + function getInstance($debug) { + static $instance; + if (!isset ($instance)) { + $instance = new MemberCheck($debug); + } + return $instance; + } + + function MemberCheck($debug = false) { + global $modx; + + $this->debug = $debug; + if ($debug) { + $this->allGroups = array (); + $tableName = $modx->getFullTableName('webgroup_names'); + $sql = "SELECT name FROM $tableName"; + if ($rs = $modx->db->query($sql)) { + while ($row = $modx->db->getRow($rs)) { + array_push($this->allGroups, stripslashes($row['name'])); + } + } + } + } + + function isValidGroup($groupName) { + $isValid = !(array_search($groupName, $this->allGroups) === false); + return $isValid; + } + + function getMemberChunk(& $groups, $chunk) { + global $modx; + $o = ''; + if (is_array($groups)) { + for ($i = 0; $i < count($groups); $i++) { + $groups[$i] = trim($groups[$i]); + if ($this->debug) { + if (!$this->isValidGroup($groups[$i])) { + return "

    The group " . $groups[$i] . " could not be found...

    "; + } + } + } + + $check = $modx->isMemberOfWebGroup($groups); + + $chunkcheck = $modx->getChunk($chunk); + + $o .= ($check && $chunkcheck) ? $chunkcheck : ''; + if (!$chunkcheck) + $o .= $this->debug ? "

    The chunk $chunk not found...

    " : ''; + } else { + $o .= "

    No valid group names were specified!

    "; + } + + return $o; + } + } +} + +$memberCheck = MemberCheck :: getInstance($debug); + +if (!isset ($ph)) { + return $memberCheck->getMemberChunk($groups, $chunk); +} else { + $modx->setPlaceholder($ph, $memberCheck->getMemberChunk($groups, $chunk)); + return ''; +} +?> \ No newline at end of file diff --git a/assets/snippets/personalize/snippet.personalize.php b/assets/snippets/personalize/snippet.personalize.php new file mode 100644 index 0000000000..d15def9681 --- /dev/null +++ b/assets/snippets/personalize/snippet.personalize.php @@ -0,0 +1,163 @@ +isFrontend() && isset ($_SESSION['webValidated'])) $current_context = 'web'; +elseif ($this->isBackend() && isset ($_SESSION['mgrValidated'])) $current_context = 'mgr'; + +$output = ''; +$yesChunk = (isset($yesChunk))? $yesChunk : ''; +$noChunk = (isset($noChunk)) ? $noChunk : ''; +$ph = (isset($ph)) ? $ph : 'username'; +$context = (isset($context)) ? $context : $current_context; +$yesTV = (isset($yesTV)) ? $yesTV : ''; +$noTV = (isset($noTV)) ? $noTV : ''; + +/* +$referer = htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES); +$ua = htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES); +$ip = htmlspecialchars($_SERVER['REMOTE_ADDR'], ENT_QUOTES); +$host = htmlspecialchars($_SERVER['REMOTE_HOST'], ENT_QUOTES); + +$ua_strtolower = strtolower($_SERVER['HTTP_USER_AGENT']); +if (strpos($ua_strtolower, 'firefox') !== false) $browser = 'firefox'; +elseif(strpos($ua_strtolower, 'trident/4.0') !== false) $browser = 'internet explorer 8'; +elseif(strpos($ua_strtolower, 'msie') !== false) $browser = 'internet explorer'; +elseif(strpos($ua_strtolower, 'chrome') !== false) $browser = 'chrome'; +elseif(strpos($ua_strtolower, 'safari') !== false) $browser = 'safari'; +elseif(strpos($ua_strtolower, 'opera') !== false) $browser = 'opera'; +else $browser = 'other'; + +$modx->setPlaceholder('referer', $referer); +$modx->setPlaceholder('ua', $ua); +$modx->setPlaceholder('browser', $browser); +$modx->setPlaceholder('ip', $ip); +$modx->setPlaceholder('host', $host); +*/ + +switch($context) +{ + case 'web': + $short_name = $_SESSION['webShortname']; + $full_name = $_SESSION['webFullname']; + $email = $_SESSION['webEmail']; + $last_login = $_SESSION['webLastlogin']; + break; + case 'mgr': + case 'manager': + $short_name = $_SESSION['mgrShortname']; + $full_name = $_SESSION['mgrFullname']; + $email = $_SESSION['mgrEmail']; + $last_login = $_SESSION['mgrLastlogin']; + break; + default: + $short_name = ''; +} +if (!empty($context)) +{ + if($yesTV !== '') + { + $pre_output = $modx->documentObject[$yesTV]; + if(is_array($pre_output)) + { + $output = $pre_output[1]; + } + else + { + $output = $pre_output; + } + } + elseif($yesChunk !== '') + { + $output = $modx->getChunk($yesChunk); + } + else + { + $output = 'username : ' . $short_name; + } + + if(empty($last_login)) $last_login_text = 'first login'; + else $last_login_text = $modx->toDateFormat($last_login); + + $modx->setPlaceholder($ph,$short_name); + $modx->setPlaceholder('short_name', $short_name); + $modx->setPlaceholder('full_name', $full_name); + $modx->setPlaceholder('email', $email); + $modx->setPlaceholder('last_login', $last_login_text); +} +else +{ + if($noTV !== '') + { + $pre_output = $modx->documentObject[$noTV]; + if(is_array($pre_output)) + { + $output = $pre_output[1]; + } + else + { + $output = $pre_output; + } + } + elseif($noChunk!=='') + { + $output = $modx->getChunk($noChunk); + } + else + { + $output = 'guest'; + } +} +return $output; +?> \ No newline at end of file diff --git a/assets/snippets/ultimateparent/snippet.ultimateparent.php b/assets/snippets/ultimateparent/snippet.ultimateparent.php new file mode 100644 index 0000000000..5d7d8ca246 --- /dev/null +++ b/assets/snippets/ultimateparent/snippet.ultimateparent.php @@ -0,0 +1,49 @@ + + * + * @param &id The id of the document whose parent you want to find. + * @param &top The top node for the search. + * @param &topLevel The top level node for the search (root = level 1) + * + * @license Public Domain, use as you like. + * + * @example [[UltimateParent? &id=`45` &top=`6`]] + * Will find the ultimate parent of document 45 if it is a child of document 6; + * otherwise it will return 45. + * + * @example [[UltimateParent? &topLevel=`2`]] + * Will find the ultimate parent of the current document at a depth of 2 levels + * in the document hierarchy, with the root level being level 1. + * + * This snippet travels up the document tree from a specified document and + * returns the "ultimate" parent. Version 2.0 was rewritten to use the new + * getParentIds function features available only in MODx 0.9.5 or later. + * + * Based on the original UltimateParent 1.x snippet by Susan Ottwell + * . The topLevel parameter was introduced by staed and + * adopted here. + */ +$top= isset ($top) && intval($top) ? $top : 0; +$id= isset ($id) && intval($id) ? intval($id) : $modx->documentIdentifier; +$topLevel= isset ($topLevel) && intval($topLevel) ? intval($topLevel) : 0; +if ($id && $id != $top) { + $pid= $id; + if (!$topLevel || count($modx->getParentIds($id)) >= $topLevel) { + while ($parentIds= $modx->getParentIds($id, 1)) { + $pid= array_pop($parentIds); + if ($pid == $top) { + break; + } + $id= $pid; + if ($topLevel && count($modx->getParentIds($id)) < $topLevel) { + break; + } + } + } +} +return $id; +?> \ No newline at end of file diff --git a/install/assets/snippets/if.tpl b/install/assets/snippets/if.tpl index 15a11a32a0..2aebfee969 100644 --- a/install/assets/snippets/if.tpl +++ b/install/assets/snippets/if.tpl @@ -13,177 +13,4 @@ * @author Created By Bumkaka (bumkaka@yandex.ru) */ -/** -* if snippet -* Date: Jan 03, 2013 -* -* [[if? &is=`[*id*]:is:4:or:[*parent*]:in:5,6,5,7,8,9` &then=`[[if? &is=`0||is||0` &then=`true` &else=`false` &separator=`||`]]` &else=`@TPL:else`]] -* [[if? &is=`[*id*]:is:1:or:[*id*]:is:2:and:[*parent*]:is:5:or:[*parent*]:in:2,3,4` &then=`true` &else=`false`]] -* -* All expressions are logically (....:or:is:.... ) :and: (...:!empty:.....) -* expression and divides the condition into 2 parts, which in the end compared to the true -* -* Sample №1 -* Output action is necessary only in the parent ID = 5 -* [[if? &is=`[*parent*]:is:5` &then=`@TPL:chunk-name`]] -* -* Sample №2 -* Output action is necessary only in the parent ID = 5 or template IDs in (7,8,9) -* [[if? &is=`[*parent*]:is:5:or:[*template*]:in:7,8,9` &then=`@TPL:chunk-name`]] -* -* Sample №3 -* Output action is necessary only in the parent ID = 5 and only the resource with the template ID = 7 -* [[if? &is=`[*parent*]:is:5:and:[*template*]:is:7` &then=`@TPL:chunk-name`]] -* -* Sample №4 -* Output action is necessary only in the parent ID = 5 and (only in the template ID = 7 or in other templates but with TV `new` = 1 -* [[if? &is=`[*parent*]:is:5:and:[*template*]:is:7:or:[*new*]:is:1` &then=`@TPL:chunk-name`]] -* -* Sample №5 -* Output share for the goods with a price in the range of > 300 <= 700 -* [[if? &is=`[*price*]:gt:300:and:[*price*]:lte:700` &then=`@TPL:chunk-name`]] -* -* Sample №6 -* Output in the multiplicity of records Ditto 3 -* [[if? &is=`[+ditto_iteration+]:%:3` &then=`true` &else=`false`]] -* -* Sample №7 -* Output in the multiplicity of records Ditto 3 but by multiplying the -* [[if? &is=`[+ditto_iteration+]*2:%:3` &then=`true` &else=`false` &math=`on`]] -* -* Sample №8 -* Print the value of the mathematical expression -* [[if? &is=`[+ditto_iteration+]*2` &math=`on`]] -* -* Operator: -* (is,=) , (not,!=) , (>,gt) , (<,lt) , (>=,gte) , (lte,<=) , (isempty,empty) , (not_empty,!empty) -* (null, is_null) , (in_array, inarray, in) , (not_in,!in) -* -* More samples -* [[if? &is=`eval('global $iteration;$iteration++;echo $iteration;')` &math=`on`]] // iteration in Ditto,Wayfinder and others -* [[if? &is=`:is:` &then=`@eval: echo str_replace('
    ','','[*pagetitle*]');`]] // 'our
    works' -> 'our works' -* [[if? &is=`:is:` &then=`@eval: echo number_format('[*price*]', 2, ',', ' ');`]] // '1000000,89' -> '1 000 000,89' -* -* RussAndRussky.org.ua -**/ - -$s=empty($separator)?':':$separator; -$opers=explode($s,$is); -$subject=$opers[0]; -$eq=true; -$and=false; -for ($i=1;$i': - case 'gt':$output = ($subject > $operand) ? true : false;$i++; - break; - case '<=': - case 'lte':$output = ($subject <= $operand) ? true : false;$i++; - break; - case '>=': - case 'gte':$output = ($subject >= $operand) ? true : false;$i++; - break; - case 'isempty': - case 'empty':$output = empty($subject) ? true : false; - break; - case '!empty': - case 'notempty': - case 'isnotempty':$output = empty($subject) || $subject == '' ? false : true; - break; - case 'isnull': - case 'null':$output = $subject == null || strtolower($subject) == 'null' ? true : false; - break; - case 'inarray': - case 'in_array': - case 'in': - $operand = explode(',',$operand); - $output = in_array($subject,$operand) ? true : false; - $i++; - break; - case 'not_in': - case '!in': - case '!inarray': - $operand = explode(',',$operand); - $output = in_array($subject,$operand) ? false : true; - $i++; - break; - - case '==': - case '=': - case 'eq': - case 'is': - default: - $output = ((string)$subject == (string)$operand) ? true : false; - $i++; - break; - } - - $eq=$output?$eq:false; - - } - } -} -if ($lp==1){ - if ($left_part) { - if (!empty($part_eq)){ - if ($part_eq||$eq){$output=$then;} - } else { - $output=$eq?$then:$else; - } - } - else - { - $output=$else; - } -} else { - if (!empty($part_eq)){ - if ($part_eq||$eq){ - $output=$then; - } - } else {$output=$eq?$then:$else;} -} -if (strpos($output,'@TPL:')!==FALSE){$output='{{'.(str_replace('@TPL:','',$output)).'}}';} - -if (substr($output,0,6) == "@eval:") { - ob_start(); - eval(substr($output,6)); - $output = ob_get_contents(); - ob_end_clean(); -} -if (empty($then)&&empty($else)) { - if ($math=='on') {eval('$subject='.$subject.';');} - return $subject; -} - -return $output; \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/if/snippet.if.php'; \ No newline at end of file diff --git a/install/assets/snippets/listindexer.tpl b/install/assets/snippets/listindexer.tpl index 214c41497b..9994794fa8 100644 --- a/install/assets/snippets/listindexer.tpl +++ b/install/assets/snippets/listindexer.tpl @@ -4,495 +4,12 @@ * * A flexible way to show the most recent Resources and other Resource lists * - * @category snippet - * @version 1.0.1 - * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) - * @internal @properties - * @internal @modx_category Navigation + * @category snippet + * @version 1.0.1 + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) + * @internal @properties + * @internal @modx_category Navigation * @internal @installset base */ -// added in 1.0.1: hidePrivate (hide items from unauthorized users) -// -// Derived from ListIndex 0.6j by jaredc@honeydewdesign.com -// Now supports Show In Menu -// -// This snippet was designed to be a VERY flexible way -// of showing what has been recently added. You can use -// this snippet to show news from one folder, or what has -// been recently added site wide. You can even show what's -// new in a 'section' (everything under a defined folder)! - -// Configuration Settings - - // Set the following snippet defaults the way you would normally - // use this snippet, then use snippet variables in other situations - // to override the default behaviors. - - // GENERAL OPTIONS - - // $rootFolder [ NULL | string (comma separated page id's) ] - // Decide which folder to pull recent documents from. - // If you want to specify a few folders, comma separate them. - // The default NULL will set current page as root. Using 0 - // would search site wide. Can be set with snippet parameter - // $LIn_root like: - // [[ListIndexer?LIn_root=3,6,88]] - $rootFolder = NULL; - - // $descendentDepth [ int ] - // How many levels below the root folder(s) do you want to - // include? Can be overridden in snippet call with LIn_depth: - // [[ListIndexer?LIn_depth=2]] - // Uncomment one of these common two or create your own: - // $descendentDepth = 1; // just children of root folder(s) - $descendentDepth = 0; // all decendents of root folder(s) - - // $seeThruUnpub [ true | false ] - // When using descendents, do you want to consider files below - // an unpublished (hidden) folder? Usually no. But you decide. - // Snippet parameter: LIn_seeThru - // [[ListIndexer?LIn_seeThru=1]] - $seeThruUnpub = false; - - // $seeShowInMenu [ true | false ] - // When using descendents, do you want to consider files flagged - // to be hidden from the menus? Usually no. But you decide. - // Snippet parameter: LIn_seeShowInMenu - // [[ListIndexer?LIn_seeShowInMenu=1]] - $seeShowInMenu = false; - - // $hidePrivate [ true | false ] - // Hide items from users that don't have appropriate - // rights to view. Usually true. But you decide. - // Snippet parameter: LIn_hidePrivate - // [[ListIndexer?LIn_hidePrivate=0]] - $hidePrivate = true; - - // $mode [ 'short' | 'full' ] - // Defines whether this list should be a full, paged - // list of all documents, or a short list of the most - // recent few (how many will be defined next). Can be - // overridden in snippet call with $LIn_mode: - // [[ListIndexer?LIn_mode=full]] - $mode = 'short'; - - // $sortBy [ 'alpha' | 'date' | 'menuindex' ] - // The default date will sort by most recent items first, but - // by using the 'alpha' option, and using full mode, you could - // use this to create an index, or directory. - // Settable with snippet call $LIn_sort: - // [[ListIndexer?LIn_sort=alpha]] - $sortBy = 'date'; - - // $sortDir [ 'ASC' | 'DESC' ] - // Sort direction ascending or descending. Is applied to whatever $sortBy - // field you have chosen above. If left blank, menuindex and alpha will sort - // ASC and date DESC. - // $LIn_dir in snippet call: - // [[ListIndexer?LIn_dir=ASC&LIn_sortBy=menuindex]] - $sortDir = ''; - - // WHAT TO DISPLAY - - // $defaultTitle [ string ] - // If you want a default title for your list - // you can declare it here. Or use an empty - // string to leave this off. This can be overridden - // in the snippet call with the variable $LIn_title: - // [[ListIndexer?LIn_title=Some new title]] - $defaultTitle = ''; - - // $shortDesc [ true | false ] - // Show the description on the short list, or not. Snippet - // parameter $LIn_sDesc: - // [[ListIndexer?LIn_sDesc=0]] - $shortDesc = true; - - // $fullDesc [ true | false ] - // Show the description on the full list, or not. Snippet - // parameter $LIn_fDesc: - // [[ListIndexer?LIn_fDesc=0]] - $fullDesc = true; - - // $linkToIndex [ int ] - // If you have a page set up as an 'index' for all the - // documents in this list, you can link to it by specifying - // its id- can also be set in snippet call with LIn_link: - // [[ListIndexer?LIn_link=8]] - // The default 0 will eliminate this link - $linkToIndex = 0; - - // $indexText [ string ] - // If you want a link to an index (probably a page running this - // snippet in "full" mode), you can declare what you want that - // link to say here. Or in the snippet call with LIn_indexText: - // [[ListIndexer?LIn_indexText=Financial News Index]] - $indexText = 'Index'; - - // $showCreationDate [ true | false ] - // Decide to include date of creation in output or not. From - // snippet call $LIn_showDate use 1 (true) or 0 (false) - // [[ListIndexer?LIn_showDate=1]] - $showCreationDate = true; - - // $dateFormat [ string ] - // Used to define how date will be displayed (if using date) - // Y = 4 digit year y = 2 digit year - // M = Jan - Dec m = 01 - 12 - // D = Sun - Sat d = 01 -31 - // Other standard PHP characters may be used - $dateFormat = 'Y.m.d'; - - // $shortQty [ int ] - // Number of entries to list in the short list. Can be - // overridden in snippet call with $LIn_sQty: - //[[ListIndexer?LIn_sQty=3]] - $shortQty = 3; - - // PAGING - - // $fullQty [ int ] - // Number of entries PER PAGE to list in the full list - // Can be overridden in snippet call with $LIn_fQty: - // [[ListIndexer?LIn_fQty=20]] - // To show all set to 0 here or in snippet call - $fullQty = 10; - - // $pageSeparator [ string ] - // What you want your page number links to be separated by. - // You NEED to include spaces if you want them. They are NOT - // created automatically to facilitate styling ability. - // For instance, " | " will render links like: - // 1 | 2 | 3 | 4 - $pageSeparator = " | "; - - // $pgPosition [ 'top' | 'bottom' | 'both'] - // Pick where you want your pagination links to appear. - $pgPosition = 'both'; - - // PERFORMANCE - - // $useFastUrls [ true | false ] - // IMPORTANT- using fast urls will reduce database queries - // and improve performance WHEN IN FULL MODE ONLY and - // should NOT be used when multiple instances of this snippet - // appear on the same page. With snippet call LIn_fast use 1 - // (true) or 0 (false) - // [[ListIndexer?LIn_fast=0]] - $useFastUrls = false; - - // $newLinesForLists [ true | false ] - // Depending on how you want to style your list, you may - // or may not want your
  • '.$_lang['cancel'].'
    • - +
    '.$_lang['plugin_priority'].'

    '.$_lang['plugin_priority_instructions'].'

    @@ -180,5 +180,6 @@ function save() { echo '
    +
    '; ?> \ No newline at end of file From 55e709d205f441ce7dc774deddca2f7fb2c97277 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 02:23:08 +0900 Subject: [PATCH 310/530] Fix --- manager/actions/mutate_plugin.dynamic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index e11c3e8b5a..584be80334 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -419,7 +419,7 @@ function decode(s){ echo "
    "; echo "".$row['groupname'].""; } - $evtnames[] = ''."\n"; + $evtnames[] = ''."\n"; if(count($evtnames)==2) echoEventRows($evtnames); } if(count($evtnames)>0) echoEventRows($evtnames); From 251ee2ff74549eb27da7cac1affca8568fc1f756 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 02:25:06 +0900 Subject: [PATCH 311/530] Bug #10119 Fix - Table structure upgrade sql http://tracker.modx.com/issues/10119 --- install/setup.sql | 329 ++++++++++++++++++---------------------------- 1 file changed, 126 insertions(+), 203 deletions(-) diff --git a/install/setup.sql b/install/setup.sql index 00c4618d29..5b384dd305 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -533,252 +533,169 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}web_user_settings` ( # For backward compatibilty with early versions #:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -ALTER TABLE `{PREFIX}web_users` ADD COLUMN `cachepwd` varchar(100) NOT NULL default '' COMMENT 'Store new unconfirmed password' AFTER `password`; - - -ALTER TABLE `{PREFIX}site_tmplvars` ADD COLUMN `editor_type` integer NOT NULL DEFAULT '0' COMMENT '0-plain text,1-rich text,2-code editor' AFTER `description`, - ADD COLUMN `category` integer NOT NULL DEFAULT '0' COMMENT 'category id' AFTER `editor_type`; - - -ALTER TABLE `{PREFIX}site_tmplvars` MODIFY COLUMN `name` varchar(50) NOT NULL default ''; - - -ALTER TABLE `{PREFIX}site_tmplvars` ADD INDEX `indx_rank`(`rank`); - - -ALTER TABLE `{PREFIX}site_content` ADD INDEX `aliasidx` (alias); - - -ALTER TABLE `{PREFIX}site_content` ADD COLUMN `introtext` text COMMENT 'Used to provide quick summary of the document' AFTER `isfolder`; - - -ALTER TABLE `{PREFIX}site_content` ADD COLUMN `menutitle` varchar(255) NOT NULL default '' COMMENT 'Menu title' AFTER `deletedby`, - ADD COLUMN `donthit` tinyint(1) NOT NULL default '0' COMMENT 'Disable page hit count' AFTER `menutitle`, - ADD COLUMN `haskeywords` tinyint(1) NOT NULL default '0' COMMENT 'has links to keywords' AFTER `donthit`, - ADD COLUMN `hasmetatags` tinyint(1) NOT NULL default '0' COMMENT 'has links to meta tags' AFTER `haskeywords`, - ADD COLUMN `privateweb` tinyint(1) NOT NULL default '0' COMMENT 'Private web document' AFTER `hasmetatags`, - ADD COLUMN `privatemgr` tinyint(1) NOT NULL default '0' COMMENT 'Private manager document' AFTER `privateweb`; - - -ALTER TABLE `{PREFIX}site_content` ADD COLUMN `content_dispo` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0-inline, 1-attachment' AFTER `privatemgr`; - - -ALTER TABLE `{PREFIX}site_content` ADD COLUMN `hidemenu` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Hide document from menu' AFTER `content_dispo`; - +# 090-091 ALTER TABLE `{PREFIX}site_content` ADD COLUMN `publishedon` int(20) NOT NULL DEFAULT '0' COMMENT 'Date the document was published' AFTER `deletedby`; - ALTER TABLE `{PREFIX}site_content` ADD COLUMN `publishedby` int(10) NOT NULL DEFAULT '0' COMMENT 'ID of user who published the document' AFTER `publishedon`; +ALTER TABLE `{PREFIX}site_plugins` MODIFY COLUMN `properties` text COMMENT 'Default Properties'; -ALTER TABLE `{PREFIX}site_plugins` ADD COLUMN `editor_type` integer NOT NULL DEFAULT '0' COMMENT '0-plain text,1-rich text,2-code editor' AFTER `description`, - ADD COLUMN `category` integer NOT NULL DEFAULT '0' COMMENT 'category id' AFTER `editor_type`, - ADD COLUMN `cache_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'cache option' AFTER `category`; - - -ALTER TABLE `{PREFIX}site_plugins` ADD COLUMN `disabled` tinyint NOT NULL DEFAULT '0' COMMENT 'Disables the plugin' AFTER `properties`; - - -ALTER TABLE `{PREFIX}site_plugins` ADD COLUMN `moduleguid` varchar(32) NOT NULL DEFAULT '' COMMENT 'GUID of module from which to import shared parameters' AFTER `disabled`; - - -ALTER TABLE `{PREFIX}site_htmlsnippets` ADD COLUMN `editor_type` integer NOT NULL DEFAULT '0' COMMENT '0-plain text,1-rich text,2-code editor' AFTER `description`, - ADD COLUMN `category` integer NOT NULL DEFAULT '0' COMMENT 'category id' AFTER `editor_type`, - ADD COLUMN `cache_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'cache option' AFTER `category`; - - -ALTER TABLE `{PREFIX}site_snippets` ADD COLUMN `editor_type` integer NOT NULL DEFAULT '0' COMMENT '0-plain text,1-rich text,2-code editor' AFTER `description`, - ADD COLUMN `category` integer NOT NULL DEFAULT '0' COMMENT 'category id' AFTER `editor_type`, - ADD COLUMN `cache_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'cache option' AFTER `category`; - - -ALTER TABLE `{PREFIX}site_snippets` ADD COLUMN `properties` varchar(255) NOT NULL default '' COMMENT 'Default Properties' AFTER `locked`; - - -ALTER TABLE `{PREFIX}site_snippets` ADD COLUMN `moduleguid` varchar(32) NOT NULL default '' COMMENT 'GUID of module from which to import shared parameters' AFTER `properties`; +ALTER TABLE `{PREFIX}site_snippets` MODIFY COLUMN `properties` text COMMENT 'Default Properties'; +ALTER TABLE `{PREFIX}site_tmplvar_templates` + DROP INDEX `idx_tmplvarid`, + DROP INDEX `idx_templateid`, + ADD PRIMARY KEY (`tmplvarid`, `templateid`); -ALTER TABLE `{PREFIX}site_templates` ADD COLUMN `editor_type` integer NOT NULL DEFAULT '0' COMMENT '0-plain text,1-rich text,2-code editor' AFTER `description`, - ADD COLUMN `category` integer NOT NULL DEFAULT '0' COMMENT 'category id' AFTER `editor_type`, - ADD COLUMN `icon` varchar(255) NOT NULL default '' COMMENT 'url to icon file' AFTER `category`, - ADD COLUMN `template_type` integer NOT NULL DEFAULT '0' COMMENT '0-page,1-content' AFTER `icon`; +ALTER TABLE `{PREFIX}user_roles` ADD COLUMN `view_unpublished` int(1) NOT NULL DEFAULT '0' AFTER `web_access_permissions`; +#091-092 -ALTER TABLE `{PREFIX}document_groups` DROP INDEX `indx_doc_groups`; +#092-095 +ALTER TABLE `{PREFIX}categories` MODIFY COLUMN `category` varchar(45) NOT NULL DEFAULT ''; -ALTER TABLE `{PREFIX}document_groups` ADD INDEX `document` (`document`); +ALTER TABLE `{PREFIX}categories` MODIFY COLUMN `category` varchar(45) NOT NULL DEFAULT ''; +ALTER TABLE `{PREFIX}event_log` MODIFY COLUMN `source` varchar(50) NOT NULL DEFAULT ''; -ALTER TABLE `{PREFIX}document_groups` ADD INDEX `document_group` (`document_group`); +ALTER TABLE `{PREFIX}event_log` MODIFY COLUMN `description` text; +ALTER TABLE `{PREFIX}manager_users` MODIFY COLUMN `username` varchar(100) NOT NULL DEFAULT ''; -ALTER TABLE `{PREFIX}system_settings` MODIFY COLUMN `setting_value` text; +ALTER TABLE `{PREFIX}site_content` + MODIFY COLUMN `pagetitle` varchar(255) NOT NULL default '', + MODIFY COLUMN `alias` varchar(255) default '', + MODIFY COLUMN `introtext` text COMMENT 'Used to provide quick summary of the document', + MODIFY COLUMN `content` mediumtext, + MODIFY COLUMN `menutitle` varchar(255) NOT NULL DEFAULT '' COMMENT 'Menu title'; +ALTER TABLE `{PREFIX}site_content` ADD COLUMN `link_attributes` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link attriubtes' AFTER `alias`; -ALTER TABLE `{PREFIX}site_plugins` MODIFY COLUMN `properties` text; +ALTER TABLE `{PREFIX}site_htmlsnippets` MODIFY COLUMN `snippet` mediumtext; +ALTER TABLE `{PREFIX}site_modules` + MODIFY COLUMN `name` varchar(50) NOT NULL DEFAULT '', + MODIFY COLUMN `disabled` tinyint(4) NOT NULL DEFAULT '0', + MODIFY COLUMN `icon` varchar(255) NOT NULL DEFAULT '' COMMENT 'url to module icon', + MODIFY COLUMN `resourcefile` varchar(255) NOT NULL DEFAULT '' COMMENT 'a physical link to a resource file', + MODIFY COLUMN `createdon` int(11) NOT NULL DEFAULT '0', + MODIFY COLUMN `editedon` int(11) NOT NULL DEFAULT '0', + MODIFY COLUMN `guid` varchar(32) NOT NULL DEFAULT '' COMMENT 'globally unique identifier', + MODIFY COLUMN `properties` text, + MODIFY COLUMN `modulecode` mediumtext COMMENT 'module boot up code'; -ALTER TABLE `{PREFIX}site_snippets` MODIFY COLUMN `properties` text; +ALTER TABLE `{PREFIX}site_module_access` + MODIFY COLUMN `module` int(11) NOT NULL DEFAULT '0', + MODIFY COLUMN `usergroup` int(11) NOT NULL DEFAULT '0'; +ALTER TABLE `{PREFIX}site_module_depobj` + MODIFY COLUMN `module` int(11) NOT NULL DEFAULT '0', + MODIFY COLUMN `resource` int(11) NOT NULL DEFAULT '0'; -ALTER TABLE `{PREFIX}system_eventnames` ADD COLUMN `groupname` varchar(20) NOT NULL default '' AFTER `service`; +ALTER TABLE `{PREFIX}site_plugins` + MODIFY COLUMN `plugincode` mediumtext, + MODIFY COLUMN `moduleguid` varchar(32) NOT NULL DEFAULT '' COMMENT 'GUID of module from which to import shared parameters'; +ALTER TABLE `{PREFIX}site_plugin_events` + MODIFY COLUMN `evtid` int(10) NOT NULL DEFAULT '0'; -ALTER TABLE `{PREFIX}documentgroup_names` - ADD COLUMN `private_memgroup` tinyint DEFAULT '0' COMMENT 'determine whether the document group is private to manager users' AFTER `name`, - ADD COLUMN `private_webgroup` tinyint DEFAULT '0' COMMENT 'determines whether the document is private to web users' AFTER `private_memgroup`; +ALTER TABLE `{PREFIX}site_plugin_events` ADD COLUMN `priority` INT(10) NOT NULL default '0' COMMENT 'determines the run order of the plugin' AFTER `evtid`; +ALTER TABLE `{PREFIX}site_snippets` + MODIFY COLUMN `snippet` mediumtext, + MODIFY COLUMN `moduleguid` varchar(32) NOT NULL DEFAULT '' COMMENT 'GUID of module from which to import shared parameters'; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `bk_manager` int(1) NOT NULL DEFAULT '0' AFTER `access_permissions`; +ALTER TABLE `{PREFIX}site_templates` + MODIFY COLUMN `icon` varchar(255) NOT NULL default '' COMMENT 'url to icon file', + MODIFY COLUMN `content` mediumtext; +ALTER TABLE `{PREFIX}site_tmplvars` + MODIFY COLUMN `name` varchar(50) NOT NULL default '', + MODIFY COLUMN `elements` text, + MODIFY COLUMN `display` varchar(20) NOT NULL DEFAULT '' COMMENT 'Display Control', + MODIFY COLUMN `display_params` text COMMENT 'Display Control Properties', + MODIFY COLUMN `default_text` text; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `new_plugin` int(1) NOT NULL DEFAULT '0' AFTER `bk_manager`, - ADD COLUMN `edit_plugin` int(1) NOT NULL DEFAULT '0' AFTER `new_plugin`, - ADD COLUMN `save_plugin` int(1) NOT NULL DEFAULT '0' AFTER `edit_plugin`, - ADD COLUMN `delete_plugin` int(1) NOT NULL DEFAULT '0' AFTER `save_plugin`; +ALTER TABLE `{PREFIX}site_tmplvar_contentvalues` + MODIFY COLUMN `tmplvarid` int(10) NOT NULL DEFAULT '0' COMMENT 'Template Variable id', + MODIFY COLUMN `value` text; +ALTER TABLE `{PREFIX}site_tmplvar_templates` MODIFY COLUMN `tmplvarid` int(10) NOT NULL DEFAULT '0' COMMENT 'Template Variable id'; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `new_module` int(1) NOT NULL DEFAULT '0' AFTER `delete_plugin`, - ADD COLUMN `edit_module` int(1) NOT NULL DEFAULT '0' AFTER `new_module`, - ADD COLUMN `save_module` int(1) NOT NULL DEFAULT '0' AFTER `edit_module`, - ADD COLUMN `delete_module` int(1) NOT NULL DEFAULT '0' AFTER `save_module`, - ADD COLUMN `exec_module` int(1) NOT NULL DEFAULT '0' AFTER `delete_module`; +ALTER TABLE `{PREFIX}site_tmplvar_templates` ADD COLUMN `rank` integer(11) NOT NULL DEFAULT '0' AFTER `templateid`; +ALTER TABLE `{PREFIX}system_eventnames` + MODIFY COLUMN `name` varchar(50) NOT NULL DEFAULT '', + MODIFY COLUMN `service` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'System Service number'; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `view_eventlog` int(1) NOT NULL DEFAULT '0' AFTER `exec_module`, - ADD COLUMN `delete_eventlog` int(1) NOT NULL DEFAULT '0' AFTER `view_eventlog`, - ADD COLUMN `manage_metatags` int(1) NOT NULL DEFAULT '0' AFTER `delete_eventlog`, - ADD COLUMN `edit_doc_metatags` int(1) NOT NULL DEFAULT '0' AFTER `manage_metatags`; +ALTER TABLE `{PREFIX}system_settings` MODIFY COLUMN `setting_value` text; +ALTER TABLE `{PREFIX}user_attributes` + MODIFY COLUMN `country` varchar(5) NOT NULL DEFAULT '', + MODIFY COLUMN `state` varchar(25) NOT NULL DEFAULT '', + MODIFY COLUMN `zip` varchar(25) NOT NULL DEFAULT '', + MODIFY COLUMN `fax` varchar(100) NOT NULL DEFAULT '', + MODIFY COLUMN `photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'link to photo', + MODIFY COLUMN `comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'short comment'; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `new_web_user` int(1) NOT NULL DEFAULT '0' AFTER `edit_doc_metatags`, - ADD COLUMN `edit_web_user` int(1) NOT NULL DEFAULT '0' AFTER `new_web_user`, - ADD COLUMN `save_web_user` int(1) NOT NULL DEFAULT '0' AFTER `edit_web_user`, - ADD COLUMN `delete_web_user` int(1) NOT NULL DEFAULT '0' AFTER `save_web_user`; +ALTER TABLE `{PREFIX}user_settings` MODIFY COLUMN `setting_value` text; +ALTER TABLE `{PREFIX}user_messages` MODIFY COLUMN `message` text; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `web_access_permissions` int(1) NOT NULL DEFAULT '0' AFTER `delete_web_user`, - ADD COLUMN `view_unpublished` int(1) NOT NULL DEFAULT '0'AFTER `web_access_permissions`; +ALTER TABLE `{PREFIX}user_roles` ADD COLUMN `publish_document` int(1) NOT NULL DEFAULT '0' AFTER `save_document`; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `publish_document` int(1) NOT NULL DEFAULT '0' AFTER `save_document`; +ALTER TABLE `{PREFIX}web_users` + MODIFY COLUMN `username` varchar(100) NOT NULL DEFAULT '', + MODIFY COLUMN `cachepwd` varchar(100) NOT NULL DEFAULT '' COMMENT 'Store new unconfirmed password' AFTER `password`; +ALTER TABLE `{PREFIX}web_user_attributes` + MODIFY COLUMN `country` varchar(25) NOT NULL DEFAULT '', + MODIFY COLUMN `zip` varchar(25) NOT NULL DEFAULT '', + MODIFY COLUMN `fax` varchar(100) NOT NULL DEFAULT '', + MODIFY COLUMN `photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'link to photo'; -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `new_chunk` int(1) NOT NULL DEFAULT '0' AFTER `delete_snippet`, - ADD COLUMN `edit_chunk` int(1) NOT NULL DEFAULT '0' AFTER `new_chunk`, - ADD COLUMN `save_chunk` int(1) NOT NULL DEFAULT '0' AFTER `edit_chunk`, - ADD COLUMN `delete_chunk` int(1) NOT NULL DEFAULT '0' AFTER `save_chunk`; +ALTER TABLE `{PREFIX}web_user_settings` MODIFY COLUMN `setting_value` text; +#095-096 ALTER TABLE `{PREFIX}user_roles` + ADD COLUMN `edit_chunk` int(1) NOT NULL DEFAULT '0' AFTER `delete_snippet`, + ADD COLUMN `new_chunk` int(1) NOT NULL DEFAULT '0' AFTER `edit_chunk`, + ADD COLUMN `save_chunk` int(1) NOT NULL DEFAULT '0' AFTER `new_chunk`, + ADD COLUMN `delete_chunk` int(1) NOT NULL DEFAULT '0' AFTER `save_chunk`, ADD COLUMN `import_static` int(1) NOT NULL DEFAULT '0' AFTER `view_unpublished`, ADD COLUMN `export_static` int(1) NOT NULL DEFAULT '0' AFTER `import_static`; - -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `empty_trash` int(1) NOT NULL DEFAULT '0' AFTER `delete_document`; - - -ALTER TABLE `{PREFIX}user_attributes` ADD COLUMN `dob` integer(10) NOT NULL DEFAULT 0 AFTER `sessionid`, - ADD COLUMN `gender` integer(1) NOT NULL DEFAULT 0 COMMENT '0 - unknown, 1 - Male 2 - female' AFTER `dob`, - ADD COLUMN `country` varchar(5) NOT NULL DEFAULT '' AFTER `gender`, - ADD COLUMN `state` varchar(5) NOT NULL DEFAULT '' AFTER `country`, - ADD COLUMN `zip` varchar(5) NOT NULL DEFAULT '' AFTER `state`, - ADD COLUMN `fax` varchar(100) NOT NULL DEFAULT '' AFTER `zip`, - ADD COLUMN `blockedafter` integer(11) NOT NULL DEFAULT 0 AFTER `blockeduntil`, - ADD COLUMN `photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'link to photo' AFTER `fax`, - ADD COLUMN `comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'short comment' AFTER `photo`; - - -ALTER TABLE `{PREFIX}web_users` - MODIFY COLUMN `username` varchar(100) NOT NULL DEFAULT ''; - - -ALTER TABLE `{PREFIX}web_user_attributes` ADD COLUMN `dob` integer(10) NOT NULL DEFAULT 0 AFTER `sessionid`, - ADD COLUMN `gender` integer(1) NOT NULL DEFAULT 0 COMMENT '0 - unknown, 1 - Male 2 - female' AFTER `dob`, - ADD COLUMN `country` varchar(5) NOT NULL DEFAULT '' AFTER `gender`, - ADD COLUMN `state` varchar(5) NOT NULL DEFAULT '' AFTER `country`, - ADD COLUMN `zip` varchar(5) NOT NULL DEFAULT '' AFTER `state`, - ADD COLUMN `fax` varchar(100) NOT NULL DEFAULT '' AFTER `zip`, - ADD COLUMN `blockedafter` integer(11) NOT NULL DEFAULT 0 AFTER `blockeduntil`, - ADD COLUMN `photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'link to photo' AFTER `fax`, - ADD COLUMN `comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'short comment' AFTER `photo`, +ALTER TABLE `{PREFIX}web_user_attributes` MODIFY COLUMN `state` varchar(25) NOT NULL DEFAULT '', MODIFY COLUMN `zip` varchar(25) NOT NULL DEFAULT ''; +#096-0961 -ALTER TABLE `{PREFIX}user_roles` ADD COLUMN `view_unpublished` int(1) NOT NULL DEFAULT '0' AFTER `web_access_permissions`; - -ALTER TABLE `{PREFIX}site_tmplvar_templates` DROP INDEX `idx_tmplvarid`, - DROP INDEX `idx_templateid`, - ADD PRIMARY KEY ( `tmplvarid` , `templateid` ); - - -ALTER TABLE `{PREFIX}site_content` - MODIFY COLUMN `pagetitle` varchar(255) NOT NULL default '', - MODIFY COLUMN `alias` varchar(255) default '', - MODIFY COLUMN `menutitle` varchar(255) NOT NULL DEFAULT '' COMMENT 'Menu title'; - - -ALTER TABLE `{PREFIX}site_content` ADD COLUMN `link_attributes` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link attriubtes' AFTER `alias`; - - -ALTER TABLE `{PREFIX}site_plugin_events` ADD COLUMN `priority` INT(10) NOT NULL default 0 COMMENT 'determines the run order of the plugin' AFTER `evtid`; - - -ALTER TABLE `{PREFIX}site_tmplvar_templates` ADD COLUMN `rank` integer(11) NOT NULL DEFAULT '0' AFTER `templateid`; - - -ALTER TABLE `{PREFIX}manager_users` MODIFY COLUMN `username` varchar(100) NOT NULL DEFAULT ''; - - -ALTER TABLE `{PREFIX}user_settings` MODIFY COLUMN `setting_value` text; - - -ALTER TABLE `{PREFIX}web_user_settings` MODIFY COLUMN `setting_value` text; - +#0961-0963 -ALTER TABLE `{PREFIX}user_attributes` - MODIFY COLUMN `state` varchar(25) NOT NULL default '', - MODIFY COLUMN `zip` varchar(25) NOT NULL default '', - MODIFY COLUMN `comment` text; +ALTER TABLE `{PREFIX}user_roles` ADD COLUMN `empty_trash` int(1) NOT NULL DEFAULT '0' AFTER `delete_document`; +#0963-1.0.0 -ALTER TABLE `{PREFIX}site_metatags` - MODIFY COLUMN `name` varchar(50) NOT NULL DEFAULT '', - MODIFY COLUMN `tag` varchar(50) NOT NULL DEFAULT '' COMMENT 'tag name', - MODIFY COLUMN `tagvalue` varchar(255) NOT NULL DEFAULT ''; +#1.0.3-1.0.4 +ALTER TABLE `{PREFIX}user_roles` ADD COLUMN `remove_locks` int(1) NOT NULL DEFAULT '0'; -ALTER TABLE `{PREFIX}web_user_attributes` - MODIFY COLUMN `state` varchar(25) NOT NULL default '', - MODIFY COLUMN `zip` varchar(25) NOT NULL default '', - MODIFY COLUMN `comment` text; - +#1.0.4-1.0.5 -ALTER TABLE `{PREFIX}user_roles` - ADD COLUMN `remove_locks` int(1) NOT NULL DEFAULT '0'; +ALTER TABLE `{PREFIX}member_groups` ADD UNIQUE INDEX `ix_group_member` (`user_group`,`member`); +ALTER TABLE `{PREFIX}user_attributes` MODIFY COLUMN `comment` text; -ALTER TABLE `{PREFIX}member_groups` - ADD UNIQUE INDEX `ix_group_member` (`user_group`,`member`); - - -ALTER TABLE `{PREFIX}web_groups` - ADD UNIQUE INDEX `ix_group_user` (`webgroup`,`webuser`); +ALTER TABLE `{PREFIX}web_groups` ADD UNIQUE INDEX `ix_group_user` (`webgroup`,`webuser`); +ALTER TABLE `{PREFIX}web_user_attributes` MODIFY COLUMN `comment` text; # Set the private manager group flag + UPDATE {PREFIX}documentgroup_names AS dgn LEFT JOIN {PREFIX}membergroup_access AS mga ON mga.documentgroup = dgn.id LEFT JOIN {PREFIX}webgroup_access AS wga ON wga.documentgroup = dgn.id @@ -788,45 +705,51 @@ UPDATE {PREFIX}documentgroup_names AS dgn UPDATE `{PREFIX}site_plugins` SET `disabled` = '1' WHERE `name` IN ('Bottom Button Bar'); - UPDATE `{PREFIX}site_plugins` SET `disabled` = '1' WHERE `name` IN ('Inherit Parent Template'); - UPDATE `{PREFIX}system_settings` SET `setting_value` = '' WHERE `setting_name` = 'settings_version'; - UPDATE `{PREFIX}system_settings` SET `setting_value` = '0' WHERE `setting_name` = 'validate_referer' AND `setting_value` = '00'; - # start related to #MODX-1321 - UPDATE `{PREFIX}site_content` SET `type`='reference', `contentType`='text/html' WHERE `type`='' AND `content` REGEXP '^https?://([-\w\.]+)+(:\d+)?/?'; - UPDATE `{PREFIX}site_content` SET `type`='document', `contentType`='text/xml' WHERE `type`='' AND `alias` REGEXP '[.period.](rss|xml)$'; - UPDATE `{PREFIX}site_content` SET `type`='document', `contentType`='text/javascript' WHERE `type`='' AND `alias` REGEXP '[.period.]js$'; - UPDATE `{PREFIX}site_content` SET `type`='document', `contentType`='text/css' WHERE `type`='' AND `alias` REGEXP '[.period.]css$'; - UPDATE `{PREFIX}site_content` SET `type`='document', `contentType`='text/html' WHERE `type`=''; +#1.0.5-1.0.6 -ALTER TABLE `{PREFIX}user_attributes` - ADD COLUMN `street` varchar(255) NOT NULL DEFAULT '' AFTER `country`, - ADD COLUMN `city` varchar(255) NOT NULL DEFAULT '' AFTER `street`; +ALTER TABLE `{PREFIX}site_content` MODIFY COLUMN `template` int(10) NOT NULL default '0'; +ALTER TABLE `{PREFIX}site_content` ADD INDEX `typeidx` (`type`); -ALTER TABLE `{PREFIX}web_user_attributes` - ADD COLUMN `street` varchar(255) NOT NULL DEFAULT '' AFTER `country`, - ADD COLUMN `city` varchar(255) NOT NULL DEFAULT '' AFTER `street`; +ALTER TABLE `{PREFIX}system_settings` DROP PRIMARY KEY; + +ALTER TABLE `{PREFIX}system_settings` DROP INDEX `setting_name`; + +ALTER TABLE `{PREFIX}system_settings` ADD PRIMARY KEY (`setting_name`); + +ALTER TABLE `{PREFIX}user_settings` DROP PRIMARY KEY; + +ALTER TABLE `{PREFIX}user_settings` ADD PRIMARY KEY (`user`, `setting_name`); + +ALTER TABLE `{PREFIX}web_user_settings` DROP PRIMARY KEY; + +ALTER TABLE `{PREFIX}web_user_settings` ADD PRIMARY KEY (`webuser`, `setting_name`); + +ALTER TABLE `{PREFIX}site_plugin_events` DROP PRIMARY KEY; + +ALTER TABLE `{PREFIX}site_plugin_events` ADD PRIMARY KEY (`pluginid`, `evtid`); +ALTER TABLE `{PREFIX}active_users` MODIFY COLUMN `ip` varchar(50) NOT NULL DEFAULT ''; -# end related to #MODX-1321 +ALTER TABLE `{PREFIX}site_tmplvar_contentvalues` ADD FULLTEXT `value_ft_idx` (`value`); # ]]upgrade-able @@ -849,7 +772,7 @@ REPLACE INTO `{PREFIX}site_templates` # Default Site Documents -REPLACE INTO `{PREFIX}site_content` VALUES (1,'document','text/html','MODX CMS Install Success','Welcome to the MODX Content Management System','','minimal-base','',1,0,0,0,0,'','

    Install Successful!

    \r\n

    You have successfully installed MODX.

    \r\n\r\n

    Getting Help

    \r\n

    The MODX Community provides a great starting point to learn all things MODX, or you can also see some great learning resources (books, tutorials, blogs and screencasts).

    \r\n

    Welcome to MODX!

    \r\n',1,3,0,1,1,1,1130304721,1,1130304927,0,0,0,1130304721,1,'Base Install',0,0,0,0,0,0,0); +REPLACE INTO `{PREFIX}site_content` VALUES (1,'document','text/html','MODX CMS Install Success','Welcome to the MODX Content Management System','','minimal-base','',1,0,0,0,0,'','

    Install Successful!

    \r\n

    You have successfully installed MODX.

    \r\n\r\n

    Getting Help

    \r\n

    The MODX Community provides a great starting point to learn all things MODX, or you can also see some great learning resources (books, tutorials, blogs and screencasts).

    \r\n

    Welcome to MODX!

    \r\n',1,3,0,1,1,1,1130304721,1,1130304927,0,0,0,1130304721,1,'Base Install',0,0,0,0,0,0,0); REPLACE INTO `{PREFIX}manager_users` From 0537df13c34af0ba23ef64cb27fe1fa91c75da76 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 02:52:35 +0900 Subject: [PATCH 312/530] Fix --- manager/actions/help.static.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/help.static.php b/manager/actions/help.static.php index bd5c5ea3ce..2f2f625c4b 100644 --- a/manager/actions/help.static.php +++ b/manager/actions/help.static.php @@ -36,7 +36,7 @@ echo '
    '; echo '

    '.$helpname.'

    '; echo ''; - include_once(MODX_BASE_PATH . "assets/templates/help/{$v}"; + include_once(MODX_BASE_PATH . "assets/templates/help/{$v}"); echo '
    '; } ?> From 68517ce8b76efb667d8684e5e7e27fe2dcf431d6 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 02:52:43 +0900 Subject: [PATCH 313/530] Small fix --- manager/actions/document_data.static.php | 1 - 1 file changed, 1 deletion(-) diff --git a/manager/actions/document_data.static.php b/manager/actions/document_data.static.php index 7fc1267708..859115961a 100644 --- a/manager/actions/document_data.static.php +++ b/manager/actions/document_data.static.php @@ -273,7 +273,6 @@ function movedocument() { -
  • s on new lines. Generally, if you - // are displaying then inline (horizontal, you do not want new - // lines, but standard vertical block styling you do. This is - // for IE, real browsers don't care. - $newLinesForLists = true; - -// Styles -// -// The following are the styles included in this snippet. It is up -// to you to include these styles in your stylesheet to get them to -// look the way you want. - - // div.LIn_title {} List title div - // ul.LIn_fullMode {} UL class - // ul.LIn_shortMode {} UL class - // span.LIn_date {} Span surrounding pub/created date - // span.LIn_desc {} Span surrounding description - // div.LIn_pagination Div surrounding pagination links - // span.LIn_currentPage {} Span surrounding current page of - // pagination (which wouldn't be css-able - // by virtue of its tag) - - -// ********************************************************************** -// END CONFIG SETTINGS -// THE REST SHOULD TAKE CARE OF ITSELF -// ********************************************************************** - -// Take care of IE list issue -$ie = ($newLinesForLists)? "\n" : '' ; - -// Use snippet call defined variables if set -$activeTitle = (isset($LIn_title))? $LIn_title : $defaultTitle ; -$mode = (isset($LIn_mode))? $LIn_mode : $mode ; -$descendentDepth = (isset($LIn_depth))? $LIn_depth : $descendentDepth ; -$seeThruUnpub = (isset($LIn_seeThru))? $LIn_seeThru : $seeThruUnpub ; -$seeShowInMenu = (isset($LIn_seeShowInMenu))? $LIn_seeShowInMenu : $seeShowInMenu ; -$hidePrivate = (isset($LIn_hidePrivate))? $LIn_hidePrivate : $hidePrivate; -$linkToIndex = (isset($LIn_link))? $LIn_link : $linkToIndex ; -$rootFolder = (isset($LIn_root))? $LIn_root : $rootFolder ; -$shortQty = (isset($LIn_sQty))? $LIn_sQty : $shortQty ; -$fullQty = (isset($LIn_fQty))? $LIn_fQty : $fullQty ; -$showCreationDate = (isset($LIn_showDate))? $LIn_showDate : $showCreationDate ; -$indexText = (isset($LIn_indexText))? $LIn_indexText : $indexText ; -$useFastUrls = (isset($LIn_fast))? $LIn_fast : $useFastUrls ; -$sortBy = (isset($LIn_sort))? $LIn_sort : $sortBy; -$shortDesc = (isset($LIn_sDesc))? $LIn_sDesc : $shortDesc ; -$fullDesc = (isset($LIn_fDesc))? $LIn_fDesc : $fullDesc ; -$sortDir = (isset($LIn_dir))? $LIn_dir : $sortDir ; -if ($sortDir == '') $sortDir = ($sortBy == 'date')? 'DESC' : 'ASC' ; - - -// Make useful variable shortcut for the content table -//$tbl = $modx->dbConfig['dbase'] . "." . $modx->dbConfig['table_prefix'] . "site_content"; -$tblsc = $modx->getFullTableName("site_content"); -$tbldg = $modx->getFullTableName("document_groups"); - -// Initialize output -$output = ''; - -// --------------------------------------------------- -// --------------------------------------------------- -// Query db for parent folders, or not. First check to -// see if a querystring cheat has been provided- this -// should speed things up considerably when using this -// in full mode. (a.k.a. fastUrls) -// --------------------------------------------------- -// --------------------------------------------------- -$inFolder= isset($_GET['LIn_f'])? $_GET['LIn_f']: 0; -if ((!$inFolder && $useFastUrls) || !$useFastUrls ){ - // Only run all the database queries if we don't already - // know the folders AND fastUrls are desired. - - // --------------------------------------------------- - // Seed list of viable parents - // --------------------------------------------------- - - if ($rootFolder == NULL){ - $rootFolder = $modx->documentIdentifier; - } - // Set root level parent array - $seedArray = explode(',',$rootFolder); - $parentsArray = array(); - foreach($seedArray AS $seed){ - $parentsArray['level_0'][] = $seed; - } - - // --------------------------------------------------- - // Make array of all allowed parents - // --------------------------------------------------- - - // Process valid parents - $levelCounter = 1; - - while (((count($parentsArray) < $descendentDepth) || ($descendentDepth == 0)) && ($levelCounter <= count($parentsArray)) && ($levelCounter < 10)){ - - // Find all decendant parents for this level - $pLevel = 'level_'.($levelCounter - 1); - $tempLevelArray = $parentsArray[$pLevel]; - - foreach($tempLevelArray AS $p){ - - // Get children who are parents (isfolder = 1) - $validParentSql = ""; - $validParentSql .= "SELECT id FROM $tblsc sc WHERE "; - $validParentSql .= "isfolder = 1 AND parent = $p "; - $validParentSql .= "AND sc.deleted=0 "; - $validParentSql .= ($seeThruUnpub)? ";" : "AND sc.published = 1;"; - - // Run statement - $rsTempParents = $modx->dbQuery($validParentSql); - // Get number of results - $countTempParents = $modx->recordCount($rsTempParents); - - // If there are results, put them in an array - $tempValidArray = false; - if ($countTempParents){ - for ($i=0;$i<$countTempParents;$i++){ - $tempId = $modx->fetchRow($rsTempParents); - $tempValidArray[] = $tempId['id']; - } // end while - } // end if - - // populate next level of array - if ($tempValidArray){ - foreach($tempValidArray AS $kid){ - $kidLevel = 'level_'.$levelCounter; - $parentsArray[$kidLevel][] = $kid; - } // end foreach - - } // end if - } // end foreach - - // Do next level - $levelCounter++; - - } // end while - - // Finalize list of parents - $validParents = ''; - foreach ($parentsArray AS $level){ - foreach ($level AS $validP){ - $validParents .= $validP . ','; - } - } - - // Remove trailing comma - $validParents = substr($validParents,0,strlen($validParents)-1); - -} else { - $validParents = $_GET['LIn_f']; -} - -// --------------------------------------------------- -// Make appropriate SQL statement to pull recent items -// --------------------------------------------------- - -// get document groups for current user -if($docgrp = $modx->getUserDocGroups()) $docgrp = implode(",",$docgrp); - -$access = " (".($modx->isFrontend() ? "sc.privateweb=0":"1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0"). - (!$docgrp ? "":" OR dg.document_group IN ($docgrp)").") AND "; - -// Initialize -$recentSql = ""; -$recentSql .= "SELECT sc.id, pagetitle, description"; -// Include pub_date or createdon date if date is desired -$recentSql .= ($showCreationDate)? ", IF(pub_date > 0, pub_date, createdon) AS pubDate ": " " ; -$recentSql .= "FROM $tblsc sc LEFT JOIN $tbldg dg on dg.document = sc.id "; -$recentSql .= "WHERE "; -$recentSql .= ($hidePrivate)? $access:""; -// Look everywhere, or just under valid parents -$recentSql .= (($rootFolder == 0) && $seeThruUnpub && ($descendentDepth == 0))? "" : "parent IN ($validParents) AND " ; -// Published -$recentSql .= "sc.published = 1 "; -// Show In Menu -$recentSql .= ($seeShowInMenu)? " " : " AND sc.hidemenu=0 " ; -// Not deleted -$recentSql .= "AND sc.deleted=0 "; -// Choose sort method -switch ($sortBy){ - case 'alpha': - $recentSql .= "ORDER BY pagetitle "; - break; - case 'menuindex': - $recentSql .= "ORDER BY menuindex "; - break; - default: - $recentSql .= "ORDER BY IF(pub_date>0, pub_date, createdon) "; - break; -} -// Provide a sort direction -$recentSql .= $sortDir; - -// If this is a short list, just pull a limited number -$recentSql .= ($mode == 'short')? " LIMIT $shortQty;" : ";" ; - -// Run statement -$rsRecent = $modx->dbQuery($recentSql); -// Count records -$recentLimit = $modx->recordCount($rsRecent); - -// --------------------------------------------------- -// Generate pagination string if needed -// --------------------------------------------------- -$offsetParam = isset($_GET['LIn_o'])? $_GET['LIn_o']: 0; -$offset = ($offsetParam && ($mode == 'full'))? $offsetParam : 0 ; -$pagination = ''; - -// Don't bother unless there are enough records to justify it -if ( ($mode == 'full') && ($recentLimit > $fullQty) && ($fullQty) ){ - $fullUrl = $_SERVER['REQUEST_URI']; - $urlPieces = parse_url($fullUrl); - $urlPath = $urlPieces['path']; - $otherQs = ''; - - if ($urlPieces['query']){ - foreach($_GET AS $qsKey=>$qsValue){ - if (($qsKey != 'LIn_o') && ($qsKey != 'LIn_f')){ - $otherQs .= '&'.$qsKey.'='.$qsValue; - } - } - } - - $fastUrl = $urlPath.'?LIn_f='.$validParents.$otherQs; - - // Determine number of pages needed to show results - $totalPages = ceil($recentLimit/$fullQty); - - // Make links - for ($j = 0 ; $j < $totalPages; $j++){ - // only include links to OTHER pages, not current page - if($offset == $j*$fullQty){ - $pagination .= ''.($j+1) .''; - } else { - $pagination .= ''.($j+1) .''; - } - if ($j < $totalPages-1){ - $pagination .= $pageSeparator; - } - } - - // Make final pagination link set in it's own div - $pagination = '
    '."\n".$pagination."\n
    \n"; - -} - - -// --------------------------------------------------- -// Create title if wanted -// --------------------------------------------------- - -if ($activeTitle){ - $output .= '
    '.$activeTitle.'
    '."\n"; -} - -// --------------------------------------------------- -// Create list of recent items -// --------------------------------------------------- - -// Include pagination -$output .= ($pgPosition == 'top' || $pgPosition == 'both')? $pagination : '' ; - -$output .= '
      ' . $ie; - -$recentCounter = $offset; -if ($mode == 'short') { - $recentCounterLimit = min($shortQty,$recentLimit); -} else { - $recentCounterLimit = ($fullQty)? min(($fullQty+$offset),$recentLimit) : $recentLimit ; -} - -while (($recentCounter < $recentCounterLimit) && $rsRecent && ($recentLimit > 0)){ - mysql_data_seek($rsRecent,$recentCounter); - $recentRecord = $modx->fetchRow($rsRecent); - $output .= '
    • '; - // Link to page - $output .= ''.$recentRecord['pagetitle'].' '; - // Date if desired - if ($showCreationDate){ - $output .= ''.date($dateFormat,$recentRecord['pubDate']).' '; - } - // Description if desired - if ((($mode == 'short') && ($shortDesc)) || (($mode == 'full') && ($fullDesc))){ - $output .= ''.$recentRecord['description'].''; - } - // wrap it up - $output .= '
      • ' . $ie; - $recentCounter ++; -} - -$output .= '
    ' . $ie; - -$output .= ($pgPosition == 'bottom' || $pgPosition == 'both')? $pagination : '' ; - -// --------------------------------------------------- -// Link to index -// --------------------------------------------------- - -if ($linkToIndex) { - - $output .= '
    '; - $output .= ''.$indexText.''; - $output .= '
    '; - -} - -// --------------------------------------------------- -// Send to browser -// --------------------------------------------------- - -return $output; \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/listindexer/snippet.listindexer.php'; \ No newline at end of file diff --git a/install/assets/snippets/membercheck.tpl b/install/assets/snippets/membercheck.tpl index f4fb930a5f..4789ac51b6 100644 --- a/install/assets/snippets/membercheck.tpl +++ b/install/assets/snippets/membercheck.tpl @@ -12,137 +12,4 @@ * @internal @installset base */ -#:::::::::::::::::::::::::::::::::::::::: -# Version: 1.0 -# Created By Ryan Thrash (vertexworks.com) -# Sanitized By Jason Coward (opengeek.com) -# -# Date: November 29, 2005 -# -# Changelog: -# Nov 29, 05 -- initial release -# Jul 13, 06 -- adjusted Singleton to work under PHP4, added placeholder code (by: garryn) -# -#:::::::::::::::::::::::::::::::::::::::: -# Description: -# Checks to see if users belong to a certain group and -# displays the specified chunk if they do. Performs several -# sanity checks and allows to be used multiple times on a page. -# -# Params: -# &groups [array] (REQUIRED) -# array of webuser group-names to check against -# -# &chunk [string] (REQUIRED) -# name of the chunk to use if passes the check -# -# &ph [string] (optional) -# name of the placeholder to set instead of directly retuning chunk -# -# &debug [boolean] (optional | false) -# turn on debug mode for extra troubleshooting -# -# Example Usage: -# -# [[MemberCheck? &groups=`siteadmin, registered users` &chunk=`privateSiteNav` &ph=`MemberMenu` &debug=`true`]] -# -# This would place the 'members-only' navigation store in the chunk 'privateSiteNav' -# into a placeholder (called 'MemberMenu'). It will only do this as long as the user -# is logged in as a webuser and is a member of the 'siteadmin' or the 'registered users' -# groups. The optional debug parameter can be used to display informative error messages -# when configuring this snippet for your site. For example, if the developer had -# mistakenly typed 'siteowners' for the first group, and none existed with debug mode on, -# it would have returned the error message: The group siteowners could not be found.... -# -#:::::::::::::::::::::::::::::::::::::::: - -# debug parameter -$debug = isset ($debug) ? $debug : false; - -# check if inside manager -if ($m = $modx->insideManager()) { - return ''; # don't go any further when inside manager -} - -if (!isset ($groups)) { - return $debug ? '

    Error: No Group Specified

    ' : ''; -} - -if (!isset ($chunk)) { - return $debug ? '

    Error: No Chunk Specified

    ' : ''; -} - -# turn comma-delimited list of groups into an array -$groups = explode(',', $groups); - -if (!class_exists('MemberCheck')) { - class MemberCheck { - var $allGroups = NULL; - var $debug; - - function getInstance($debug) { - static $instance; - if (!isset ($instance)) { - $instance = new MemberCheck($debug); - } - return $instance; - } - - function MemberCheck($debug = false) { - global $modx; - - $this->debug = $debug; - if ($debug) { - $this->allGroups = array (); - $tableName = $modx->getFullTableName('webgroup_names'); - $sql = "SELECT name FROM $tableName"; - if ($rs = $modx->db->query($sql)) { - while ($row = $modx->db->getRow($rs)) { - array_push($this->allGroups, stripslashes($row['name'])); - } - } - } - } - - function isValidGroup($groupName) { - $isValid = !(array_search($groupName, $this->allGroups) === false); - return $isValid; - } - - function getMemberChunk(& $groups, $chunk) { - global $modx; - $o = ''; - if (is_array($groups)) { - for ($i = 0; $i < count($groups); $i++) { - $groups[$i] = trim($groups[$i]); - if ($this->debug) { - if (!$this->isValidGroup($groups[$i])) { - return "

    The group " . $groups[$i] . " could not be found...

    "; - } - } - } - - $check = $modx->isMemberOfWebGroup($groups); - - $chunkcheck = $modx->getChunk($chunk); - - $o .= ($check && $chunkcheck) ? $chunkcheck : ''; - if (!$chunkcheck) - $o .= $this->debug ? "

    The chunk $chunk not found...

    " : ''; - } else { - $o .= "

    No valid group names were specified!

    "; - } - - return $o; - } - } -} - -$memberCheck = MemberCheck :: getInstance($debug); - -if (!isset ($ph)) { - return $memberCheck->getMemberChunk($groups, $chunk); -} else { - $modx->setPlaceholder($ph, $memberCheck->getMemberChunk($groups, $chunk)); - return ''; -} \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/membercheck/snippet.membercheck.php'; \ No newline at end of file diff --git a/install/assets/snippets/personalize.tpl b/install/assets/snippets/personalize.tpl index be52ec875c..850ecb5e30 100644 --- a/install/assets/snippets/personalize.tpl +++ b/install/assets/snippets/personalize.tpl @@ -4,174 +4,15 @@ * * Personalize snippet * - * @category snippet - * @version 2.1 - * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) - * @internal @properties - * @internal @modx_category Login - * @internal @installset base - * @author Created By Ryan Thrash (modx@vertexworks.com) - * @author powered up by kudo (kudo@kudolink.com) - * @author powered up by yama(yamamoto@kyms.ne.jp) + * @category snippet + * @version 2.1 + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) + * @internal @properties + * @internal @modx_category Login + * @internal @installset base + * @author Created By Ryan Thrash (modx@vertexworks.com) + * @author powered up by kudo (kudo@kudolink.com) + * @author powered up by yama(yamamoto@kyms.ne.jp) */ -#:::::::::::::::::::::::::::::::::::::::: -# Created By:Ryan Thrash (modx@vertexworks.com), -# and then powered up by kudo (kudo@kudolink.com) -# -# Date: Aug 03, 2006 -# -# Changelog: -# Dec 01, 05 -- initial release -# Jun 19, 06 -- updated description -# Jul 19, 06 -- hacked by kudo to output chunks -# Aug 03, 06 -- added placeholder for username -# Aug 27, 10 -- powered up all code -# -#:::::::::::::::::::::::::::::::::::::::: -# Description: -# Checks to see if webusers are logged in and displays yesChunk if the user -# is logged or noChunk if user is not logged. Insert only the chunk name as -# param, without {{}}. Can use a placeholder to output the username. -# TESTED: can be used more than once per page. -# TESTED: chunks can contain snippets. -# -# -# Params: -# &yesChunk [string] (optional) -# Output for LOGGED users -# -# &noChunk [string] (optional) -# Output for NOT logged users -# -# &ph [string] (optional) -# Placeholder for placing the username -# ATTENTION!: place this ph only in yesChunk! -# -# &context [string] (optional) -# web|mgr -# -# &yesTV [string] (optional) -# Output for LOGGED users -# -# &noTV [string] (optional) -# Output for NOT logged users -# -# Example Usage: -# -# [[Personalize? &yesChunk=`Link` &noChunk=`Register` &ph=`name`]] -# -# Having Chunks named {{Link}} and another {{Register}}, the first will be -# published to registered user, the second to non-registered users. -# -#:::::::::::::::::::::::::::::::::::::::: - -# prepare params and variables - -if ($this->isFrontend() && isset ($_SESSION['webValidated'])) $current_context = 'web'; -elseif ($this->isBackend() && isset ($_SESSION['mgrValidated'])) $current_context = 'mgr'; - -$output = ''; -$yesChunk = (isset($yesChunk))? $yesChunk : ''; -$noChunk = (isset($noChunk)) ? $noChunk : ''; -$ph = (isset($ph)) ? $ph : 'username'; -$context = (isset($context)) ? $context : $current_context; -$yesTV = (isset($yesTV)) ? $yesTV : ''; -$noTV = (isset($noTV)) ? $noTV : ''; - -/* -$referer = htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES); -$ua = htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES); -$ip = htmlspecialchars($_SERVER['REMOTE_ADDR'], ENT_QUOTES); -$host = htmlspecialchars($_SERVER['REMOTE_HOST'], ENT_QUOTES); - -$ua_strtolower = strtolower($_SERVER['HTTP_USER_AGENT']); -if (strpos($ua_strtolower, 'firefox') !== false) $browser = 'firefox'; -elseif(strpos($ua_strtolower, 'trident/4.0') !== false) $browser = 'internet explorer 8'; -elseif(strpos($ua_strtolower, 'msie') !== false) $browser = 'internet explorer'; -elseif(strpos($ua_strtolower, 'chrome') !== false) $browser = 'chrome'; -elseif(strpos($ua_strtolower, 'safari') !== false) $browser = 'safari'; -elseif(strpos($ua_strtolower, 'opera') !== false) $browser = 'opera'; -else $browser = 'other'; - -$modx->setPlaceholder('referer', $referer); -$modx->setPlaceholder('ua', $ua); -$modx->setPlaceholder('browser', $browser); -$modx->setPlaceholder('ip', $ip); -$modx->setPlaceholder('host', $host); -*/ - -switch($context) -{ - case 'web': - $short_name = $_SESSION['webShortname']; - $full_name = $_SESSION['webFullname']; - $email = $_SESSION['webEmail']; - $last_login = $_SESSION['webLastlogin']; - break; - case 'mgr': - case 'manager': - $short_name = $_SESSION['mgrShortname']; - $full_name = $_SESSION['mgrFullname']; - $email = $_SESSION['mgrEmail']; - $last_login = $_SESSION['mgrLastlogin']; - break; - default: - $short_name = ''; -} -if (!empty($context)) -{ - if($yesTV !== '') - { - $pre_output = $modx->documentObject[$yesTV]; - if(is_array($pre_output)) - { - $output = $pre_output[1]; - } - else - { - $output = $pre_output; - } - } - elseif($yesChunk !== '') - { - $output = $modx->getChunk($yesChunk); - } - else - { - $output = 'username : ' . $short_name; - } - - if(empty($last_login)) $last_login_text = 'first login'; - else $last_login_text = $modx->toDateFormat($last_login); - - $modx->setPlaceholder($ph,$short_name); - $modx->setPlaceholder('short_name', $short_name); - $modx->setPlaceholder('full_name', $full_name); - $modx->setPlaceholder('email', $email); - $modx->setPlaceholder('last_login', $last_login_text); -} -else -{ - if($noTV !== '') - { - $pre_output = $modx->documentObject[$noTV]; - if(is_array($pre_output)) - { - $output = $pre_output[1]; - } - else - { - $output = $pre_output; - } - } - elseif($noChunk!=='') - { - $output = $modx->getChunk($noChunk); - } - else - { - $output = 'guest'; - } -} -return $output; \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/personalize/snippet.personalize.php'; \ No newline at end of file diff --git a/install/assets/snippets/ultparent.tpl b/install/assets/snippets/ultparent.tpl index 45d4dabb27..5919a0010f 100644 --- a/install/assets/snippets/ultparent.tpl +++ b/install/assets/snippets/ultparent.tpl @@ -4,58 +4,12 @@ * * Travels up the document tree from a specified document and returns its "ultimate" non-root parent * - * @category snippet - * @version 2.0 - * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) - * @internal @properties - * @internal @modx_category Navigation + * @category snippet + * @version 2.0 + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) + * @internal @properties + * @internal @modx_category Navigation * @internal @installset base */ - -/* - * @name UltimateParent - * @version 2.0 beta (requires MODx 0.9.5+) - * @author Jason Coward - * - * @param &id The id of the document whose parent you want to find. - * @param &top The top node for the search. - * @param &topLevel The top level node for the search (root = level 1) - * - * @license Public Domain, use as you like. - * - * @example [[UltimateParent? &id=`45` &top=`6`]] - * Will find the ultimate parent of document 45 if it is a child of document 6; - * otherwise it will return 45. - * - * @example [[UltimateParent? &topLevel=`2`]] - * Will find the ultimate parent of the current document at a depth of 2 levels - * in the document hierarchy, with the root level being level 1. - * - * This snippet travels up the document tree from a specified document and - * returns the "ultimate" parent. Version 2.0 was rewritten to use the new - * getParentIds function features available only in MODx 0.9.5 or later. - * - * Based on the original UltimateParent 1.x snippet by Susan Ottwell - * . The topLevel parameter was introduced by staed and - * adopted here. - */ -$top= isset ($top) && intval($top) ? $top : 0; -$id= isset ($id) && intval($id) ? intval($id) : $modx->documentIdentifier; -$topLevel= isset ($topLevel) && intval($topLevel) ? intval($topLevel) : 0; -if ($id && $id != $top) { - $pid= $id; - if (!$topLevel || count($modx->getParentIds($id)) >= $topLevel) { - while ($parentIds= $modx->getParentIds($id, 1)) { - $pid= array_pop($parentIds); - if ($pid == $top) { - break; - } - $id= $pid; - if ($topLevel && count($modx->getParentIds($id)) < $topLevel) { - break; - } - } - } -} -return $id; \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/ultimateparent/snippet.ultimateparent.php'; \ No newline at end of file From 538b7922d46cb9be46a2113e496280b1a146718e Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:48:12 +0300 Subject: [PATCH 231/530] fix phpthumb --- install/assets/snippets/phpthumb.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/assets/snippets/phpthumb.tpl b/install/assets/snippets/phpthumb.tpl index f8c55e2068..0c5e687739 100644 --- a/install/assets/snippets/phpthumb.tpl +++ b/install/assets/snippets/phpthumb.tpl @@ -9,8 +9,7 @@ * @internal @properties * @internal @modx_category add * @internal @installset base, sample - * @author Boomka + * @author Bumkaka */ -// [[phpthumb? &input=`[+image+]` &options=`w=150,h=76,far=C,bg=FFFFFF`]] return require MODX_BASE_PATH.'assets/snippets/phpthumb/snippet.phpthumb.php'; From 1c4e804a97a18ff12665397365c4f43f34f17013 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 11 Aug 2013 09:52:40 +0300 Subject: [PATCH 232/530] Refactor #10071 done --- .../snippets/wayfinder/snippet.wayfinder.php | 107 ++++++++++++++++++ install/assets/snippets/phpthumb.tpl | 1 + install/assets/snippets/wayfinder.tpl | 106 +---------------- 3 files changed, 109 insertions(+), 105 deletions(-) create mode 100644 assets/snippets/wayfinder/snippet.wayfinder.php diff --git a/assets/snippets/wayfinder/snippet.wayfinder.php b/assets/snippets/wayfinder/snippet.wayfinder.php new file mode 100644 index 0000000000..12bc812727 --- /dev/null +++ b/assets/snippets/wayfinder/snippet.wayfinder.php @@ -0,0 +1,107 @@ +config['base_path']."assets/snippets/wayfinder/"; + +//Include a custom config file if specified +$config = (isset($config)) ? "{$wayfinder_base}configs/{$config}.config.php" : "{$wayfinder_base}configs/default.config.php"; +if (file_exists($config)) { + include("$config"); +} + +include_once("{$wayfinder_base}wayfinder.inc.php"); + +if (class_exists('Wayfinder')) { + $wf = new Wayfinder(); +} else { + return 'error: Wayfinder class not found'; +} + +$wf->_config = array( + 'id' => isset($startId) ? $startId : $modx->documentIdentifier, + 'level' => isset($level) ? $level : 0, + 'includeDocs' => isset($includeDocs) ? $includeDocs : 0, + 'excludeDocs' => isset($excludeDocs) ? $excludeDocs : 0, + 'ph' => isset($ph) ? $ph : FALSE, + 'debug' => isset($debug) ? TRUE : FALSE, + 'ignoreHidden' => isset($ignoreHidden) ? $ignoreHidden : FALSE, + 'hideSubMenus' => isset($hideSubMenus) ? $hideSubMenus : FALSE, + 'useWeblinkUrl' => isset($useWeblinkUrl) ? $useWeblinkUrl : TRUE, + 'fullLink' => isset($fullLink) ? $fullLink : FALSE, + 'nl' => isset($removeNewLines) ? '' : "\n", + 'sortOrder' => isset($sortOrder) ? strtoupper($sortOrder) : 'ASC', + 'sortBy' => isset($sortBy) ? $sortBy : 'menuindex', + 'limit' => isset($limit) ? $limit : 0, + 'cssTpl' => isset($cssTpl) ? $cssTpl : FALSE, + 'jsTpl' => isset($jsTpl) ? $jsTpl : FALSE, + 'rowIdPrefix' => isset($rowIdPrefix) ? $rowIdPrefix : FALSE, + 'textOfLinks' => isset($textOfLinks) ? $textOfLinks : 'menutitle', + 'titleOfLinks' => isset($titleOfLinks) ? $titleOfLinks : 'pagetitle', + 'displayStart' => isset($displayStart) ? $displayStart : FALSE, + 'entityEncode' => isset($entityEncode) ? $entityEncode : TRUE, +); + +//get user class definitions +$wf->_css = array( + 'first' => isset($firstClass) ? $firstClass : '', + 'last' => isset($lastClass) ? $lastClass : 'last', + 'here' => isset($hereClass) ? $hereClass : 'active', + 'parent' => isset($parentClass) ? $parentClass : '', + 'row' => isset($rowClass) ? $rowClass : '', + 'outer' => isset($outerClass) ? $outerClass : '', + 'inner' => isset($innerClass) ? $innerClass : '', + 'level' => isset($levelClass) ? $levelClass: '', + 'self' => isset($selfClass) ? $selfClass : '', + 'weblink' => isset($webLinkClass) ? $webLinkClass : '', +); + +//get user templates +$wf->_templates = array( + 'outerTpl' => isset($outerTpl) ? $outerTpl : '', + 'rowTpl' => isset($rowTpl) ? $rowTpl : '', + 'parentRowTpl' => isset($parentRowTpl) ? $parentRowTpl : '', + 'parentRowHereTpl' => isset($parentRowHereTpl) ? $parentRowHereTpl : '', + 'hereTpl' => isset($hereTpl) ? $hereTpl : '', + 'innerTpl' => isset($innerTpl) ? $innerTpl : '', + 'innerRowTpl' => isset($innerRowTpl) ? $innerRowTpl : '', + 'innerHereTpl' => isset($innerHereTpl) ? $innerHereTpl : '', + 'activeParentRowTpl' => isset($activeParentRowTpl) ? $activeParentRowTpl : '', + 'categoryFoldersTpl' => isset($categoryFoldersTpl) ? $categoryFoldersTpl : '', + 'startItemTpl' => isset($startItemTpl) ? $startItemTpl : '', +); + +//Process Wayfinder +$output = $wf->run(); + +if ($wf->_config['debug']) { + $output .= $wf->renderDebugOutput(); +} + +//Ouput Results +if ($wf->_config['ph']) { + $modx->setPlaceholder($wf->_config['ph'],$output); + return; +} else { + return $output; +}?> \ No newline at end of file diff --git a/install/assets/snippets/phpthumb.tpl b/install/assets/snippets/phpthumb.tpl index 0c5e687739..e4bade1492 100644 --- a/install/assets/snippets/phpthumb.tpl +++ b/install/assets/snippets/phpthumb.tpl @@ -1,3 +1,4 @@ +//config['base_path']."assets/snippets/wayfinder/"; - -//Include a custom config file if specified -$config = (isset($config)) ? "{$wayfinder_base}configs/{$config}.config.php" : "{$wayfinder_base}configs/default.config.php"; -if (file_exists($config)) { - include("$config"); -} - -include_once("{$wayfinder_base}wayfinder.inc.php"); - -if (class_exists('Wayfinder')) { - $wf = new Wayfinder(); -} else { - return 'error: Wayfinder class not found'; -} - -$wf->_config = array( - 'id' => isset($startId) ? $startId : $modx->documentIdentifier, - 'level' => isset($level) ? $level : 0, - 'includeDocs' => isset($includeDocs) ? $includeDocs : 0, - 'excludeDocs' => isset($excludeDocs) ? $excludeDocs : 0, - 'ph' => isset($ph) ? $ph : FALSE, - 'debug' => isset($debug) ? TRUE : FALSE, - 'ignoreHidden' => isset($ignoreHidden) ? $ignoreHidden : FALSE, - 'hideSubMenus' => isset($hideSubMenus) ? $hideSubMenus : FALSE, - 'useWeblinkUrl' => isset($useWeblinkUrl) ? $useWeblinkUrl : TRUE, - 'fullLink' => isset($fullLink) ? $fullLink : FALSE, - 'nl' => isset($removeNewLines) ? '' : "\n", - 'sortOrder' => isset($sortOrder) ? strtoupper($sortOrder) : 'ASC', - 'sortBy' => isset($sortBy) ? $sortBy : 'menuindex', - 'limit' => isset($limit) ? $limit : 0, - 'cssTpl' => isset($cssTpl) ? $cssTpl : FALSE, - 'jsTpl' => isset($jsTpl) ? $jsTpl : FALSE, - 'rowIdPrefix' => isset($rowIdPrefix) ? $rowIdPrefix : FALSE, - 'textOfLinks' => isset($textOfLinks) ? $textOfLinks : 'menutitle', - 'titleOfLinks' => isset($titleOfLinks) ? $titleOfLinks : 'pagetitle', - 'displayStart' => isset($displayStart) ? $displayStart : FALSE, - 'entityEncode' => isset($entityEncode) ? $entityEncode : TRUE, -); - -//get user class definitions -$wf->_css = array( - 'first' => isset($firstClass) ? $firstClass : '', - 'last' => isset($lastClass) ? $lastClass : 'last', - 'here' => isset($hereClass) ? $hereClass : 'active', - 'parent' => isset($parentClass) ? $parentClass : '', - 'row' => isset($rowClass) ? $rowClass : '', - 'outer' => isset($outerClass) ? $outerClass : '', - 'inner' => isset($innerClass) ? $innerClass : '', - 'level' => isset($levelClass) ? $levelClass: '', - 'self' => isset($selfClass) ? $selfClass : '', - 'weblink' => isset($webLinkClass) ? $webLinkClass : '', -); - -//get user templates -$wf->_templates = array( - 'outerTpl' => isset($outerTpl) ? $outerTpl : '', - 'rowTpl' => isset($rowTpl) ? $rowTpl : '', - 'parentRowTpl' => isset($parentRowTpl) ? $parentRowTpl : '', - 'parentRowHereTpl' => isset($parentRowHereTpl) ? $parentRowHereTpl : '', - 'hereTpl' => isset($hereTpl) ? $hereTpl : '', - 'innerTpl' => isset($innerTpl) ? $innerTpl : '', - 'innerRowTpl' => isset($innerRowTpl) ? $innerRowTpl : '', - 'innerHereTpl' => isset($innerHereTpl) ? $innerHereTpl : '', - 'activeParentRowTpl' => isset($activeParentRowTpl) ? $activeParentRowTpl : '', - 'categoryFoldersTpl' => isset($categoryFoldersTpl) ? $categoryFoldersTpl : '', - 'startItemTpl' => isset($startItemTpl) ? $startItemTpl : '', -); - -//Process Wayfinder -$output = $wf->run(); - -if ($wf->_config['debug']) { - $output .= $wf->renderDebugOutput(); -} - -//Ouput Results -if ($wf->_config['ph']) { - $modx->setPlaceholder($wf->_config['ph'],$output); -} else { - return $output; -} \ No newline at end of file +return require MODX_BASE_PATH.'assets/snippets/wayfinder/snippet.wayfinder.php'; \ No newline at end of file From e04ead5d727661f8a4d069bd5c5a788e199647fc Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 12 Aug 2013 09:20:51 +0300 Subject: [PATCH 233/530] fix some html and fix KCFinder drag and drop --- assets/snippets/wayfinder/snippet.wayfinder.php | 3 ++- manager/actions/mutate_plugin.dynamic.php | 2 ++ manager/actions/mutate_snippet.dynamic.php | 2 ++ manager/actions/mutate_templates.dynamic.php | 2 ++ manager/media/browser/mcpuk/js/browser/dropUpload.js | 10 ++++++++-- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/assets/snippets/wayfinder/snippet.wayfinder.php b/assets/snippets/wayfinder/snippet.wayfinder.php index 12bc812727..2a2b27c53c 100644 --- a/assets/snippets/wayfinder/snippet.wayfinder.php +++ b/assets/snippets/wayfinder/snippet.wayfinder.php @@ -104,4 +104,5 @@ return; } else { return $output; -}?> \ No newline at end of file +} +?> \ No newline at end of file diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 8af6e6eadc..ba9920b66f 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -319,6 +319,7 @@ function decode(s){ +
      class="inputBox" onclick="setTextWrap(document.mutate.post,this.checked)" /> @@ -326,6 +327,7 @@ function decode(s){
    +
    diff --git a/manager/actions/mutate_snippet.dynamic.php b/manager/actions/mutate_snippet.dynamic.php index 560398195c..6661fc59a4 100644 --- a/manager/actions/mutate_snippet.dynamic.php +++ b/manager/actions/mutate_snippet.dynamic.php @@ -321,6 +321,7 @@ function decode(s){ +
    class="inputBox" onclick="setTextWrap(document.mutate.post,this.checked)" /> @@ -328,6 +329,7 @@ function decode(s){
    +
    diff --git a/manager/actions/mutate_templates.dynamic.php b/manager/actions/mutate_templates.dynamic.php index 3ecae2257a..6b78737fdd 100644 --- a/manager/actions/mutate_templates.dynamic.php +++ b/manager/actions/mutate_templates.dynamic.php @@ -175,12 +175,14 @@ function deletedocument() { +
    +
    diff --git a/manager/media/browser/mcpuk/js/browser/dropUpload.js b/manager/media/browser/mcpuk/js/browser/dropUpload.js index 284f9dc387..0246503ed2 100644 --- a/manager/media/browser/mcpuk/js/browser/dropUpload.js +++ b/manager/media/browser/mcpuk/js/browser/dropUpload.js @@ -11,8 +11,12 @@ * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 * @link http://kcfinder.sunhater.com */?> - +var already = false; browser.initDropUpload = function() { + if (already){ + return; + } + already = true; if ((typeof(XMLHttpRequest) == 'undefined') || (typeof(document.addEventListener) == 'undefined') || (typeof(File) == 'undefined') || @@ -64,7 +68,7 @@ browser.initDropUpload = function() { browser.alert("Cannot write to upload folder."); return false; } - filesCount += e.dataTransfer.files.length + filesCount += e.dataTransfer.files.length; for (var i = 0; i < e.dataTransfer.files.length; i++) { var file = e.dataTransfer.files[i]; file.thisTargetDir = browser.dir; @@ -193,6 +197,7 @@ browser.initDropUpload = function() { if (browser.dir == reader.thisTargetDir) browser.fadeFiles(); uploadInProgress = false; + already = true; processUploadQueue(); if (xhr.responseText.substr(0, 1) != '/') errors[errors.length] = xhr.responseText; @@ -204,6 +209,7 @@ browser.initDropUpload = function() { reader.onerror = function(evt) { $('#loading').css('display', 'none'); uploadInProgress = false; + already = true; processUploadQueue(); errors[errors.length] = browser.label("Failed to upload {filename}!", { filename: evt.target.thisFileName From d1a6dbd48b4e0135cdfe0f3ef9e780ced4581ef9 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 12 Aug 2013 14:38:39 +0300 Subject: [PATCH 234/530] fix sendmail in forgotmananagerlogin --- .../plugin.forgotmanagerlogin.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php b/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php index 1a073e9058..09d62a0d24 100644 --- a/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php +++ b/assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php @@ -76,13 +76,6 @@ function getUser($user_id=false, $username='', $email='', $hash='') { function sendEmail($to) { global $modx, $_lang; - $subject = $_lang['password_change_request']; - $headers = "MIME-Version: 1.0\r\n". - "Content-type: text/html; charset=\"{$modx->config['modx_charset']}\"\r\n". - "From: MODx <{$modx->config['emailsender']}>\r\n". - "Reply-To: no-reply@{$_SERVER['HTTP_HOST']}\r\n". - "X-Mailer: PHP/".phpversion(); - $user = $this->getUser(0, '', $to); if($user['username']) { @@ -92,10 +85,17 @@ function sendEmail($to) {

    {$_lang['forgot_password_email_fine_print']}

    EOD; - $mail = mail($to, $subject, $body, $headers); - if(!$mail) { $this->errors[] = $_lang['error_sending_email']; } + $modx->loadExtension('MODxMailer'); + $modx->mail->From = $modx->config['emailsender']; + $modx->mail->FromName = $modx->config['site_name']; + $modx->mail->AddAddress($to,$user['username']); + $modx->mail->Subject = $_lang['password_change_request']; + $modx->mail->Body = $body; + $rs = $modx->mail->send(); //ignore mail errors in this case + + if(!$rs) $modx->errors[] = $_lang['error_sending_email']; - return $mail; + return $rs; } } From 84fd6dad451aa630a39c771bcba072baef4d8a65 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Tue, 13 Aug 2013 09:52:39 +0300 Subject: [PATCH 235/530] fix KCfinder tinyMCE --- assets/plugins/tinymce/js/fbconfig.js | 2 +- manager/media/browser/mcpuk/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/plugins/tinymce/js/fbconfig.js b/assets/plugins/tinymce/js/fbconfig.js index d704e1fc37..42b93b3d84 100644 --- a/assets/plugins/tinymce/js/fbconfig.js +++ b/assets/plugins/tinymce/js/fbconfig.js @@ -1,4 +1,4 @@ -document.write(''); +document.write(''); var FileBrowserDialogue = { init : function () { diff --git a/manager/media/browser/mcpuk/config.php b/manager/media/browser/mcpuk/config.php index e77f78c65f..4d2a924cbf 100644 --- a/manager/media/browser/mcpuk/config.php +++ b/manager/media/browser/mcpuk/config.php @@ -92,7 +92,7 @@ // THE FOLLOWING SETTINGS CANNOT BE OVERRIDED WITH SESSION CONFIGURATION '_check4htaccess' => false, - '_tinyMCEPath' => MODX_BASE_URL . "assets/plugins/tinymce/jscripts/tiny_mce", + '_tinyMCEPath' => MODX_BASE_URL . "assets/plugins/tinymce/tiny_mce", '_sessionVar' => &$_SESSION['KCFINDER'], //'_sessionLifetime' => 30, From c584f9710e568848693d1bd7c8f7cc6d0d9d53f9 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Wed, 14 Aug 2013 08:37:29 +0300 Subject: [PATCH 236/530] security fix #10018 from Agel_Nash https://github.com/AgelxNash/evolution/commit/e69762d1f1861a68dcc89be4e2 fe63e8198a5a35 --- manager/actions/messages.static.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php index 3662112ac4..1c2d2ac1b6 100644 --- a/manager/actions/messages.static.php +++ b/manager/actions/messages.static.php @@ -10,7 +10,7 @@
    db->query($sql); $limit = $modx->db->getRecordCount($rs); if($limit!=1) { @@ -109,7 +109,7 @@ if( !isset( $_REQUEST['int_cur_position'] ) || $_REQUEST['int_cur_position'] == 0 ){ $int_cur_position = 0; } else { - $int_cur_position = $_REQUEST['int_cur_position']; + $int_cur_position = (int)$_REQUEST['int_cur_position']; } // Number of result to display on the page, will be in the LIMIT of the sql query also From 151d927be07052f1d5d7993cd917746cafd45370 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Wed, 14 Aug 2013 08:39:16 +0300 Subject: [PATCH 237/530] Undefined variable: usemm fixed by Agel_Nash --- assets/plugins/qm/qm.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/plugins/qm/qm.inc.php b/assets/plugins/qm/qm.inc.php index be16b6c376..4064e72b1c 100755 --- a/assets/plugins/qm/qm.inc.php +++ b/assets/plugins/qm/qm.inc.php @@ -24,7 +24,7 @@ function Qm(&$modx, $jqpath='', $loadmanagerjq='', $loadfrontendjq='', $noconfli $this->loadtb = $loadtb; $this->tbwidth = $tbwidth; $this->tbheight = $tbheight; - $this->usemm = $usemm; + $this->usemm = null; $this->hidefields = $hidefields; $this->hidetabs = $hidetabs; $this->hidesections = $hidesections; From ffe6ffb2bb8761ac4ac483bb085afe5e4f59257e Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Wed, 14 Aug 2013 08:42:05 +0300 Subject: [PATCH 238/530] #10074 by Agel_Nash https://github.com/AgelxNash/evolution/commit/b029959fc449b01420fd29896d f3124684bb5c7e --- manager/includes/document.parser.class.inc.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 1f7bad742f..308842c0b8 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -3222,15 +3222,14 @@ function parseProperties($propertyString) { $parameter= array (); if (!empty ($propertyString)) { $tmpParams= explode("&", $propertyString); - for ($x= 0; $x < count($tmpParams); $x++) { + $count = count($tmpParams); + for ($x= 0; $x < $count; $x++) { if (strpos($tmpParams[$x], '=', 0)) { - $pTmp= explode("=", $tmpParams[$x]); - $pvTmp= explode(";", trim($pTmp[1])); - if ($pvTmp[1] == 'list' && $pvTmp[3] != "") - $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default - else - if ($pvTmp[1] != 'list' && $pvTmp[2] != "") - $parameter[trim($pTmp[0])]= $pvTmp[2]; + $pTmp= explode("=", $tmpParams[$x], 2); + $pvTmp= explode(";", trim($pTmp[1]), 3); + $pvTmp[2] = isset($pvTvm[2]) ? $pvTmp[2] : null; + $pvTmp[3] = isset($pvTmp[3]) ? $pvTmp[3] : null; + $parameter[trim($pTmp[0])] = ($pvTmp[1] == 'list') ? $pvTmp[3] : $pvTmp[2]; } } } From 6df016a3e416dbb1adc9c2226cdecf3741f48222 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Wed, 14 Aug 2013 08:42:59 +0300 Subject: [PATCH 239/530] #10073 by Agel_Nash https://github.com/AgelxNash/evolution/commit/8f1b932a2b892e8bc76b221929 d10ba5d90d86d4 --- manager/includes/document.parser.class.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 308842c0b8..3739a198b4 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -4,6 +4,9 @@ * Function: This class contains the main document parsing functions * */ +if (!defined('E_DEPRECATED')) define('E_DEPRECATED', 8192); +if (!defined('E_USER_DEPRECATED')) define('E_USER_DEPRECATED', 16384); + class DocumentParser { var $db; // db object var $event, $Event; // event object From 4d0e64869d8e3e25bfa2a39026522ac0211b2a9b Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Wed, 14 Aug 2013 08:59:56 +0300 Subject: [PATCH 240/530] #10075 by Agel_Nash https://github.com/AgelxNash/evolution/commit/01a165a3d9805e9b0d126cc41e 40af39fd0190b8 --- manager/frames/1.php | 2 +- manager/frames/menu.php | 1 + manager/frames/nodes.php | 14 +++++++------- manager/frames/tree.php | 8 ++++---- manager/includes/controls/contextmenu.php | 4 ++-- manager/includes/controls/datagrid.class.php | 14 ++++++++------ manager/includes/header.inc.php | 1 + manager/includes/log.class.inc.php | 4 ++-- manager/includes/paginate.inc.php | 2 +- manager/index.php | 2 +- 10 files changed, 28 insertions(+), 24 deletions(-) diff --git a/manager/frames/1.php b/manager/frames/1.php index 2073c4822f..ecd498aef3 100755 --- a/manager/frames/1.php +++ b/manager/frames/1.php @@ -7,7 +7,7 @@ $modx->invokeEvent('OnManagerPreFrameLoader',array('action'=>$action)); ?> -> +> <?php echo $site_name?> - (MODX CMS Manager) diff --git a/manager/frames/menu.php b/manager/frames/menu.php index e58079bebf..afb114af4f 100644 --- a/manager/frames/menu.php +++ b/manager/frames/menu.php @@ -3,6 +3,7 @@ if (!array_key_exists('mail_check_timeperiod', $modx->config) || !is_numeric($modx->config['mail_check_timeperiod'])) { $modx->config['mail_check_timeperiod'] = 5; } +$modx_textdir = isset($modx_textdir) ? $modx_textdir : null; if ($manager_theme) $manager_theme .= '/'; $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en'; ?> diff --git a/manager/frames/nodes.php b/manager/frames/nodes.php index 101821ceca..3bd58ce659 100644 --- a/manager/frames/nodes.php +++ b/manager/frames/nodes.php @@ -39,9 +39,9 @@ 'text/plain' => $_style["tree_page"], 'text/xml' => $_style["tree_page_xml"], 'text/javascript' => $_style["tree_page_js"], - 'image/gif' => $_style["tree_page_gif"], - 'image/jpg' => $_style["tree_page_jpg"], - 'image/png' => $_style["tree_page_png"] + 'image/gif' => isset($_style["tree_page_gif"]) ? $_style["tree_page_gif"] : $_style["tree_page"], + 'image/jpg' => isset($_style["tree_page_jpg"]) ? $_style["tree_page_jpg"] : $_style["tree_page"], + 'image/png' => isset($_style["tree_page_png"]) ? $_style["tree_page_png"] : $_style["tree_page"] ); $iconsPrivate = array( 'application/rss+xml' => $_style["tree_page_rss_secure"], @@ -53,9 +53,9 @@ 'text/plain' => $_style["tree_page_secure"], 'text/xml' => $_style["tree_page_xml_secure"], 'text/javascript' => $_style["tree_page_js_secure"], - 'image/gif' => $_style["tree_page_gif_secure"], - 'image/jpg' => $_style["tree_page_jpg_secure"], - 'image/png' => $_style["tree_page_png_secure"] + 'image/gif' => isset($_style["tree_page_gif_secure"]) ? $_style["tree_page_gif_secure"] : $_style["tree_page_secure"], + 'image/jpg' => isset($_style["tree_page_jpg_secure"]) ? $_style["tree_page_jpg_secure"] : $_style["tree_page_secure"], + 'image/png' => isset($_style["tree_page_png_secure"]) ? $_style["tree_page_png_secure"] : $_style["tree_page_secure"] ); if (isset($_SESSION['openedArray'])) { @@ -105,7 +105,7 @@ function makeHTML($indent,$parent,$expandAll,$theme) { $tbldg = $dbase.".`".$table_prefix."document_groups`"; $tbldgn = $dbase.".`".$table_prefix."documentgroup_names`"; // get document groups for current user - if($_SESSION['mgrDocgroups']) $docgrp = implode(",",$_SESSION['mgrDocgroups']); + $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(",",$_SESSION['mgrDocgroups']) : ''; $showProtected= false; if (isset ($modx->config['tree_show_protected'])) { $showProtected= (boolean) $modx->config['tree_show_protected']; diff --git a/manager/frames/tree.php b/manager/frames/tree.php index 2854e759ba..87ff1a362f 100755 --- a/manager/frames/tree.php +++ b/manager/frames/tree.php @@ -1,7 +1,7 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); $theme = $manager_theme ? "$manager_theme/":""; - + $modx_textdir = isset($modx_textdir) ? $modx_textdir : null; function constructLink($action, $img, $text, $allowed) { if($allowed==1) { ?>
    @@ -33,15 +33,15 @@ function constructLink($action, $img, $text, $allowed) { var i = new Image(18,18); i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; i = new Image(18,18); i.src=""; i = new Image(18,18); i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; var rpcNode = null; diff --git a/manager/includes/controls/contextmenu.php b/manager/includes/controls/contextmenu.php index ed496e2c74..f5dbffeda0 100644 --- a/manager/includes/controls/contextmenu.php +++ b/manager/includes/controls/contextmenu.php @@ -4,14 +4,14 @@ $ContextMenuCnt = 0; class ContextMenu { - + var $id; function ContextMenu($id='',$width=120,$visible=false) { global $ContextMenuCnt; $ContextMenuCnt++; $this->html = ""; $this->visible = $visible ? $visible:false; $this->width = is_numeric($width) ? intval($width):120; - $this->id = id ? $id:"cntxMnu".$ContextMenuCnt; // set id + $this->id = $id ? $id:"cntxMnu".$ContextMenuCnt; // set id } function addItem($text,$action="",$img="",$disabled=0){ diff --git a/manager/includes/controls/datagrid.class.php b/manager/includes/controls/datagrid.class.php index 75f5255942..9c30ef0f53 100755 --- a/manager/includes/controls/datagrid.class.php +++ b/manager/includes/controls/datagrid.class.php @@ -13,7 +13,7 @@ class DataGrid { var $ds; // datasource - + var $id; var $pageSize; // pager settings var $pageNumber; var $pager; @@ -46,6 +46,8 @@ class DataGrid { var $rowAlign; // vertical alignment: top, middle, bottom var $rowIdField; + var $pagerStyle; + var $pagerClass; var $noRecordMsg = "No records found."; function DataGrid($id,$ds,$pageSize=20,$pageNumber=-1) { @@ -75,11 +77,11 @@ function RenderRowFnc($n,$row){ for($c=0;$c<$this->_colcount;$c++){ $colStyle = $Style; $fld=trim($this->_fieldnames[$c]); - $width=$this->_colwidths[$c]; - $align=$this->_colaligns[$c]; - $color=$this->_colcolors[$c]; - $type=$this->_coltypes[$c]; - $nowrap=$this->_colwraps[$c]; + $width=isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null; + $align=isset($this->_colaligns[$c]) ? $this->_colaligns[$c] : null; + $color=isset($this->_colcolors[$c]) ? $this->_colcolors[$c] : null; + $type= isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null; + $nowrap=isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null; $value = $row[($this->_isDataset && $fld ? $fld:$c)]; if($color && $Style) $colStyle = substr($colStyle,0,-1).";background-color:$color;'"; $value = $this->formatColumnValue($row,$value,$type,$align); diff --git a/manager/includes/header.inc.php b/manager/includes/header.inc.php index a9eb81b9e9..25e9d3717c 100755 --- a/manager/includes/header.inc.php +++ b/manager/includes/header.inc.php @@ -4,6 +4,7 @@ // invoke OnManagerRegClientStartupHTMLBlock event $evtOut = $modx->invokeEvent('OnManagerMainFrameHeaderHTMLBlock'); +$modx_textdir = isset($modx_textdir) ? $modx_textdir : null; $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : ''; ?> entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey; $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username; - $this->entry['itemId'] = empty($itemid) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object + $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid; // writes the id to the object if($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0 - $this->entry['itemName'] = $itemname == "" ? $_SESSION['itemname'] : $itemname; // writes the id to the object + $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname']))? $_SESSION['itemname'] : $itemname; // writes the id to the object if($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty $this->writeToLog(); diff --git a/manager/includes/paginate.inc.php b/manager/includes/paginate.inc.php index f6817fbccd..adb42801df 100755 --- a/manager/includes/paginate.inc.php +++ b/manager/includes/paginate.inc.php @@ -96,7 +96,7 @@ function getPagingArray(){ // This function returns an array of string (href link with the page number) function getPagingRowArray(){ global $PHP_SELF; - + $array_all_page = array(); for( $i=0; $i<$this->getNumberOfPage(); $i++ ){ // if current page, do not make a link if( $i == $this->getCurrentPage() ){ diff --git a/manager/index.php b/manager/index.php index 533feda57c..a1024c451a 100755 --- a/manager/index.php +++ b/manager/index.php @@ -221,7 +221,7 @@ // so we dump the error, thereby stopping the script. } else { - $action= (int) $_REQUEST['a']; + $action= isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : null; } if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) { From 8c752786643542dbc019b4bcc873465c013db0c6 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Wed, 14 Aug 2013 09:13:56 +0300 Subject: [PATCH 241/530] 1.0.11RC Aug 14, 2013 --- manager/includes/version.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/version.inc.php b/manager/includes/version.inc.php index bf6b3329ef..45b93ea01c 100755 --- a/manager/includes/version.inc.php +++ b/manager/includes/version.inc.php @@ -1,5 +1,5 @@ Date: Wed, 14 Aug 2013 12:32:48 +0300 Subject: [PATCH 242/530] fix where with @SQL in ditto --- assets/snippets/ditto/classes/ditto.class.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/snippets/ditto/classes/ditto.class.inc.php b/assets/snippets/ditto/classes/ditto.class.inc.php index d12d461d0f..4fdfec26e8 100644 --- a/assets/snippets/ditto/classes/ditto.class.inc.php +++ b/assets/snippets/ditto/classes/ditto.class.inc.php @@ -621,15 +621,15 @@ function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, // Create where clause $where = array (); + if ($myWhere != '') { + $where[] = $myWhere; + } if ($hideFolders) { $where[] = 'isfolder = 0'; } if ($showInMenuOnly) { $where[] = 'hidemenu = 0'; } - if ($myWhere != '') { - $where[] = $myWhere; - } $where = implode(" AND ", $where); $limit = ($limit == 0) ? "" : $limit; // set limit From e48ab10827dafbe7ab7438e2077d0e57c00fa742 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Fri, 16 Aug 2013 13:24:10 +0300 Subject: [PATCH 243/530] small fix --- manager/includes/document.parser.class.inc.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 3739a198b4..82cb4c4dbd 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -3225,14 +3225,15 @@ function parseProperties($propertyString) { $parameter= array (); if (!empty ($propertyString)) { $tmpParams= explode("&", $propertyString); - $count = count($tmpParams); - for ($x= 0; $x < $count; $x++) { + for ($x= 0; $x < count($tmpParams); $x++) { if (strpos($tmpParams[$x], '=', 0)) { - $pTmp= explode("=", $tmpParams[$x], 2); - $pvTmp= explode(";", trim($pTmp[1]), 3); - $pvTmp[2] = isset($pvTvm[2]) ? $pvTmp[2] : null; - $pvTmp[3] = isset($pvTmp[3]) ? $pvTmp[3] : null; - $parameter[trim($pTmp[0])] = ($pvTmp[1] == 'list') ? $pvTmp[3] : $pvTmp[2]; + $pTmp= explode("=", $tmpParams[$x]); + $pvTmp= explode(";", trim($pTmp[1])); + if ($pvTmp[1] == 'list' && $pvTmp[3] != "") + $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default + else + if ($pvTmp[1] != 'list' && $pvTmp[2] != "") + $parameter[trim($pTmp[0])]= $pvTmp[2]; } } } From b477dc4576e0fa2dfdf492c7568260113ec507f6 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Fri, 16 Aug 2013 17:22:26 +0300 Subject: [PATCH 244/530] fix datapicker in Opera --- manager/media/calendar/datepicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/media/calendar/datepicker.js b/manager/media/calendar/datepicker.js index e389841982..77c79b3a1f 100644 --- a/manager/media/calendar/datepicker.js +++ b/manager/media/calendar/datepicker.js @@ -321,7 +321,7 @@ var DatePicker = new Class({ /* Remove the calendar from the page */ remove: function(dp){ dp.active = false; - if (window.opera && dp.container) dp.container.empty(); + if (dp.container) dp.container.empty(); else if (dp.container) dp.container.remove(); dp.calendar = false; dp.container = false; From f67a89543b83761d8965ed759448ffdbf9991872 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 18 Aug 2013 08:27:39 +0300 Subject: [PATCH 245/530] fix seo strict settings --- manager/includes/document.parser.class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 82cb4c4dbd..601a27dc8c 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -1254,7 +1254,7 @@ function rewriteUrls($documentSource) { function _fixURI(){ // FIX URLs - if ((int)$this->documentIdentifier != 0 && $this->config['seostrict']=='1' ){ + if ((int)$this->documentIdentifier != 0 && $this->config['seostrict']=='1' && $this->config['friendly_urls']=='1'){ if ($this->config['site_status'] == 1) { $myProtocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http'; $parts = explode("?", $_SERVER['REQUEST_URI'],2); From 574459ba229eacd661768f94ae51d3c5f6dd75bd Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Tue, 20 Aug 2013 22:12:21 +0300 Subject: [PATCH 246/530] fix seostrict --- manager/includes/extenders/deprecated.functions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/extenders/deprecated.functions.inc.php b/manager/includes/extenders/deprecated.functions.inc.php index 696a8e3d98..fe818192bb 100644 --- a/manager/includes/extenders/deprecated.functions.inc.php +++ b/manager/includes/extenders/deprecated.functions.inc.php @@ -171,7 +171,7 @@ function getKeywords($id= 0) { return $keywords; } - function makeFriendlyURL($pre, $suff, $alias, $isfolder=0, $id) { + function makeFriendlyURL($pre, $suff, $alias, $isfolder=0, $id=0) { global $modx; if ($id == $modx->config['site_start'] && $modx->config['seostrict']==='1') {return '/';} $Alias = explode('/',$alias); From eed9daf0aabec4fe8ef35a897555170e294927ab Mon Sep 17 00:00:00 2001 From: yama Date: Thu, 22 Aug 2013 10:25:29 +0900 Subject: [PATCH 247/530] Update language file - polish-utf8.inc.php Thanks pepe --- manager/includes/lang/polish-utf8.inc.php | 102 +++++++++++++--------- 1 file changed, 61 insertions(+), 41 deletions(-) diff --git a/manager/includes/lang/polish-utf8.inc.php b/manager/includes/lang/polish-utf8.inc.php index 68c785c38c..8b3f7e9f27 100644 --- a/manager/includes/lang/polish-utf8.inc.php +++ b/manager/includes/lang/polish-utf8.inc.php @@ -5,7 +5,7 @@ * Encoding: UTF8 * Author: The MODx Project Team * - * Translation and revision for MODx v. 1.0.10 by: + * Translation and revision for MODX v. 1.0.10 by: * Piotr Matysiak - web@pm-fx.com * * Translation and revision for MODx v. 1.0.4 by: @@ -113,8 +113,8 @@ $_lang["chunk_multiple_id"] = 'Błąd: Wiele Chunk\'ów posiada to samo ID.'; $_lang["chunk_no_exist"] = 'Chunk nie istnieje.'; $_lang["cleaningup"] = 'Czyszczenie'; -$_lang["clean_uploaded_filename"] = 'Use Transliteration for File Uploads'; -$_lang["clean_uploaded_filename_message"] = 'Use the default or transalias settings for the file name to clean special characters from uploaded file names, preserving dot-characters (periods)'; +$_lang["clean_uploaded_filename"] = 'Używaj transliteracji dla ładowanych plików'; +$_lang["clean_uploaded_filename_message"] = 'Użyj domyślnych ustawień Transalias aby generować nazwy ładowanych plików oczyszczone ze znaków specjalnych.'; $_lang["clear_log"] = 'Wyczyść log'; $_lang["click_to_context"] = 'Kliknij aby otworzyć menu kontekstowe'; $_lang["click_to_edit_title"] = 'Kliknij tutaj aby edytować rekord'; @@ -156,7 +156,7 @@ $_lang["configcheck_unauthorizedpage_unpublished"] = 'Strona Braku Konfiguracji zdefiniowana w ustawieniach jest nieopublikowana.'; $_lang["configcheck_unauthorizedpage_unpublished_msg"] = 'Oznacza to, że Strona Braku Autoryzacji serwisu jest niedostępna dla odwiedzających. Opublikuj tą stronę albo upewnij się, że jest ona przypisana do istniejącego dokumentu w drzewie zawartości Twojej strony.'; $_lang["configcheck_validate_referer"] = 'Ostrzeżenie odnośnie bezpieczeństwa: Weryfikacja nagłówków HTTP_REFERER'; -$_lang["configcheck_validate_referer_msg"] = "Ustawienie konfiguracyjne Weryfikuj nagłówki HTTP_REFERER jest wyłączone. Zalecamy aby było ono włączone. Przejdź do konfiguracji systemu
    Nie pokazuj tego komunikatu ponownie./em>"; +$_lang["configcheck_validate_referer_msg"] = 'Ustawienie konfiguracyjne Weryfikuj nagłówki HTTP_REFERER jest wyłączone. Zalecamy aby było ono włączone. Przejdź do konfiguracji systemu
    Nie pokazuj tego komunikatu ponownie./em>'; $_lang["configcheck_warning"] = 'Nieprawidłowości w konfiguracji:'; $_lang["configcheck_what"] = 'Co to oznacza?'; $_lang["confirm_block"] = 'Czy na pewno chcesz zablokować tego użytkownika?'; @@ -948,9 +948,42 @@ $_lang["sys_alert"] = 'Alarm systemowy'; $_lang["sysinfo_activity_message"] = 'Ta lista zawiera wykaz dokumentów, które były ostatnio edytowane.'; $_lang["sysinfo_userid"] = 'Użytkownik'; -$_lang["system_email_signup"] = "Witaj [+uid+]\n\nPoniżej znajdują się szczegóły logowania do Panelu Administracji [+sname+] :\n\nLogin: [+uid+]\nHasło: [+pwd+]\n\nPo zalogowaniu do Panelu Administracji ([+surl+]), możesz zmienić swoje hasło.\n\nPozdrawiam,\nAdministrator witryny"; -$_lang["system_email_webreminder"] = "Witaj [+uid+]\n\nAby uaktywnić nowe hasło kliknij na poniższy link:\n\n[+surl+]\n\nPo zakończeniu możesz użyć następującego hasła do zalogowania się:\n\nHasło:[+pwd+]\n\neśli nie zgłaszałeś zmiany hasła zignoruj ten e-mail.\n\nPozdrawiam,\nAdministrator witryny"; -$_lang["system_email_websignup"] = "Witaj [+uid+]\n\nPoniżej znajdują się szczegóły logowania do strony [+sname+]:\n\nLogin: [+uid+]\nHasło: [+pwd+]\n\nPo zalogowaniu do [+sname+] ([+surl+]), możesz zmienić swoje hasło.\n\nPozdrawiam,\nAdministrator witryny"; +$_lang["system_email_signup"] = 'Witaj [+uid+] + +Poniżej znajdują się szczegóły logowania do Panelu Administracji [+sname+] : + +Login: [+uid+] +Hasło: [+pwd+] + +Po zalogowaniu do Panelu Administracji ([+surl+]), możesz zmienić swoje hasło. + +Pozdrawiam, +Administrator witryny'; +$_lang["system_email_webreminder"] = 'Witaj [+uid+] + +Aby uaktywnić nowe hasło kliknij na poniższy link: + +[+surl+] + +Po zakończeniu możesz użyć następującego hasła do zalogowania się: + +Hasło:[+pwd+] + +eśli nie zgłaszałeś zmiany hasła zignoruj ten e-mail. + +Pozdrawiam, +Administrator witryny'; +$_lang["system_email_websignup"] = 'Witaj [+uid+] + +Poniżej znajdują się szczegóły logowania do strony [+sname+]: + +Login: [+uid+] +Hasło: [+pwd+] + +Po zalogowaniu do [+sname+] ([+surl+]), możesz zmienić swoje hasło. + +Pozdrawiam, +Administrator witryny'; $_lang["table_hoverinfo"] = 'Zatrzymaj kursor myszy nad nazwą tabeli aby zobaczyć krótki opis jej funkcji (nie wszystkie tabele są opatrzone komentarzami.)'; $_lang["table_prefix"] = 'Prefiks tabel'; $_lang["tag"] = 'Tag'; @@ -1113,20 +1146,16 @@ $_lang["yourinfo_title"] = 'Twoje info'; $_lang["yourinfo_total_logins"] = 'Całkowita ilość logowań:'; $_lang["yourinfo_username"] = 'Jesteś zalogowany jako:'; - -$_lang['a17_error_reporting_title'] = 'Poziom wykrywania błędów PHP'; -$_lang['a17_error_reporting_msg'] = 'Ustaw poziom wykrywania błędów PHP.'; -$_lang['a17_error_reporting_opt0'] = 'Ignoruj wszystko'; -$_lang['a17_error_reporting_opt1'] = 'Ignoruj ostrzeżenia niskiego poziomu (E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT)'; -$_lang['a17_error_reporting_opt2'] = 'Wykrywaj wszystkie błędy poza E_NOTICE'; -$_lang['a17_error_reporting_opt99'] = 'Wykrywaj wszystko'; - +$_lang["a17_error_reporting_title"] = 'Poziom wykrywania błędów PHP'; +$_lang["a17_error_reporting_msg"] = 'Ustaw poziom wykrywania błędów PHP.'; +$_lang["a17_error_reporting_opt0"] = 'Ignoruj wszystko'; +$_lang["a17_error_reporting_opt1"] = 'Ignoruj ostrzeżenia niskiego poziomu (E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT)'; +$_lang["a17_error_reporting_opt2"] = 'Wykrywaj wszystkie błędy poza E_NOTICE'; +$_lang["a17_error_reporting_opt99"] = 'Wykrywaj wszystko'; $_lang["pwd_hash_algo_title"] = 'Algorytm haszowania'; $_lang["pwd_hash_algo_message"] = 'Algorytm haszowania hasła.'; - $_lang["enable_bindings_title"] = 'Włącz komendy @Bindings'; -$_lang['enable_bindings_message'] = 'Zapobiega wykonywaniu funkcji PHP poprzez TV @Bindings. Użyteczny gdy istnieją użytkownicy Managera, którzy nie powinni mieć dostępu do tworzenia kodu PHP, ale potrzebują tworzyć lub edytować TV. Wynikiem każdej TV która zawiera @Binding będzie "@Bindings disabled".'; - +$_lang["enable_bindings_message"] = 'Zapobiega wykonywaniu funkcji PHP poprzez TV @Bindings. Użyteczny gdy istnieją użytkownicy Managera, którzy nie powinni mieć dostępu do tworzenia kodu PHP, ale potrzebują tworzyć lub edytować TV. Wynikiem każdej TV która zawiera @Binding będzie "@Bindings disabled".'; $_lang["bkmgr_alert_mkdir"] = 'Plik nie mógł zostać utworzony w katalogu. Proszę sprawdzić uprawnienia [+snapshot_path+]'; $_lang["bkmgr_restore_msg"] = '

    Serwis może zostać przywrócony używając pliku SQL.

    '; $_lang["bkmgr_restore_title"] = 'Przywróć'; @@ -1142,7 +1171,6 @@ $_lang["bkmgr_snapshot_list_title"] = 'Lista zrzutów'; $_lang["bkmgr_restore_submit"] = 'Przywróć te dane'; $_lang["bkmgr_snapshot_nothing"] = 'Brak zrzutów'; - $_lang["files.dynamic.php1"] = 'Utwórz plik tekstowy'; $_lang["files.dynamic.php2"] = 'Ten katalog nie może zostać wyświetlony.'; $_lang["files.dynamic.php3"] = 'Wystąpił problem z nazwą pliku.'; @@ -1150,37 +1178,29 @@ $_lang["not_readable_dir"] = 'Nie można odczytać katalogu.'; $_lang["confirm_delete_dir"] = 'Czy na pewno chcesz usunąć ten katalog?'; $_lang["confirm_delete_dir_recursive"] = 'Czy na pewno chcesz usunąć ten katalog?\n\nWszystkie jego pliki również zostaną usunięte.'; - -$_lang['make_folders_title'] = 'Dodawaj ukośnik na końcach folderów'; -$_lang['make_folders_message'] = 'Ukośnik będzie dodany do dokumentów oznaczonych jako foldery, gdy używa się przyjaznych URL.'; - -$_lang['check_files_onlogin_title'] = 'Sprawdzaj ważne pliki przy logowaniu'; -$_lang['check_files_onlogin_message'] = 'Włączając tę opcję, ważne pliki systemowe będą sprawdzane pod kątem niechcianych modyfikacji typowych dla ataków na stronę www. Chociaż nie jest to 100% zapezpiecznie, to może zaalarmować Cię o zmanipulowanych plikach MODX.'; - -$_lang['configcheck_sysfiles_mod'] = 'Ważne pliki systemowe zostały zmienione.'; -$_lang['configcheck_sysfiles_mod_msg'] = 'Włączyłeś sprawdzanie ważnych plików systemowych podczas logowania, w celu wykrycia potencjalnych ataków na stronę www. Ten komunikat nie koniecznie oznacza, że Twoja strona została zaatakowana, jednakże zaleca się sprawdzenie zmienionych plików (index.php, .htaccess, [+MGR_DIR+]/index.php, manager/includes/config.inc.php).'; - -$_lang['email_method_title'] = 'Metoda wysyłania poczty'; -$_lang['email_method_mail'] = 'Funkcja PHP mail()'; -$_lang['email_method_smtp'] = 'Serwer SMTP'; -$_lang['smtp_auth_title'] = 'SMTP-AUTH'; -$_lang['smtp_host_title'] = 'SMTP host'; -$_lang['smtp_username_title'] = 'Nazwa użytkownika SMTP'; -$_lang['smtp_password_title'] = 'Hasło SMTP'; -$_lang['smtp_port_title'] = 'Port SMTP'; - +$_lang["make_folders_title"] = 'Dodawaj ukośnik na końcach folderów'; +$_lang["make_folders_message"] = 'Ukośnik będzie dodany do dokumentów oznaczonych jako foldery, gdy używa się przyjaznych URL.'; +$_lang["check_files_onlogin_title"] = 'Sprawdzaj ważne pliki przy logowaniu'; +$_lang["check_files_onlogin_message"] = 'Włączając tę opcję, ważne pliki systemowe będą sprawdzane pod kątem niechcianych modyfikacji typowych dla ataków na stronę www. Chociaż nie jest to 100% zapezpiecznie, to może zaalarmować Cię o zmanipulowanych plikach MODX.'; +$_lang["configcheck_sysfiles_mod"] = 'Ważne pliki systemowe zostały zmienione.'; +$_lang["configcheck_sysfiles_mod_msg"] = 'Włączyłeś sprawdzanie ważnych plików systemowych podczas logowania, w celu wykrycia potencjalnych ataków na stronę www. Ten komunikat nie koniecznie oznacza, że Twoja strona została zaatakowana, jednakże zaleca się sprawdzenie zmienionych plików (index.php, .htaccess, [+MGR_DIR+]/index.php, manager/includes/config.inc.php).'; +$_lang["email_method_title"] = 'Metoda wysyłania poczty'; +$_lang["email_method_mail"] = 'Funkcja PHP mail()'; +$_lang["email_method_smtp"] = 'Serwer SMTP'; +$_lang["smtp_auth_title"] = 'SMTP-AUTH'; +$_lang["smtp_host_title"] = 'SMTP host'; +$_lang["smtp_username_title"] = 'Nazwa użytkownika SMTP'; +$_lang["smtp_password_title"] = 'Hasło SMTP'; +$_lang["smtp_port_title"] = 'Port SMTP'; $_lang["setting_resource_tree_node_name"] = 'Nazwa węzła drzewa zasobów'; $_lang["setting_resource_tree_node_name_desc"] = 'Określ pole zasobu, które zostanie użyte w czasie renderowania węzłów w drzewie zasobów. Domyślnie to pagetitle, jednakże każde pole zasobu może zostać wykorzystane np. menutitle, alias.'; - $_lang["cache_type_title"] = 'Sposób cachowania dokumentu'; $_lang["cache_type_1"] = 'Cache bazuje tylko na id dokumentu (domyślne)'; $_lang["cache_type_2"] = 'Cache bazuje na id dokumentu oraz parametrach $_GET'; $_lang["seostrict_title"] = 'Używaj SEO Strict URLs'; $_lang["seostrict_message"] = 'Jeśli potrzeba, wymuś używanie strict URLs aby zapobiec duplikowaniu treści'; - $_lang["settings_friendlyurls_alert"] = 'Wymagana jest zmiana nazwy pliku ht.access na .htaccess aby używać przyjaznych adresów.'; $_lang["settings_friendlyurls_alert2"] = 'Ponieważ serwis zainstalowany został w podkatalogu, wymagana jest zmiana zawartości pliku .htaccess.'; - $_lang["user_street"] = 'Ulica'; $_lang["user_city"] = 'Miasto'; $_lang["user_other"] = 'Inne'; From 7246d18340177746e0939b5b780c6ae89ab54bfc Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 00:14:27 +0900 Subject: [PATCH 248/530] Refactor #10100 Add PHP compatible functions http://tracker.modx.com/issues/10100 --- .../includes/document.parser.class.inc.php | 13 ++++++++++++ .../extenders/phpcompat.class.inc.php | 21 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 manager/includes/extenders/phpcompat.class.inc.php diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 601a27dc8c..bf2e40d753 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -117,6 +117,12 @@ function loadExtension($extname) { else return false; break; + case 'PHPCOMPAT' : + if(is_object($this->phpcompat)) return; + include_once(MODX_BASE_PATH . 'manager/includes/extenders/phpcompat.class.inc.php'); + $this->phpcompat = new PHPCOMPAT; + break; + default : return false; } @@ -3585,6 +3591,13 @@ function getIdFromAlias($alias) } return $id; } + + // php compat + function htmlspecialchars($str, $flags = ENT_COMPAT) + { + $this->loadExtension('PHPCOMPAT'); + return $this->phpcompat->htmlspecialchars($str, $flags); + } // End of class. } diff --git a/manager/includes/extenders/phpcompat.class.inc.php b/manager/includes/extenders/phpcompat.class.inc.php new file mode 100644 index 0000000000..deaa1cd6ae --- /dev/null +++ b/manager/includes/extenders/phpcompat.class.inc.php @@ -0,0 +1,21 @@ +config['modx_charset']); + if(!empty($str) && empty($ent_str)) + { + $detect_order = join(',', mb_detect_order()); + $ent_str = mb_convert_encoding($str,$modx->config['modx_charset'],$detect_order); + } + return $ent_str; + } +} From 5d865ca4e228096162a40f5d9b4182b89d6373ac Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 00:19:35 +0900 Subject: [PATCH 249/530] Refactor #10097 htmlspecialchars in PHP 5.4 thanks enogu http://tracker.modx.com/issues/10097 --- manager/actions/mutate_content.dynamic.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index 015e0408b6..3399198721 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -582,19 +582,19 @@ function decode(s) { - - - - @@ -606,7 +606,7 @@ function decode(s) { - - "; echo ""; } - $evtnames[] = ''."\n"; + $evtnames[] = ''."\n"; if(count($evtnames)==2) echoEventRows($evtnames); } if(count($evtnames)>0) echoEventRows($evtnames); @@ -480,3 +480,10 @@ function echoEventRows(&$evtnames) { + Date: Sat, 24 Aug 2013 11:16:14 +0900 Subject: [PATCH 259/530] Add todo --- manager/includes/extenders/phpcompat.class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/extenders/phpcompat.class.inc.php b/manager/includes/extenders/phpcompat.class.inc.php index deaa1cd6ae..7fa124c2af 100644 --- a/manager/includes/extenders/phpcompat.class.inc.php +++ b/manager/includes/extenders/phpcompat.class.inc.php @@ -1,5 +1,5 @@ Date: Sat, 24 Aug 2013 12:16:06 +0900 Subject: [PATCH 260/530] Fix @b781969 --- manager/actions/mutate_plugin.dynamic.php | 29 +++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index ee21bdbbe8..3794912506 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -23,8 +23,7 @@ // check to see the plugin editor isn't locked -$sql = "SELECT internalKey, username FROM $dbase.`".$table_prefix."active_users` WHERE $dbase.`".$table_prefix."active_users`.action=102 AND $dbase.`".$table_prefix."active_users`.id=$id"; -$rs = $modx->db->query($sql); +$rs = $modx->db->select('internalKey, username','[+prefix+]active_users',"action='102' AND id='{$id}'"); $limit = $modx->db->getRecordCount($rs); if($limit>1) { for ($i=0;$i<$limit;$i++) { @@ -40,8 +39,7 @@ if(isset($_GET['id'])) { - $sql = "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE $dbase.`".$table_prefix."site_plugins`.id = $id;"; - $rs = $modx->db->query($sql); + $rs = $modx->db->select('*','[+prefix+]site_plugins',"id='{$id}'"); $limit = $modx->db->getRecordCount($rs); if($limit>1) { echo "Multiple plugins sharing same unique id. Not good.

    "; @@ -409,11 +407,11 @@ function decode(s){ WHERE pluginid='$id' "; $evts = array(); - $rs = $modx->db->query($sql); - $limit = $modx->db->getRecordCount($rs); + $rs = $modx->db->select('*','[+prefix+]site_plugin_events',"pluginid='{$id}'"); + $limit = $modx->db->getRecordCount($rs); for ($i=0; $i<$limit; $i++) { - $row = $modx->db->getRow($rs); - $evts[] = $row['evtid']; + $row = $modx->db->getRow($rs); + $evts[] = $row['evtid']; } } else { if(isset($content['sysevents']) && is_array($content['sysevents'])) { @@ -433,8 +431,7 @@ function decode(s){ "Template Service Events", "User Defined Events" ); - $sql = "SELECT * FROM $dbase.`".$table_prefix."system_eventnames` ORDER BY service DESC, groupname, name"; - $rs = $modx->db->query($sql); + $rs = $modx->db->select('*','[+prefix+]system_eventnames','','service DESC, groupname, name'); $limit = $modx->db->getRecordCount($rs); if($limit==0) echo "

    "; else for ($i=0; $i<$limit; $i++) { @@ -453,7 +450,7 @@ function decode(s){ echo ""; echo ""; } - $evtnames[] = ''."\n"; + $evtnames[] = ''."\n"; if(count($evtnames)==2) echoEventRows($evtnames); } if(count($evtnames)>0) echoEventRows($evtnames); @@ -481,9 +478,15 @@ function echoEventRows(&$evtnames) { setTimeout('showParameters()',10); Date: Sat, 24 Aug 2013 12:17:38 +0900 Subject: [PATCH 261/530] Small fix --- manager/actions/mutate_plugin.dynamic.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 3794912506..708d977ba1 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -291,15 +291,15 @@ function decode(s){

    -
    +

    - +
    +   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
    +   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
    +   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
      " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
    +   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
    +   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" spellcheck="true"/>
      " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
    +   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help;" />
    @@ -713,7 +713,7 @@ function decode(s) { $htmlContent = $content['content']; ?>
    - +
    '."\n"; + echo "\t".'
    '."\n"; } ?> From b4038eb6e48135bd95e27d6252059614a04c3951 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:01:58 +0900 Subject: [PATCH 250/530] TinyMCE - small fix ($params) --- assets/plugins/tinymce/functions.php | 29 ++++++++++++++--------- assets/plugins/tinymce/plugin.tinymce.php | 12 +++++----- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index 6fb2403c1c..1b7742d8b4 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -4,9 +4,9 @@ class TinyMCE { var $mce_path; - function TinyMCE($params) + function TinyMCE() { - $this->mce_path = $params['mce_path']; + $this->mce_path = $$modx->event->params['mce_path']; } function get_lang($lang) @@ -45,9 +45,10 @@ function get_lang($lang) return $lc; } - function get_skin_names($params) + function get_skin_names() { global $modx,$_lang; + $params = $modx->event->params; $skin_dir = $this->mce_path . 'tiny_mce/themes/advanced/skins/'; switch($modx->manager->action) @@ -101,9 +102,11 @@ function checked($cond = false) else return ''; } - function get_mce_settings($params) + function get_mce_settings() { global $modx, $_lang; + $params = $modx->event->params; + // language settings if (! @include_once($params['mce_path'] .'lang/'.$modx->config['manager_language'].'.inc.php')) { @@ -127,7 +130,6 @@ function get_mce_settings($params) $themes['logic'] = $_lang['mce_theme_logic']; $themes['advanced'] = $_lang['mce_theme_advanced']; $themes['legacy'] = (!empty($_lang['mce_theme_legacy'])) ? $_lang['mce_theme_legacy'] : 'legacy'; - $themes['full'] = (!empty($_lang['mce_theme_full'])) ? $_lang['mce_theme_full'] : 'full'; $themes['custom'] = $_lang['mce_theme_custom']; foreach ($themes as $key => $value) { @@ -139,7 +141,7 @@ function get_mce_settings($params) $ph['display'] = $modx->config['use_editor']==1 ? $ph['display']: 'none'; $ph['theme_options'] = $theme_options; - $ph['skin_options'] = $this->get_skin_names($params); + $ph['skin_options'] = $this->get_skin_names(); $ph['entermode_options'] = '
    '; $ph['entermode_options'] .= ''; @@ -187,9 +189,10 @@ function get_mce_settings($params) return $gsettings; } - function get_mce_script($params) + function get_mce_script() { global $modx, $_lang; + $params = $modx->event->params; $str = ''; @@ -274,8 +277,8 @@ function get_mce_script($params) } } - $str .= $this->build_mce_init($params,$plugins,$buttons1,$buttons2,$buttons3,$buttons4) . "\n"; - $str .= $this->build_tiny_callback($params); + $str .= $this->build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) . "\n"; + $str .= $this->build_tiny_callback(); if($params['link_list']=='enabled') { $str .= '' . "\n"; @@ -285,9 +288,10 @@ function get_mce_script($params) return $str; } - function build_mce_init($params,$plugins,$buttons1,$buttons2,$buttons3,$buttons4) + function build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) { global $modx; + $params = $modx->event->params; $ph['refresh_seed'] = filesize("{$this->mce_path}tiny_mce/tiny_mce.js"); $ph['mce_url'] = $params['mce_url']; @@ -407,8 +411,11 @@ function build_mce_init($params,$plugins,$buttons1,$buttons2,$buttons3,$buttons4 return $mce_init; } - function build_tiny_callback($params) + function build_tiny_callback() { + global $modx; + $params = $modx->event->params; + $ph['cmsurl'] = MODX_MANAGER_URL . 'media/browser/mcpuk/browser.php?Connector='; $ph['cmsurl'] .= MODX_MANAGER_URL . 'media/browser/mcpuk/connectors/php/connector.php&manager_url='; $ph['cmsurl'] .= MODX_MANAGER_URL . '&editor=tinymce&editorpath=' . $params['mce_url']; diff --git a/assets/plugins/tinymce/plugin.tinymce.php b/assets/plugins/tinymce/plugin.tinymce.php index 4528fddecc..8576fba2e1 100644 --- a/assets/plugins/tinymce/plugin.tinymce.php +++ b/assets/plugins/tinymce/plugin.tinymce.php @@ -11,13 +11,13 @@ $mce_path = MODX_BASE_PATH . 'assets/plugins/'.$plugin_dir . '/'; $mce_url = MODX_BASE_URL . 'assets/plugins/'.$plugin_dir . '/'; } -$params = $modx->event->params; +$params = & $modx->event->params; $params['mce_path'] = $mce_path; $params['mce_url'] = $mce_url; include_once $mce_path . 'functions.php'; -$mce = new TinyMCE($params); +$mce = new TinyMCE(); // Handle event $e = &$modx->event; @@ -27,7 +27,7 @@ $e->output("TinyMCE"); break; - case "OnRichTextEditorInit": + case "OnRichTextEditorInit": if($editor!=="TinyMCE") return; $params['css_selectors'] = $modx->config['tinymce_css_selectors']; @@ -49,7 +49,7 @@ $params['toolbar_align'] = $modx->config['manager_direction']; $params['webuser'] = null; - $html = $mce->get_mce_script($params); + $html = $mce->get_mce_script(); } else { @@ -67,7 +67,7 @@ $params['custom_buttons4'] = $webButtons4; $params['toolbar_align'] = $webAlign; - $html = $mce->get_mce_script($params); + $html = $mce->get_mce_script(); } $e->output($html); break; @@ -108,7 +108,7 @@ $params['mce_template_docs'] = $mce_settings['mce_template_docs']; $params['mce_template_chunks']= $mce_settings['mce_template_chunks']; - $html = $mce->get_mce_settings($params); + $html = $mce->get_mce_settings(); $e->output($html); break; From dfda471bc35ea420a5774ec5777e97fbdde17b58 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:02:30 +0900 Subject: [PATCH 251/530] Small fix --- manager/includes/controls/contextmenu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/controls/contextmenu.php b/manager/includes/controls/contextmenu.php index f5dbffeda0..2dc321f48c 100644 --- a/manager/includes/controls/contextmenu.php +++ b/manager/includes/controls/contextmenu.php @@ -11,7 +11,7 @@ function ContextMenu($id='',$width=120,$visible=false) { $this->html = ""; $this->visible = $visible ? $visible:false; $this->width = is_numeric($width) ? intval($width):120; - $this->id = $id ? $id:"cntxMnu".$ContextMenuCnt; // set id + $this->id = $id ? $id:"cntxMnu".$ContextMenuCnt; // set id } function addItem($text,$action="",$img="",$disabled=0){ From ddfa1a00a1c77606005dd90e49ef2a4686698e72 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:02:56 +0900 Subject: [PATCH 252/530] Change line ending char (LF) --- manager/media/style/common/login.tpl | 714 +++++++++++++-------------- 1 file changed, 357 insertions(+), 357 deletions(-) diff --git a/manager/media/style/common/login.tpl b/manager/media/style/common/login.tpl index 5bdc607371..47af71faa2 100755 --- a/manager/media/style/common/login.tpl +++ b/manager/media/style/common/login.tpl @@ -1,358 +1,358 @@ - - - - MODx CMF Manager Login - - - - - - - -
    [+site_name+]MODX Evolution
    -
    -
    - - [+OnManagerLoginFormPrerender+] -

    [+login_message+]

    -
    - - -
    -

    [+login_captcha_message+]

    - [+captcha_image+] - [+captcha_input+] -
    - - - - [+OnManagerLoginFormRender+] -
    - -
    - © 2005-2013 by MODX®, and licensed under the GPL. -
    -
    - - - - + + + + MODx CMF Manager Login + + + + + + + +
    [+site_name+]MODX Evolution
    +
    +
    + + [+OnManagerLoginFormPrerender+] +

    [+login_message+]

    +
    + + +
    +

    [+login_captcha_message+]

    + [+captcha_image+] + [+captcha_input+] +
    + + + + [+OnManagerLoginFormRender+] +
    + +
    + © 2005-2013 by MODX®, and licensed under the GPL. +
    +
    + + + + \ No newline at end of file From c8743b1c3d616d58495478e8a0b8269d56673c2b Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:03:32 +0900 Subject: [PATCH 253/530] Fix MODxRE style --- manager/media/style/MODxRE/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manager/media/style/MODxRE/style.css b/manager/media/style/MODxRE/style.css index 37b81033b7..65027ecf97 100644 --- a/manager/media/style/MODxRE/style.css +++ b/manager/media/style/MODxRE/style.css @@ -511,7 +511,7 @@ input.submit { margin: 5px 15px 15px; display: block; } - .tab-page .sectionBody, .section .sectionBody { + .tab-page .sectionBody, .tab-page .section .sectionBody { background: none repeat scroll 0 0 #F7F7F7; border: 1px solid #CCCCCC; margin: 0 3px 15px; @@ -519,8 +519,10 @@ input.submit { } .section .sectionBody { margin:0 15px 15px; + padding: 7px; padding-left:15px; background-color:#fff; + border: 1px solid #CCCCCC; } .rtl .sectionBody, .layerVisible { direction: rtl; From bf786b61f5a6e9b4d555c7ff007d237fba568b8e Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:05:22 +0900 Subject: [PATCH 254/530] Small fix (plugin edit) --- manager/actions/mutate_plugin.dynamic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index ba9920b66f..179be599dd 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -299,9 +299,9 @@ function decode(s){ -
    +

    - +
    From b78196986c21ec3725331086b39ebfbb2d625f27 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:07:05 +0900 Subject: [PATCH 255/530] Refactor #10103 Add label tag on checkbox fields http://tracker.modx.com/issues/10103 --- manager/actions/mutate_plugin.dynamic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 179be599dd..46449e635e 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -312,7 +312,7 @@ function decode(s){ - + @@ -457,7 +457,7 @@ function decode(s){ echo ""; echo ""; } - $evtnames[] = ''.$row['name']; + $evtnames[] = ''."\n"; if(count($evtnames)==2) echoEventRows($evtnames); } if(count($evtnames)>0) echoEventRows($evtnames); From 48bce630be4d38b3321d65848d5e6664c2af07da Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:07:56 +0900 Subject: [PATCH 256/530] Small fix (DBAPI format) --- manager/actions/mutate_plugin.dynamic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 46449e635e..c7fde273c8 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -365,8 +365,8 @@ function decode(s){ "INNER JOIN ".$modx->getFullTableName("site_plugins")." sp ON sp.id=smd.resource ". "WHERE smd.resource='$id' AND sm.enable_sharedparams='1' ". "ORDER BY sm.name "; - $ds = $modx->dbQuery($sql); - if($ds) while($row = $modx->fetchRow($ds)){ + $ds = $modx->db->query($sql); + if($ds) while($row = $modx->db->getRow($ds)){ echo ""; } ?> From 6f09944f27ef20b69dd08e552b8faad39a5dc09b Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:09:08 +0900 Subject: [PATCH 257/530] Improved edit plugin style --- manager/actions/mutate_plugin.dynamic.php | 12 ++---------- manager/media/style/MODxRE/style.css | 3 ++- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index c7fde273c8..ca5b168db8 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -394,15 +394,11 @@ function decode(s){
    :
    value="on" class="inputBox"> ".$_lang['plugin_disabled']."":$_lang['plugin_disabled']; ?>":$_lang['plugin_disabled']; ?>
    value="on" class="inputBox">
    ".$row['groupname']."
    - +

     
    - - - - - -
       - +
    -
    -  
    diff --git a/manager/media/style/MODxRE/style.css b/manager/media/style/MODxRE/style.css index 65027ecf97..d503c81a4d 100644 --- a/manager/media/style/MODxRE/style.css +++ b/manager/media/style/MODxRE/style.css @@ -1781,4 +1781,5 @@ strong[style*='color:#EF1D1D'] { color: red !important; } -span.unpublish{color:gray;} \ No newline at end of file +span.unpublish{color:gray;} +#tabEvents table, #tabEvents td {padding:2px;} From 533cfc00050fade092dbaabcf710ef040903d138 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 11:13:05 +0900 Subject: [PATCH 258/530] Refactor #10104 Add bold style on selected checkbox fields http://tracker.modx.com/issues/10104 --- manager/actions/mutate_plugin.dynamic.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index ca5b168db8..ee21bdbbe8 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -453,7 +453,7 @@ function decode(s){ echo "
    ".$row['groupname']."
     
    ".$row['groupname']."
    @@ -332,7 +332,7 @@ function decode(s){

    - +
    :
    @@ -389,7 +389,7 @@ function decode(s){

    - +
    :  
    From b3a72a80d29b1debb1a456e6e79f255f02daa7d2 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 12:19:07 +0900 Subject: [PATCH 262/530] semicolon bug --- manager/actions/mutate_plugin.dynamic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 708d977ba1..81e2a2cff1 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -104,7 +104,7 @@ function showParameters(ctrl) { for(p = 0; p < dp.length; p++) { dp[p]=(dp[p]+'').replace(/^\s|\s$/,""); // trim ar = dp[p].split("="); - key = ar[0] // param + key = ar[0]; // param ar = (ar[1]+'').split(";"); desc = ar[0]; // description dt = ar[1]; // data type From b534b21fcb4c40cdd94be177bf2efe82f66544ae Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 12:20:55 +0900 Subject: [PATCH 263/530] Bug #10105 Need encode plugin parameters http://tracker.modx.com/issues/10105 --- manager/actions/mutate_plugin.dynamic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 81e2a2cff1..661406c3f2 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -231,7 +231,7 @@ function implodeParameters(){ if(currentParams[p]) { v = currentParams[p].join(";"); if(s && v) s+=' '; - if(v) s += '&'+p+'='+ v; + if(v) s += '&'+p+'='+ encode(v); } } document.forms['mutate'].properties.value = s; From 37cf728cc94ae7fc45868231b58c1d76622ef5b9 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 14:23:24 +0900 Subject: [PATCH 264/530] Small fix --- manager/actions/mutate_plugin.dynamic.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 661406c3f2..cab746fb60 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -390,22 +390,12 @@ function decode(s){

    -
    - - - - - - -
    +

    0) { - $sql = " - SELECT evtid, pluginid - FROM $dbase.`".$table_prefix."site_plugin_events` - WHERE pluginid='$id' - "; $evts = array(); $rs = $modx->db->select('*','[+prefix+]site_plugin_events',"pluginid='{$id}'"); $limit = $modx->db->getRecordCount($rs); @@ -461,9 +451,6 @@ function echoEventRows(&$evtnames) { } ?>
    -
    From 8699e22bacf0bd564a1e0dd9bedf960ccffb9f7f Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 14:26:25 +0900 Subject: [PATCH 265/530] small fix --- manager/actions/mutate_tmplvars.dynamic.php | 123 +++++++++----------- 1 file changed, 58 insertions(+), 65 deletions(-) diff --git a/manager/actions/mutate_tmplvars.dynamic.php b/manager/actions/mutate_tmplvars.dynamic.php index e3b6fffd4e..124eff6e69 100644 --- a/manager/actions/mutate_tmplvars.dynamic.php +++ b/manager/actions/mutate_tmplvars.dynamic.php @@ -9,35 +9,31 @@ $e->dumpError(); } - - -if(isset($_REQUEST['id'])) { - $id = $_REQUEST['id']; -} else { - $id=0; -} - +if(isset($_REQUEST['id'])) $id = (int) $_REQUEST['id']; +else $id = 0; // check to see the variable editor isn't locked -$sql = "SELECT internalKey, username FROM $dbase.`".$table_prefix."active_users` WHERE action=301 AND id=$id"; -$rs = $modx->db->query($sql); -$limit = $modx->db->getRecordCount($rs); -if($limit>1) { - for ($i=0;$i<$limit;$i++) { - $lock = $modx->db->getRow($rs); - if($lock['internalKey']!=$modx->getLoginUserID()) { - $msg = sprintf($_lang["lock_msg"],$lock['username']," template variable"); - $e->setError(5, $msg); - $e->dumpError(); - } - } +$tbl_active_users = $modx->getFullTableName('active_users'); +$rs = $modx->db->select('internalKey, username',$tbl_active_users,"action=301 AND id='{$id}'"); +$total = $modx->db->getRecordCount($rs); +if($total>1) +{ + while($row = $modx->db->getRow($rs)) + { + if($row['internalKey']!=$modx->getLoginUserID()) + { + $msg = sprintf($_lang['lock_msg'], $row['username'], ' template variable'); + $e->setError(5, $msg); + $e->dumpError(); + } + } } // end check for lock - // make sure the id's a number -if(!is_numeric($id)) { - echo "Passed ID is NaN!"; +if(!is_numeric($id)) +{ + echo 'Passed ID is NaN!'; exit; } @@ -63,9 +59,9 @@ } // get available RichText Editors -$RTEditors = ""; -$evtOut = $modx->invokeEvent("OnRichTextEditorRegister",array('forfrontend' => 1)); -if(is_array($evtOut)) $RTEditors = implode(",",$evtOut); +$RTEditors = ''; +$evtOut = $modx->invokeEvent('OnRichTextEditorRegister',array('forfrontend' => 1)); +if(is_array($evtOut)) $RTEditors = implode(',',$evtOut); ?> -
    + invokeEvent("OnTVFormPrerender",array("id" => $id)); + $evtOut = $modx->invokeEvent('OnTVFormPrerender',array('id' => $id)); if(is_array($evtOut)) echo implode("",$evtOut); ?> + @@ -355,7 +352,7 @@ function decode(s){ - +
    <?php echo $_lang['tmplvars_reset_params']; ?>
      @@ -370,14 +367,12 @@ function decode(s){
    -
    +

    db->query($sql); + $from = '[+prefix+]site_templates as tpl LEFT JOIN [+prefix+]site_tmplvar_templates as stt ON stt.templateid=tpl.id AND stt.tmplvarid='.$id; + $rs = $modx->db->select('id,templatename,tmplvarid',$from); ?>
    @@ -395,7 +390,6 @@ function decode(s){
    - hasPermission('access_permissions')) { ?>
    - +

    - db->query($sql); +db->select('name, id','[+prefix+]documentgroup_names'); $limit = $modx->db->getRecordCount($rs); if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) { $groupsarray = $_POST['docgroups']; @@ -493,8 +486,8 @@ function makePublic(b){ invokeEvent("OnTVFormRender",array("id" => $id)); - if(is_array($evtOut)) echo implode("",$evtOut); + $evtOut = $modx->invokeEvent('OnTVFormRender',array('id' => $id)); + if(is_array($evtOut)) echo implode('',$evtOut); ?> From eaa40f60771c76a38e1c113f9806691b92c0daea Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 14:27:38 +0900 Subject: [PATCH 266/530] small fix --- manager/actions/mutate_tmplvars.dynamic.php | 45 ++++++++++++--------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/manager/actions/mutate_tmplvars.dynamic.php b/manager/actions/mutate_tmplvars.dynamic.php index 124eff6e69..72cee3a961 100644 --- a/manager/actions/mutate_tmplvars.dynamic.php +++ b/manager/actions/mutate_tmplvars.dynamic.php @@ -37,25 +37,32 @@ exit; } -if(isset($_GET['id'])) { - $sql = "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE id = $id;"; - $rs = $modx->db->query($sql); - $limit = $modx->db->getRecordCount($rs); - if($limit>1) { - echo "Oops, Multiple variables sharing same unique id. Not good.

    "; - exit; - } - if($limit<1) { - header("Location: /index.php?id=".$site_start); - } - $content = $modx->db->getRow($rs); - $_SESSION['itemname']=$content['caption']; - if($content['locked']==1 && $_SESSION['mgrRole']!=1) { - $e->setError(3); - $e->dumpError(); - } -} else { - $_SESSION['itemname']="New Template Variable"; +global $content; +$content = array(); +if(isset($_GET['id'])) +{ + $rs = $modx->db->select('*','[+prefix+]site_tmplvars',"id={$id}"); + $total = $modx->db->getRecordCount($rs); + if($total>1) + { + echo 'Oops, Multiple variables sharing same unique id. Not good.'; + exit; + } + if($total<1) + { + header("Location: /index.php?id={$site_start}"); + } + $content = $modx->db->getRow($rs); + $_SESSION['itemname'] = $content['caption']; + if($content['locked']==1 && $modx->hasPermission('save_role')!=1) + { + $e->setError(3); + $e->dumpError(); + } +} +else +{ + $_SESSION['itemname']="New Template Variable"; } // get available RichText Editors From dd94e6f66c5eb07a29a0d2b97d7c19d204fb6dc3 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 14:28:01 +0900 Subject: [PATCH 267/530] Semicolon bug --- manager/actions/mutate_tmplvars.dynamic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/mutate_tmplvars.dynamic.php b/manager/actions/mutate_tmplvars.dynamic.php index 72cee3a961..16b84f5e8e 100644 --- a/manager/actions/mutate_tmplvars.dynamic.php +++ b/manager/actions/mutate_tmplvars.dynamic.php @@ -142,7 +142,7 @@ function showParameters(ctrl) { for(p = 0; p < dp.length; p++) { dp[p]=(dp[p]+'').replace(/^\s|\s$/,""); // trim ar = dp[p].split("="); - key = ar[0] // param + key = ar[0]; // param ar = (ar[1]+'').split(";"); desc = ar[0]; // description dt = ar[1]; // data type From 791224524e2d0c2376f89b3e3db835ce0338c1f4 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 14:30:29 +0900 Subject: [PATCH 268/530] Refactor #10106 Add tab pane to template var edit http://tracker.modx.com/issues/10106 --- manager/actions/mutate_tmplvars.dynamic.php | 26 +++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/manager/actions/mutate_tmplvars.dynamic.php b/manager/actions/mutate_tmplvars.dynamic.php index 16b84f5e8e..35cd81c593 100644 --- a/manager/actions/mutate_tmplvars.dynamic.php +++ b/manager/actions/mutate_tmplvars.dynamic.php @@ -282,9 +282,17 @@ function decode(s){

    +
    +
    + +
    +

    +

    - +
    @@ -367,15 +375,21 @@ function decode(s){ - +
    : [**]    
    class="inputBox" />
    +
    +

    +

    + hasPermission('access_permissions')) { if($checked) $notPublic = true; - $chks.= "".$row['name']."
    "; + $chks.= ""; } else { if($checked) echo ""; } } if($modx->hasPermission('access_permissions')) { - $chks = "".$_lang['all_doc_groups']."
    ".$chks; + $chks = "".$chks; } echo $chks; ?> @@ -488,6 +502,8 @@ function makePublic(b){
    +
    + @@ -496,5 +512,7 @@ function makePublic(b){ $evtOut = $modx->invokeEvent('OnTVFormRender',array('id' => $id)); if(is_array($evtOut)) echo implode('',$evtOut); ?> +
    +
    From 70c565a65ddb297b2996eb1e92b754bee65b52be Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 14:32:52 +0900 Subject: [PATCH 269/530] Refactor #10107 Set default template at new template var http://tracker.modx.com/issues/10107 --- manager/actions/mutate_tmplvars.dynamic.php | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/manager/actions/mutate_tmplvars.dynamic.php b/manager/actions/mutate_tmplvars.dynamic.php index 35cd81c593..00c61aa179 100644 --- a/manager/actions/mutate_tmplvars.dynamic.php +++ b/manager/actions/mutate_tmplvars.dynamic.php @@ -398,13 +398,26 @@ function decode(s){ db->getRow($rs)) { - if($id == 0 && is_array($_POST['template'])) { + while ($row = $modx->db->getRow($rs)) + { + if($_REQUEST['a']=='300' && $modx->config['default_template']==$row['id']) + { + $checked = true; + } + elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) + { + $checked = true; + } + elseif($id == 0 && is_array($_POST['template'])) + { $checked = in_array($row['id'], $_POST['template']); - } else { + } + else + { $checked = $row['tmplvarid']; } - echo "".$row['templatename']."
    "; + $checked = $checked ? ' checked="checked"':''; + echo ''; } ?> From df4565143c7a05952745ce80642f6abd9632f273 Mon Sep 17 00:00:00 2001 From: yama Date: Sat, 24 Aug 2013 14:34:08 +0900 Subject: [PATCH 270/530] Small fix --- manager/actions/mutate_plugin.dynamic.php | 68 +++++++++++++---------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index cab746fb60..3982302291 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -25,11 +25,13 @@ // check to see the plugin editor isn't locked $rs = $modx->db->select('internalKey, username','[+prefix+]active_users',"action='102' AND id='{$id}'"); $limit = $modx->db->getRecordCount($rs); -if($limit>1) { - for ($i=0;$i<$limit;$i++) { - $lock = $modx->db->getRow($rs); - if($lock['internalKey']!=$modx->getLoginUserID()) { - $msg = sprintf($_lang["lock_msg"],$lock['username'],"plugin"); +if($limit>1) +{ + while($lock = $modx->db->getRow) + { + if($lock['internalKey']!=$modx->getLoginUserID()) + { + $msg = sprintf($_lang["lock_msg"],$lock['username'],$_lang['plugin']); $e->setError(5, $msg); $e->dumpError(); } @@ -37,25 +39,30 @@ } // end check for lock - -if(isset($_GET['id'])) { +if(isset($_GET['id'])) +{ $rs = $modx->db->select('*','[+prefix+]site_plugins',"id='{$id}'"); $limit = $modx->db->getRecordCount($rs); - if($limit>1) { + if($limit>1) + { echo "Multiple plugins sharing same unique id. Not good.

    "; exit; } - if($limit<1) { - header("Location: /index.php?id=".$site_start); + if($limit<1) + { + header("Location: {$modx->config['site_url']}"); } $content = $modx->db->getRow($rs); $_SESSION['itemname']=$content['name']; - if($content['locked']==1 && $_SESSION['mgrRole']!=1) { + if($content['locked']==1 && $modx->hasPermission('save_role')!=1) + { $e->setError(3); $e->dumpError(); } -} else { - $_SESSION['itemname']="New Plugin"; +} +else +{ + $_SESSION['itemname']='New Plugin'; } ?> -

    + invokeEvent("OnPluginFormPrerender",array("id" => $id)); @@ -302,7 +309,7 @@ function decode(s){ - + @@ -335,7 +342,7 @@ function decode(s){
    ::  
    - + - + - + - + - - + + @@ -398,15 +406,19 @@ function decode(s){ if(is_numeric($id) && $id > 0) { $evts = array(); $rs = $modx->db->select('*','[+prefix+]site_plugin_events',"pluginid='{$id}'"); - $limit = $modx->db->getRecordCount($rs); - for ($i=0; $i<$limit; $i++) { - $row = $modx->db->getRow($rs); - $evts[] = $row['evtid']; + while($row = $modx->db->getRow($rs)) + { + $evts[] = $row['evtid']; } - } else { - if(isset($content['sysevents']) && is_array($content['sysevents'])) { + } + else + { + if(isset($content['sysevents']) && is_array($content['sysevents'])) + { $evts = $content['sysevents']; - } else { + } + else + { $evts = array(); } } From fab58c1fdccc0d6addf4c590fc4f1646b4b750e8 Mon Sep 17 00:00:00 2001 From: yama Date: Sun, 25 Aug 2013 17:40:19 +0900 Subject: [PATCH 271/530] Fix TinyMCE --- assets/plugins/tinymce/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index 1b7742d8b4..b49f47335f 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -4,9 +4,9 @@ class TinyMCE { var $mce_path; - function TinyMCE() + function TinyMCE($params) { - $this->mce_path = $$modx->event->params['mce_path']; + $this->mce_path = $params['mce_path']; } function get_lang($lang) From 842eccdfa454577124eb80fa4ec4a7dda1b03e3a Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 17:26:05 +0300 Subject: [PATCH 272/530] small fix kcfinder --- manager/media/browser/mcpuk/themes/oxygen/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manager/media/browser/mcpuk/themes/oxygen/style.css b/manager/media/browser/mcpuk/themes/oxygen/style.css index d5c74de70c..ce2af715f0 100644 --- a/manager/media/browser/mcpuk/themes/oxygen/style.css +++ b/manager/media/browser/mcpuk/themes/oxygen/style.css @@ -63,7 +63,7 @@ input[type="button"]:focus, input[type="submit"]:focus, input[type="reset"]:focu } fieldset { - margin: 0 5px 5px 0px; + margin: 0 5px 5px 0; padding: 5px; border: 1px solid #afadaa; border-radius: 4px; @@ -227,6 +227,7 @@ tr.selected:hover > td { border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; + position:relative; } #toolbar a { From c6a3f6ec5df80b1a85ef2dd35967256cedab42db Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 18:02:33 +0300 Subject: [PATCH 273/530] fix russian lang --- manager/includes/lang/russian-UTF8.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/lang/russian-UTF8.inc.php b/manager/includes/lang/russian-UTF8.inc.php index 3c6ef9341f..85c56f9b18 100755 --- a/manager/includes/lang/russian-UTF8.inc.php +++ b/manager/includes/lang/russian-UTF8.inc.php @@ -1166,7 +1166,7 @@ $_lang["configcheck_sysfiles_mod_msg"] = 'You have enabled the setting to check important system files to detect possible website script attacks. This doesn\'t necessarily mean that your site has been compromised, however, you should review the changed files.(index.php, .htaccess, [+MGR_DIR+]/index.php, [+MGR_DIR+]/includes/config.inc.php)'; $_lang['email_method_title'] = 'Метод отправки писем'; -$_lang['email_method_mail'] = 'MAIL - ообщения отправляются с помощью функции mail().'; +$_lang['email_method_mail'] = 'MAIL - cообщения отправляются с помощью функции mail().'; $_lang['email_method_smtp'] = 'Адрес SMTP-сервера'; $_lang['smtp_auth_title'] = 'SMTP авторизация'; $_lang['smtp_host_title'] = 'Адрес SMTP-сервера'; From 2d0157f71825b9cb6e651694cb84ae94b7b2ec7e Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 18:03:12 +0300 Subject: [PATCH 274/530] fix docmanager theme html --- assets/modules/docmanager/templates/documents.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/modules/docmanager/templates/documents.tpl b/assets/modules/docmanager/templates/documents.tpl index 5a2ce96531..1d7d385db2 100644 --- a/assets/modules/docmanager/templates/documents.tpl +++ b/assets/modules/docmanager/templates/documents.tpl @@ -1,4 +1,5 @@
    +
    [+lang.DM_range_title+]
    @@ -17,5 +18,6 @@
    [+lang.DM_select_range_text+] -
    +
    +
    \ No newline at end of file From 074f4cc9f411a4cec1577d613161470a8e3d9beb Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 18:04:00 +0300 Subject: [PATCH 275/530] tv delimited list - now can with & n b s p ; --- manager/includes/tmplvars.format.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/tmplvars.format.inc.php b/manager/includes/tmplvars.format.inc.php index e4fa3b9493..5d26248b93 100755 --- a/manager/includes/tmplvars.format.inc.php +++ b/manager/includes/tmplvars.format.inc.php @@ -58,7 +58,7 @@ function getTVDisplayFormat($name,$value,$format,$paramstring="",$tvtype="",$doc case "delim": // display as delimitted list $value = parseInput($value,"||"); - $p = $params['format'] ? $params['format']:","; + $p = $params['format'] ? $params['format']:" "; if ($p=="\\n") $p = "\n"; $o = str_replace("||",$p,$value); break; From aa514ae215a4b7b555dbbcc03ebf5c485784f5ae Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 18:09:18 +0300 Subject: [PATCH 276/530] fix theme html in messages --- manager/actions/messages.static.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php index 1c2d2ac1b6..4608e530b7 100644 --- a/manager/actions/messages.static.php +++ b/manager/actions/messages.static.php @@ -8,6 +8,7 @@

    +
    +
    From e09aed0d09579b5776477e1dc37b40f41260c71f Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 18:20:15 +0300 Subject: [PATCH 277/530] fix html for themes in templates --- manager/actions/mutate_templates.dynamic.php | 6 ++++++ manager/media/style/MODxRE/style.css | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/manager/actions/mutate_templates.dynamic.php b/manager/actions/mutate_templates.dynamic.php index 6b78737fdd..668cbaf77c 100644 --- a/manager/actions/mutate_templates.dynamic.php +++ b/manager/actions/mutate_templates.dynamic.php @@ -124,6 +124,9 @@ function deletedocument() { + +
    +
    @@ -228,3 +231,6 @@ function deletedocument() { ?>
    + +
    + diff --git a/manager/media/style/MODxRE/style.css b/manager/media/style/MODxRE/style.css index d503c81a4d..ad6f310493 100644 --- a/manager/media/style/MODxRE/style.css +++ b/manager/media/style/MODxRE/style.css @@ -511,8 +511,8 @@ input.submit { margin: 5px 15px 15px; display: block; } - .tab-page .sectionBody, .tab-page .section .sectionBody { - background: none repeat scroll 0 0 #F7F7F7; + .tab-page .sectionBody, .tab-page .section .sectionBody, .sectionBody .sectionBody { + background: none repeat scroll 0 0 #F7F7F7!important; border: 1px solid #CCCCCC; margin: 0 3px 15px; padding: 7px; From bd1058c755737fb045cc77fc470b047759d14aae Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 18:24:25 +0300 Subject: [PATCH 278/530] fix html for themes in chunks --- manager/actions/mutate_htmlsnippet.dynamic.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manager/actions/mutate_htmlsnippet.dynamic.php b/manager/actions/mutate_htmlsnippet.dynamic.php index 28c6cbd89c..d2920021eb 100644 --- a/manager/actions/mutate_htmlsnippet.dynamic.php +++ b/manager/actions/mutate_htmlsnippet.dynamic.php @@ -151,7 +151,7 @@ function deletedocument() {
  • " />
    • - +

    :  :  
    ::
    :  :  
     
    :
    		: +
     
    @@ -183,7 +183,7 @@ function deletedocument() {
    -
    +
    @@ -213,6 +213,7 @@ function deletedocument() { ?> + Date: Sun, 25 Aug 2013 18:26:44 +0300 Subject: [PATCH 279/530] fix html for themes im user-dynamic --- manager/actions/mutate_user.dynamic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manager/actions/mutate_user.dynamic.php b/manager/actions/mutate_user.dynamic.php index 1c04e43274..da54991674 100644 --- a/manager/actions/mutate_user.dynamic.php +++ b/manager/actions/mutate_user.dynamic.php @@ -824,7 +824,7 @@ function SetUrl(url, width, height, alt){ $groupsarray[] = $v; } ?> - +
    +
    Date: Sun, 25 Aug 2013 18:37:30 +0300 Subject: [PATCH 280/530] fix html for themes i save user --- manager/processors/save_user.processor.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manager/processors/save_user.processor.php b/manager/processors/save_user.processor.php index 242842b5fd..991b098ccf 100755 --- a/manager/processors/save_user.processor.php +++ b/manager/processors/save_user.processor.php @@ -232,7 +232,7 @@ function generate_password($length = 10) {
  • " />
    • - +
    @@ -241,6 +241,7 @@ function generate_password($length = 10) {

    +
    " /> getLoginUserID()) ? $_lang['logout'] : $_lang['close']; ?> - +
    @@ -434,6 +435,7 @@ function generate_password($length = 10) {

    +
    Date: Sun, 25 Aug 2013 18:40:33 +0300 Subject: [PATCH 281/530] fix html for themes i save user --- manager/processors/save_web_user.processor.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manager/processors/save_web_user.processor.php b/manager/processors/save_web_user.processor.php index f81ac634c2..825e2c7f49 100755 --- a/manager/processors/save_web_user.processor.php +++ b/manager/processors/save_web_user.processor.php @@ -199,7 +199,7 @@
  • " />
    • - +
    @@ -208,6 +208,7 @@

    +
    " /> - +

    +
    Date: Mon, 26 Aug 2013 00:43:46 +0900 Subject: [PATCH 282/530] Fix - TinyMCE --- assets/plugins/tinymce/functions.php | 129 ++++++++++++++++++---- assets/plugins/tinymce/plugin.tinymce.php | 90 +-------------- 2 files changed, 112 insertions(+), 107 deletions(-) diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index b49f47335f..eade440fb1 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -2,11 +2,14 @@ class TinyMCE { - var $mce_path; + var $params; - function TinyMCE($params) + function TinyMCE() { - $this->mce_path = $params['mce_path']; + global $modx; + $this->params = $modx->event->params; + $this->params['mce_path'] = MODX_BASE_PATH . 'assets/plugins/tinymce/'; + $this->params['mce_url'] = MODX_BASE_URL . 'assets/plugins/tinymce/'; } function get_lang($lang) @@ -48,9 +51,10 @@ function get_lang($lang) function get_skin_names() { global $modx,$_lang; - $params = $modx->event->params; + $params = $this->params; + $mce_path = $params['mce_path']; - $skin_dir = $this->mce_path . 'tiny_mce/themes/advanced/skins/'; + $skin_dir = "{$mce_path}tiny_mce/themes/advanced/skins/"; switch($modx->manager->action) { case '11': @@ -105,15 +109,51 @@ function checked($cond = false) function get_mce_settings() { global $modx, $_lang; - $params = $modx->event->params; + $params = $this->params; + $mce_path = $params['mce_path']; + + switch ($modx->manager->action) + { + case 11: + $mce_settings = array(); + break; + case 12: + case 119: + $mce_settings = $usersettings; + if(!empty($usersettings['tinymce_editor_theme'])) + { + $usersettings['tinymce_editor_theme'] = $settings['tinymce_editor_theme']; + } + break; + case 17: + $mce_settings = $settings; + break; + default: + $mce_settings = $settings; + break; + } + + $params['theme'] = $mce_settings['tinymce_editor_theme']; + $params['mce_editor_skin'] = $mce_settings['mce_editor_skin']; + $params['mce_entermode'] = $mce_settings['mce_entermode']; + $params['mce_element_format'] = $mce_settings['mce_element_format']; + $params['mce_schema'] = $mce_settings['mce_schema']; + $params['css_selectors'] = $mce_settings['tinymce_css_selectors']; + $params['custom_plugins'] = $mce_settings['tinymce_custom_plugins']; + $params['custom_buttons1'] = $mce_settings['tinymce_custom_buttons1']; + $params['custom_buttons2'] = $mce_settings['tinymce_custom_buttons2']; + $params['custom_buttons3'] = $mce_settings['tinymce_custom_buttons3']; + $params['custom_buttons4'] = $mce_settings['tinymce_custom_buttons4']; + $params['mce_template_docs'] = $mce_settings['mce_template_docs']; + $params['mce_template_chunks']= $mce_settings['mce_template_chunks']; // language settings - if (! @include_once($params['mce_path'] .'lang/'.$modx->config['manager_language'].'.inc.php')) + if (! @include_once("{$mce_path}lang/".$modx->config['manager_language'].'.inc.php')) { - include_once($params['mce_path'] .'lang/english.inc.php'); + include_once("{$mce_path}lang/english.inc.php"); } - include_once $params['mce_path'] . 'settings/default_params.php'; + include_once("{$mce_path}settings/default_params.php"); $ph += $_lang; switch($modx->manager->action) @@ -179,7 +219,7 @@ function get_mce_settings() break; } - $gsettings = file_get_contents($params['mce_path'] . 'inc/gsettings.html.inc'); + $gsettings = file_get_contents("{$mce_path}inc/gsettings.html.inc"); foreach($ph as $name => $value) { @@ -192,7 +232,46 @@ function get_mce_settings() function get_mce_script() { global $modx, $_lang; - $params = $modx->event->params; + $params = $this->params; + $mce_path = $params['mce_path']; + $mce_url = $params['mce_url']; + + $params['css_selectors'] = $modx->config['tinymce_css_selectors']; + $params['use_browser'] = $modx->config['use_browser']; + $params['editor_css_path'] = $modx->config['editor_css_path']; + + if($modx->isBackend() || (intval($_GET['quickmanagertv']) == 1 && isset($_SESSION['mgrValidated']))) + { + $params['theme'] = $modx->config['tinymce_editor_theme']; + $params['mce_editor_skin'] = $modx->config['mce_editor_skin']; + $params['mce_entermode'] = $modx->config['mce_entermode']; + $params['language'] = $this->get_lang($modx->config['manager_language']); + $params['frontend'] = false; + $params['custom_plugins'] = $modx->config['tinymce_custom_plugins']; + $params['custom_buttons1'] = $modx->config['tinymce_custom_buttons1']; + $params['custom_buttons2'] = $modx->config['tinymce_custom_buttons2']; + $params['custom_buttons3'] = $modx->config['tinymce_custom_buttons3']; + $params['custom_buttons4'] = $modx->config['tinymce_custom_buttons4']; + $params['toolbar_align'] = $modx->config['manager_direction']; + $params['webuser'] = null; + } + else + { + $frontend_language = isset($modx->config['fe_editor_lang']) ? $modx->config['fe_editor_lang']:''; + $webuser = (isset($modx->config['rb_webuser']) ? $modx->config['rb_webuser'] : null); + + $params['theme'] = $webtheme; + $params['webuser'] = $webuser; + $params['language'] = $this->get_lang($frontend_language); + $params['frontend'] = true; + $params['custom_plugins'] = $webPlugins; + $params['custom_buttons1'] = $webButtons1; + $params['custom_buttons2'] = $webButtons2; + $params['custom_buttons3'] = $webButtons3; + $params['custom_buttons4'] = $webButtons4; + $params['toolbar_align'] = $webAlign; + + } $str = ''; @@ -281,7 +360,7 @@ function get_mce_script() $str .= $this->build_tiny_callback(); if($params['link_list']=='enabled') { - $str .= '' . "\n"; + $str .= '' . "\n"; } @@ -291,11 +370,13 @@ function get_mce_script() function build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) { global $modx; - $params = $modx->event->params; + $params = $this->params; + $mce_path = $params['mce_path']; + $mce_url = $params['mce_url']; - $ph['refresh_seed'] = filesize("{$this->mce_path}tiny_mce/tiny_mce.js"); - $ph['mce_url'] = $params['mce_url']; - $ph['elmList'] = implode(",", $params['elements']); + $ph['refresh_seed'] = filesize("{$mce_path}tiny_mce/tiny_mce.js"); + $ph['mce_url'] = $mce_url; + $ph['elmList'] = implode(',', $params['elements']); $ph['width'] = (!empty($params['width'])) ? $params['width'] : '100%'; $ph['height'] = (!empty($params['height'])) ? $params['height'] : '300'; $ph['language'] = (empty($params['language'])) ? 'en' : $params['language']; @@ -383,7 +464,7 @@ function build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) $ph['onchange_callback'] = ($params['frontend']!==false)? "'myCustomOnChangeHandler'" : 'false'; $ph['terminate'] = (!empty($params['customparams'])) ? ',' : ''; $ph['customparams'] = rtrim($params['customparams'], ','); - $content_css[] = $params['mce_url'] . 'style/content.css'; + $content_css[] = "{$mce_url}style/content.css"; if (preg_match('@^/@', $params['editor_css_path'])) { $content_css[] = $params['editor_css_path']; @@ -397,11 +478,11 @@ function build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) $content_css[] = MODX_SITE_URL . $params['editor_css_path']; } $ph['content_css'] = join(',', $content_css); - $ph['link_list'] = ($params['link_list']=='enabled') ? "'{$params['mce_url']}js/tinymce.linklist.php'" : 'false'; + $ph['link_list'] = ($params['link_list']=='enabled') ? "'{$mce_url}js/tinymce.linklist.php'" : 'false'; - $ph['tpl_list'] = $params['mce_url'] . 'js/get_template.php'; + $ph['tpl_list'] = "{$mce_url}js/get_template.php"; - $mce_init = file_get_contents($params['mce_path'] . 'js/mce_init.js.inc'); + $mce_init = file_get_contents("{$mce_path}js/mce_init.js.inc"); foreach($ph as $name => $value) { @@ -414,12 +495,14 @@ function build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) function build_tiny_callback() { global $modx; - $params = $modx->event->params; + $params = $this->params; + $mce_path = $params['mce_path']; + $mce_url = $params['mce_url']; $ph['cmsurl'] = MODX_MANAGER_URL . 'media/browser/mcpuk/browser.php?Connector='; $ph['cmsurl'] .= MODX_MANAGER_URL . 'media/browser/mcpuk/connectors/php/connector.php&manager_url='; - $ph['cmsurl'] .= MODX_MANAGER_URL . '&editor=tinymce&editorpath=' . $params['mce_url']; - $modx_fb = file_get_contents($params['mce_path'] . 'js/modx_fb.js.inc'); + $ph['cmsurl'] .= MODX_MANAGER_URL . "&editor=tinymce&editorpath={$mce_url}"; + $modx_fb = file_get_contents("{$mce_path}js/modx_fb.js.inc"); foreach($ph as $name => $value) { diff --git a/assets/plugins/tinymce/plugin.tinymce.php b/assets/plugins/tinymce/plugin.tinymce.php index 8576fba2e1..5de8c116c6 100644 --- a/assets/plugins/tinymce/plugin.tinymce.php +++ b/assets/plugins/tinymce/plugin.tinymce.php @@ -1,21 +1,16 @@ event->params; + $params['mce_path'] = $mce_path; $params['mce_url'] = $mce_url; -include_once $mce_path . 'functions.php'; +$plugin_dir = 'tinymce'; +include_once("{$mce_path}functions.php"); $mce = new TinyMCE(); @@ -24,90 +19,17 @@ switch ($e->name) { case "OnRichTextEditorRegister": // register only for backend - $e->output("TinyMCE"); + $e->output('TinyMCE'); break; case "OnRichTextEditorInit": - if($editor!=="TinyMCE") return; - - $params['css_selectors'] = $modx->config['tinymce_css_selectors']; - $params['use_browser'] = $modx->config['use_browser']; - $params['editor_css_path'] = $modx->config['editor_css_path']; + if($editor!=='TinyMCE') return; - if($modx->isBackend() || (intval($_GET['quickmanagertv']) == 1 && isset($_SESSION['mgrValidated']))) - { - $params['theme'] = $modx->config['tinymce_editor_theme']; - $params['mce_editor_skin'] = $modx->config['mce_editor_skin']; - $params['mce_entermode'] = $modx->config['mce_entermode']; - $params['language'] = $mce->get_lang($modx->config['manager_language']); - $params['frontend'] = false; - $params['custom_plugins'] = $modx->config['tinymce_custom_plugins']; - $params['custom_buttons1'] = $modx->config['tinymce_custom_buttons1']; - $params['custom_buttons2'] = $modx->config['tinymce_custom_buttons2']; - $params['custom_buttons3'] = $modx->config['tinymce_custom_buttons3']; - $params['custom_buttons4'] = $modx->config['tinymce_custom_buttons4']; - $params['toolbar_align'] = $modx->config['manager_direction']; - $params['webuser'] = null; - - $html = $mce->get_mce_script(); - } - else - { - $frontend_language = isset($modx->config['fe_editor_lang']) ? $modx->config['fe_editor_lang']:''; - $webuser = (isset($modx->config['rb_webuser']) ? $modx->config['rb_webuser'] : null); - - $params['theme'] = $webtheme; - $params['webuser'] = $webuser; - $params['language'] = $mce->get_lang($frontend_language); - $params['frontend'] = true; - $params['custom_plugins'] = $webPlugins; - $params['custom_buttons1'] = $webButtons1; - $params['custom_buttons2'] = $webButtons2; - $params['custom_buttons3'] = $webButtons3; - $params['custom_buttons4'] = $webButtons4; - $params['toolbar_align'] = $webAlign; - - $html = $mce->get_mce_script(); - } + $html = $mce->get_mce_script(); $e->output($html); break; case "OnInterfaceSettingsRender": - switch ($modx->manager->action) - { - case 11: - $mce_settings = array(); - break; - case 12: - case 119: - $mce_settings = $usersettings; - if(!empty($usersettings['tinymce_editor_theme'])) - { - $usersettings['tinymce_editor_theme'] = $settings['tinymce_editor_theme']; - } - break; - case 17: - $mce_settings = $settings; - break; - default: - $mce_settings = $settings; - break; - } - - $params['theme'] = $mce_settings['tinymce_editor_theme']; - $params['mce_editor_skin'] = $mce_settings['mce_editor_skin']; - $params['mce_entermode'] = $mce_settings['mce_entermode']; - $params['mce_element_format'] = $mce_settings['mce_element_format']; - $params['mce_schema'] = $mce_settings['mce_schema']; - $params['css_selectors'] = $mce_settings['tinymce_css_selectors']; - $params['custom_plugins'] = $mce_settings['tinymce_custom_plugins']; - $params['custom_buttons1'] = $mce_settings['tinymce_custom_buttons1']; - $params['custom_buttons2'] = $mce_settings['tinymce_custom_buttons2']; - $params['custom_buttons3'] = $mce_settings['tinymce_custom_buttons3']; - $params['custom_buttons4'] = $mce_settings['tinymce_custom_buttons4']; - $params['mce_template_docs'] = $mce_settings['mce_template_docs']; - $params['mce_template_chunks']= $mce_settings['mce_template_chunks']; - $html = $mce->get_mce_settings(); $e->output($html); break; From 2a204828cd51a70f4d8f3ab0b9b17af38ca5d45c Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 00:48:36 +0900 Subject: [PATCH 283/530] Refactor #10108 TinyMCE - Separation toolbar settings from functions.php http://tracker.modx.com/issues/10108 --- assets/plugins/tinymce/functions.php | 133 +++++++----------- .../tinymce/settings/toolbar.settings.inc.php | 41 ++++++ 2 files changed, 95 insertions(+), 79 deletions(-) create mode 100644 assets/plugins/tinymce/settings/toolbar.settings.inc.php diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index eade440fb1..b1a9bac067 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -275,86 +275,61 @@ function get_mce_script() $str = ''; - switch($params['theme']) + $theme = $params['theme']; + switch($theme) { - case 'simple': - $plugins = 'autolink,inlinepopups,save,emotions,advimage,advlink,paste,contextmenu'; - $buttons1 = 'undo,redo,|,bold,strikethrough,|,justifyleft,justifycenter,justifyright,|,link,unlink,image,emotions,|,hr,|,help'; - $buttons2 = ''; - break; - case 'creative': - $plugins = 'autolink,inlinepopups,autosave,advlist,layer,style,fullscreen,advimage,advhr,paste,advlink,media,contextmenu,table'; - $buttons1 = 'undo,undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,styleselect,fontsizeselect,code'; - $buttons2 = 'image,media,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,advhr,|,styleprops,removeformat,|,pastetext,pasteword'; - $buttons3 = 'insertlayer,absolute,moveforward,movebackward,|,tablecontrols,|,fullscreen,help'; - break; - case 'logic': - $plugins = 'autolink,inlinepopups,autosave,advlist,xhtmlxtras,style,fullscreen,advimage,paste,advlink,media,contextmenu,table'; - $buttons1 = 'undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,styleselect,fontsizeselect,code,|,fullscreen,help'; - $buttons2 = 'image,media,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,table,|,hr,|,styleprops,removeformat,|,pastetext,pasteword'; - $buttons3 = 'charmap,sup,sub,|,cite,ins,del,abbr,acronym,attribs'; - break; - case 'legacy': - $plugins = 'autosave,advlist,style,advimage,advlink,searchreplace,print,contextmenu,paste,fullscreen,nonbreaking,xhtmlxtras,visualchars,media'; - $buttons1 = 'undo,redo,selectall,|,pastetext,pasteword,|,search,replace,|,nonbreaking,hr,charmap,|,image,link,unlink,anchor,media,|,cleanup,removeformat,|,fullscreen,print,code,help'; - $buttons2 = 'bold,italic,underline,strikethrough,sub,sup,|,blockquote,|,bullist,numlist,outdent,indent,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,|,styleprops'; - $buttons3 = ''; - break; - case 'advanced': - $plugins = ''; - $buttons1 = 'bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect'; - $buttons2 = 'bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code'; - $buttons3 = 'hr,removeformat,visualaid,|,sub,sup,|,charmap'; - break; - case 'full': - $plugins = 'autolink,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave'; - $buttons1 = 'save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect'; - $buttons2 = 'cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor'; - $buttons3 = 'tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen'; - $buttons4 = 'insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft'; - break; - case 'custom': - $plugins = $params['custom_plugins']; - $buttons1 = $params['custom_buttons1']; - $buttons2 = $params['custom_buttons2']; - $buttons3 = $params['custom_buttons3']; - $buttons4 = $params['custom_buttons4']; - break; - case 'default': - case 'editor': - default: - $plugins = 'template,visualblocks,autolink,inlinepopups,autosave,save,advlist,style,fullscreen,advimage,paste,advlink,media,contextmenu,table'; - $buttons1 = 'undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,fontsizeselect,pastetext,pasteword,code,template,|,fullscreen,help'; - $buttons2 = 'image,media,link,unlink,anchor,|,justifyleft,justifycenter,justifyright,|,bullist,numlist,|,blockquote,outdent,indent,|,table,hr,|,visualblocks,styleprops,removeformat'; - $buttons3 = ''; - $buttons4 = ''; - if(is_dir($params['mce_path'] . 'tiny_mce/plugins/quickupload')) - { - $plugins = 'quickupload,'. $plugins; - $buttons2 = 'quickupload,'. $buttons2; - } - switch($modx->manager->action) - { - case '4': - case '27': - global $content; - if($content['template']==='0') - { - $plugins = str_replace('autosave', '', $plugins); - $plugins .= ',fullpage'; - $buttons2 = 'fullpage,' . $buttons2; - } - if(empty($modx->config['mce_template_docs']) && empty($modx->config['mce_template_chunks'])) - { - $plugins = str_replace('template', '', $plugins); - $plugins = str_replace(',,', ',', $plugins); - $buttons1 = str_replace(',template', '', $buttons1); - $buttons2 = str_replace(',template', '', $buttons2); - $buttons3 = str_replace(',template', '', $buttons3); - $buttons4 = str_replace(',template', '', $buttons4); - } - } - } + case 'custom': + $plugins = $params['custom_plugins']; + $buttons1 = $params['custom_buttons1']; + $buttons2 = $params['custom_buttons2']; + $buttons3 = $params['custom_buttons3']; + $buttons4 = $params['custom_buttons4']; + break; + case 'simple': + case 'creative': + case 'logic': + case 'legacy': + case 'advanced': + case 'full': + case 'default': + case 'editor': + default: + include_once("{$mce_path}settings/toolbar.settings.inc.php"); + if(empty($theme) || $theme==='editor') $theme = 'default'; + $plugins = $set[$theme]['p']; + $buttons1 = $set[$theme]['b1']; + $buttons2 = $set[$theme]['b2']; + $buttons3 = $set[$theme]['b3']; + $buttons4 = $set[$theme]['b4']; + if(is_dir("{$mce_path}tiny_mce/plugins/quickupload")) + { + $plugins = 'quickupload,'. $plugins; + $buttons2 = 'quickupload,'. $buttons2; + } + if($modx->manager->action=='4' || $modx->manager->action=='27') + { + global $content; + if($content['template']==='0') + { + $plugins = str_replace('autosave', '', $plugins); + if(strpos($plugins,'fullpage')===false) $plugins .= ',fullpage'; + if(strpos($buttons1.$buttons2.$buttons3.$buttons4, 'fullpage')===false) + { + if(!empty($buttons2)) $buttons2 = 'fullpage,' . $buttons2; + else $buttons1 .= ',fullpage'; + } + } + if(empty($modx->config['mce_template_docs']) && empty($modx->config['mce_template_chunks'])) + { + $plugins = str_replace('template', '', $plugins); + $plugins = str_replace(',,', ',', $plugins); + $buttons1 = str_replace(',template', '', $buttons1); + $buttons2 = str_replace(',template', '', $buttons2); + $buttons3 = str_replace(',template', '', $buttons3); + $buttons4 = str_replace(',template', '', $buttons4); + } + } + } $str .= $this->build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) . "\n"; $str .= $this->build_tiny_callback(); diff --git a/assets/plugins/tinymce/settings/toolbar.settings.inc.php b/assets/plugins/tinymce/settings/toolbar.settings.inc.php new file mode 100644 index 0000000000..4a835034b9 --- /dev/null +++ b/assets/plugins/tinymce/settings/toolbar.settings.inc.php @@ -0,0 +1,41 @@ + Date: Mon, 26 Aug 2013 00:52:36 +0900 Subject: [PATCH 284/530] Fix Tab pane ID Fix Tab pane ID http://tracker.modx.com/issues/10109 --- manager/actions/access_permissions.dynamic.php | 4 ++-- manager/actions/help.static.php | 6 +++--- manager/actions/web_access_permissions.dynamic.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manager/actions/access_permissions.dynamic.php b/manager/actions/access_permissions.dynamic.php index cfc25c0489..50a3b4364b 100644 --- a/manager/actions/access_permissions.dynamic.php +++ b/manager/actions/access_permissions.dynamic.php @@ -47,8 +47,8 @@

    '.$_lang['access_permissions_off'].'

    ' : ''?> -
    - +
    +
    diff --git a/manager/actions/help.static.php b/manager/actions/help.static.php index bf7ab5fdbf..247390ec4d 100644 --- a/manager/actions/help.static.php +++ b/manager/actions/help.static.php @@ -6,9 +6,9 @@

    -
    +
    '; echo '

    '.$helpname.'

    '; - echo ''; + echo ''; include "../assets/templates/help/$v"; echo '
    '; } diff --git a/manager/actions/web_access_permissions.dynamic.php b/manager/actions/web_access_permissions.dynamic.php index 683769eaaf..43f0c68d25 100644 --- a/manager/actions/web_access_permissions.dynamic.php +++ b/manager/actions/web_access_permissions.dynamic.php @@ -38,8 +38,8 @@

    '.$_lang['access_permissions_off'].'

    ' : '' ;?> -
    - +
    +
    From 8ea2dcdb008d14db2196e6554279a349a7508192 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 00:53:19 +0900 Subject: [PATCH 285/530] Small fix --- manager/actions/mutate_module.dynamic.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index 73557821d1..b14fd7cea3 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -363,13 +363,13 @@ function SetUrl(url, width, height, alt) {

    - +
    @@ -416,7 +416,7 @@ function SetUrl(url, width, height, alt) {

    - +
    :
    @@ -434,7 +434,7 @@ function SetUrl(url, width, height, alt) {

    - +
    :



    From d39ca177f3f89bea5c5bbcdff39455b2044729d6 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 00:53:39 +0900 Subject: [PATCH 286/530] Small fix - MODxRE theme --- manager/media/style/MODxRE/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/media/style/MODxRE/style.css b/manager/media/style/MODxRE/style.css index d503c81a4d..1a5bce3b75 100644 --- a/manager/media/style/MODxRE/style.css +++ b/manager/media/style/MODxRE/style.css @@ -1285,7 +1285,7 @@ a.hometblink, a.hometblink img { vertical-align: middle; } .sectionBody .tab-page { - padding: 30px 15px 20px !important; + padding: 20px 15px 15px !important; } /* -------------------------[ New sortable table class ]--- */ .sortabletable { From d0a716fb34f259c0421b5eb97b842f78677e5a73 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 00:55:25 +0900 Subject: [PATCH 287/530] Refactor #10110 Add actionButtons class to elements list http://tracker.modx.com/issues/10110 --- manager/actions/resources.static.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/manager/actions/resources.static.php b/manager/actions/resources.static.php index 7af9c34e98..abe6034615 100644 --- a/manager/actions/resources.static.php +++ b/manager/actions/resources.static.php @@ -75,10 +75,9 @@ function createResourceList($resourceTable,$action,$tablePre,$nameField = 'name'

    -
      +
      -
      @@ -93,10 +92,9 @@ function createResourceList($resourceTable,$action,$tablePre,$nameField = 'name' Added by Apodigm 09-06-2004- DocVars - web@apodigm.com -->

      -
        +
        -
        @@ -108,10 +106,9 @@ function createResourceList($resourceTable,$action,$tablePre,$nameField = 'name'

        -
          +
          -
          @@ -123,10 +120,9 @@ function createResourceList($resourceTable,$action,$tablePre,$nameField = 'name'

          -
            +
            -
            @@ -138,11 +134,10 @@ function createResourceList($resourceTable,$action,$tablePre,$nameField = 'name'

            -
              +
                • hasPermission('save_plugin')) { ?>
              -
              From b32585264da842b447dcab7a8027d163719894c9 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 01:00:16 +0900 Subject: [PATCH 288/530] Fix section block html --- assets/modules/docmanager/templates/documents.tpl | 2 ++ assets/modules/docmanager/templates/main.tpl | 3 +-- assets/modules/docmanager/templates/sort_list.tpl | 6 ++++-- manager/actions/move_document.dynamic.php | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/assets/modules/docmanager/templates/documents.tpl b/assets/modules/docmanager/templates/documents.tpl index 5a2ce96531..eaa017b165 100644 --- a/assets/modules/docmanager/templates/documents.tpl +++ b/assets/modules/docmanager/templates/documents.tpl @@ -1,4 +1,5 @@
              +
              [+lang.DM_range_title+]
              @@ -18,4 +19,5 @@
              [+lang.DM_select_range_text+]
              +
              \ No newline at end of file diff --git a/assets/modules/docmanager/templates/main.tpl b/assets/modules/docmanager/templates/main.tpl index 58e6736a95..150307ade6 100644 --- a/assets/modules/docmanager/templates/main.tpl +++ b/assets/modules/docmanager/templates/main.tpl @@ -69,8 +69,7 @@
            • [+lang.DM_close+]
            -
            [+lang.DM_action_title+]
            -
            +
            '; - include "../assets/templates/help/$v"; + include_once(MODX_BASE_PATH . "assets/templates/help/{$v}"; echo '
            '; } ?> From 9352a72d139a0d39a94656a1ea6b9428dadb125a Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 01:18:56 +0900 Subject: [PATCH 295/530] Refactor #10111 Add primary button class http://tracker.modx.com/issues/10111 --- manager/actions/mutate_content.dynamic.php | 2 +- manager/media/style/MODxRE/style.css | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index 3399198721..9dd4500be9 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -543,7 +543,7 @@ function decode(s) {
            • - + icons_save" /> + - - - - - - - - - +
              :{{}} 
              :    
              :     -
              :  
              class="inputBox" value="on" /> -
              + +
              {{ }} 
              -
              +
              @@ -202,6 +190,43 @@ function deletedocument() { ?>
              + + +
              +

              + +
              + + + + + + + + + + + + + + +
              +
              class="inputBox" value="on" /> +
              +
              +
              + - +
            +
            db->getRow($rs); if ($lock['internalKey'] != $modx->getLoginUserID()) { - $msg = sprintf($_lang['lock_msg'], $lock['username'], 'module'); + $msg = sprintf($_lang['lock_msg'], $lock['username'], $_lang['module']); $e->setError(5, $msg); $e->dumpError(); } @@ -373,33 +373,7 @@ function SetUrl(url, width, height, alt) { - - - - - - - - - - - - - +
            :    
            :    
            (32x32):    
            :     -
            :  
            class="inputBox" onclick="documentDirty=true;" /> :  
            value="on" class="inputBox" /> - '.$_lang['module_disabled'].'' : $_lang['module_disabled']?>
            class="inputBox" /> -
              
            @@ -420,17 +394,17 @@ function SetUrl(url, width, height, alt) { - + - + - +
            :  



            class="inputBox" onclick="documentDirty=true;" /> :  



            :  
               
            - +

            @@ -458,7 +432,7 @@ function SetUrl(url, width, height, alt) { 'LEFT JOIN '.$tbl_site_templates.' AS st ON st.id = smd.resource AND smd.type = 50 '. 'LEFT JOIN '.$tbl_site_tmplvars.' AS sv ON sv.id = smd.resource AND smd.type = 60 '. 'WHERE smd.module=\''.$id.'\' ORDER BY smd.type,name'; -$ds = $modx->dbQuery($sql); +$ds = $modx->db->query($sql); if (!$ds) { echo "An error occured while loading module dependencies."; } else { @@ -476,12 +450,46 @@ function SetUrl(url, width, height, alt) {
    - - + + + +
    +

    + +
    + + + + + + + + + + + + + +
    value="on" class="inputBox" /> + '.$_lang['module_disabled'].'' : $_lang['module_disabled']?>
    :  
    :   +
    :
    (32x32):  
    class="inputBox" onclick="documentDirty=true;" /> :
    class="inputBox" /> +
    + +
    - + + + tp.addTabPage( document.getElementById( "tabPlugin" ) ); - + - - - - - - - - - -
    ::  
    :  
    ":$_lang['plugin_disabled']; ?>
    value="on" class="inputBox">
    @@ -340,31 +330,13 @@ function decode(s){

    - - - - - +
    :   -
    - - - - - + - + - - + + @@ -406,19 +377,15 @@ function decode(s){ if(is_numeric($id) && $id > 0) { $evts = array(); $rs = $modx->db->select('*','[+prefix+]site_plugin_events',"pluginid='{$id}'"); - while($row = $modx->db->getRow($rs)) - { - $evts[] = $row['evtid']; + $limit = $modx->db->getRecordCount($rs); + for ($i=0; $i<$limit; $i++) { + $row = $modx->db->getRow($rs); + $evts[] = $row['evtid']; } - } - else - { - if(isset($content['sysevents']) && is_array($content['sysevents'])) - { + } else { + if(isset($content['sysevents']) && is_array($content['sysevents'])) { $evts = $content['sysevents']; - } - else - { + } else { $evts = array(); } } @@ -452,7 +419,7 @@ function decode(s){ echo ""; echo ""; } - $evtnames[] = ''."\n"; + $evtnames[] = ''."\n"; if(count($evtnames)==2) echoEventRows($evtnames); } if(count($evtnames)>0) echoEventRows($evtnames); @@ -462,8 +429,48 @@ function echoEventRows(&$evtnames) { $evtnames = array(); } ?> +
    :
    :  :  
     
    : -
    		:
     
    ".$row['groupname']."
    + + + +
    + + +
    +

    + + + + + + + + + + + + + + + + + + + +
    ":$_lang['plugin_disabled']; ?>
    :  
    :   +
    :
    value="on" class="inputBox">
    +
    @@ -477,12 +484,6 @@ function echoEventRows(&$evtnames) { setTimeout('showParameters()',10); db->getRow($rs); if($lock['internalKey']!=$modx->getLoginUserID()) { - $msg = sprintf($_lang['lock_msg'],$lock['username'],"snippet"); + $msg = sprintf($_lang['lock_msg'],$lock['username'],$_lang['snippet']); $e->setError(5, $msg); $e->dumpError(); } @@ -310,14 +310,7 @@ function decode(s){ - - - - - - - - +
    :[[]] 
    :    
    class="inputBox"> [[  ]] 
    @@ -337,10 +330,17 @@ function decode(s){

    - +
    + + + + + + + - - + - + - - + - + diff --git a/manager/actions/mutate_templates.dynamic.php b/manager/actions/mutate_templates.dynamic.php index 018535dc0a..37c4e5eb4c 100644 --- a/manager/actions/mutate_templates.dynamic.php +++ b/manager/actions/mutate_templates.dynamic.php @@ -119,58 +119,22 @@ function deletedocument() { - - -
    - -
    -

    - - + - -
    class="inputBox">
    :    
    :  
    :    
    :  
     
    +' . $_lang['template_msg'] . ''; ?> +
    - - - - - + - - - - - - - - - - - - - - -
     
    :  :
    :  
    :     -
    :  
    class="inputBox">
    @@ -184,7 +148,7 @@ function deletedocument() { -getFullTableName('site_tmplvar_templates')." tr INNER JOIN ".$modx->getFullTableName('site_tmplvars')." tv ON tv.id = tr.tmplvarid @@ -198,7 +162,7 @@ function deletedocument() {

    - +

    0) echo $_lang['template_tv_msg']; ?>

    hasPermission('save_template') && $limit > 1) { ?>

    - - +
    +

    + + + + + + + + + + + + + + + + + +
    :
    : +
    :
    class="inputBox">
    invokeEvent("OnTempFormRender",array("id" => $id)); diff --git a/manager/actions/mutate_tmplvars.dynamic.php b/manager/actions/mutate_tmplvars.dynamic.php index 00c61aa179..d1b55a75c5 100644 --- a/manager/actions/mutate_tmplvars.dynamic.php +++ b/manager/actions/mutate_tmplvars.dynamic.php @@ -295,21 +295,16 @@ function decode(s){ - + - - - - - - - + + - - + - + - - - - - +
    :[**]  [* *]   
    :    
    :    :
    :    
    :   " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />" onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />
    :    " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />" onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />
    :     +
    :    
    - +

    -
    +
    + + + + + + + + + + + + + + + + +
    :
    : +
    :
    +
    + +

    + + + + + +

    -
    -
    ->
    -
    -
    -
    -
    -
    -
    ->
    ->
    +
    - - +

    -
    ->
    ->
    ->
    ->
    ->
    ->
    ->
    -
    ->
    +
    +
    + + + + + + + +

    ->
    ->
    ->
    ->
    +
    - +

    ->
    ->
    ->
    ->
    +
    - +

    ->
    ->
    ->
    ->
    +
    - +

    ->
    ->
    ->
    ->
    +
    +

    ->
    ->
    ->
    ->
    ->
    -
    - -
    -

    ->
    ->
    +
    + + + + + + + +

    ->
    ->
    ->
    ->
    +
    - +

    ->
    ->
    ->
    ->
    +
    - +

    ->
    ->
    +
    - +

    ->
    ->
    ->
    ->
    +
    +
    + + + + + +
    +
    +

    + +
    +

    ->
    ->
    ->
    ->
    ->
    ->
    ->
    ->
    +
    +
    -
    +
    + + + + + + + [+label+] + + +EOT; + $checked = ($roledata[$name]==1) ? 'checked' : ''; + $value = ($roledata[$name]==1) ? 1 : 0; + if($status=='disabled') + { + $checked = 'checked'; + $value = 1; + $set = 'fix'; + } + else $set = 'set'; + + $output = $tpl; + $output = str_replace('[+name+]', $name, $output); + $output = str_replace('[+checked+]', $checked, $output); + $output = str_replace('[+status+]', $status, $output); + $output = str_replace('[+value+]', $value, $output); + $output = str_replace('[+label+]', $label, $output); + $output = str_replace('[+set+]', $set, $output); + return $output; +} From c7429799100ad578e227fc292b39341afbe632c8 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 01:46:03 +0900 Subject: [PATCH 304/530] Bug #10115 Fix table structure at the new install http://tracker.modx.com/issues/10115 --- install/setup.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install/setup.sql b/install/setup.sql index cbe2750a83..0c45950315 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}active_users` ( `lasthit` int(20) NOT NULL default '0', `id` int(10) default NULL, `action` varchar(10) NOT NULL default '', - `ip` varchar(20) NOT NULL default '', + `ip` varchar(50) NOT NULL default '', PRIMARY KEY (`internalKey`) ) ENGINE=MyISAM COMMENT='Contains data about active users.'; @@ -299,7 +299,8 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_tmplvar_contentvalues` ( `value` text, PRIMARY KEY (id), KEY idx_tmplvarid (tmplvarid), - KEY idx_id (contentid) + KEY idx_id (contentid), + FULLTEXT KEY `value_ft_idx` (`value`) ) ENGINE=MyISAM COMMENT='Site Template Variables Content Values Link Table'; CREATE TABLE IF NOT EXISTS `{PREFIX}site_tmplvar_templates` ( @@ -352,7 +353,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}user_attributes` ( `zip` varchar(25) NOT NULL default '', `fax` varchar(100) NOT NULL default '', `photo` varchar(255) NOT NULL default '' COMMENT 'link to photo', - `comment` varchar(255) NOT NULL default '' COMMENT 'short comment', + `comment` text, PRIMARY KEY (`id`), KEY `userid` (`internalKey`) ) ENGINE=MyISAM COMMENT='Contains information about the backend users.'; @@ -493,14 +494,14 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}web_user_attributes` ( `sessionid` varchar(100) NOT NULL default '', `dob` int(10) NOT NULL DEFAULT '0', `gender` int(1) NOT NULL DEFAULT '0' COMMENT '0 - unknown, 1 - Male 2 - female', - `country` varchar(5) NOT NULL default '', + `country` varchar(25) NOT NULL default '', `street` varchar(255) NOT NULL DEFAULT '', `city` varchar(255) NOT NULL DEFAULT '', `state` varchar(25) NOT NULL default '', `zip` varchar(25) NOT NULL default '', `fax` varchar(100) NOT NULL default '', `photo` varchar(255) NOT NULL default '' COMMENT 'link to photo', - `comment` varchar(255) NOT NULL default '' COMMENT 'short comment', + `comment` text, PRIMARY KEY (`id`), KEY `userid` (`internalKey`) ) ENGINE=MyISAM COMMENT='Contains information for web users.'; From f427d07110248ee7f7a1b5740a2d8e10ef4a37b9 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 01:50:25 +0900 Subject: [PATCH 305/530] Refactor #10116 Add primary key to tables http://tracker.modx.com/issues/10116 --- install/setup.sql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/install/setup.sql b/install/setup.sql index 0c45950315..ad627bbd4f 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -241,7 +241,8 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_plugins` ( CREATE TABLE IF NOT EXISTS `{PREFIX}site_plugin_events` ( `pluginid` INT(10) NOT NULL, `evtid` INT(10) NOT NULL default 0, - `priority` INT(10) NOT NULL default 0 COMMENT 'determines plugin run order' + `priority` INT(10) NOT NULL default 0 COMMENT 'determines plugin run order', + PRIMARY KEY ( `pluginid` , `evtid` ) ) ENGINE=MyISAM COMMENT='Links to system events'; CREATE TABLE IF NOT EXISTS `{PREFIX}site_snippets` ( @@ -282,7 +283,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}system_eventnames` ( CREATE TABLE IF NOT EXISTS `{PREFIX}system_settings` ( `setting_name` varchar(50) NOT NULL default '', `setting_value` text, - UNIQUE KEY `setting_name` (`setting_name`) + PRIMARY KEY (`setting_name`) ) ENGINE=MyISAM COMMENT='Contains Content Manager settings.'; CREATE TABLE IF NOT EXISTS `{PREFIX}site_tmplvar_access` ( @@ -450,6 +451,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}user_settings` ( `user` integer NOT NULL, `setting_name` varchar(50) NOT NULL default '', `setting_value` text, + PRIMARY KEY ( `user` , `setting_name` ), KEY `setting_name` (`setting_name`), KEY `user` (`user`) ) ENGINE=MyISAM COMMENT='Contains backend user settings.'; @@ -519,6 +521,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}web_user_settings` ( `webuser` integer NOT NULL, `setting_name` varchar(50) NOT NULL default '', `setting_value` text, + PRIMARY KEY ( `webuser` , `setting_name` ), KEY `setting_name` (`setting_name`), KEY `webuserid` (`webuser`) ) ENGINE=MyISAM COMMENT='Contains web user settings.'; From b81109696eb242fd838c17f0c5167bacedd14469 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 01:52:38 +0900 Subject: [PATCH 306/530] Bug #10117 Set "0" default template ID http://tracker.modx.com/issues/10117 --- install/setup.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/setup.sql b/install/setup.sql index ad627bbd4f..68df8b85d3 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -119,7 +119,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_content` ( `introtext` text COMMENT 'Used to provide quick summary of the document', `content` mediumtext, `richtext` tinyint(1) NOT NULL default '1', - `template` int(10) NOT NULL default '1', + `template` int(10) NOT NULL default '0', `menuindex` int(10) NOT NULL default '0', `searchable` int(1) NOT NULL default '1', `cacheable` int(1) NOT NULL default '1', From ee63ca1142b6f3ab5d71922886730036f0ff1115 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 01:55:04 +0900 Subject: [PATCH 307/530] Refactor #10118 Add index key to site_content table http://tracker.modx.com/issues/10118 --- install/setup.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install/setup.sql b/install/setup.sql index 68df8b85d3..00c4618d29 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -144,6 +144,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_content` ( KEY `id` (`id`), KEY `parent` (`parent`), KEY aliasidx (`alias`), + KEY typeidx (`type`), FULLTEXT KEY `content_ft_idx` (`pagetitle`,`description`,`content`) ) ENGINE=MyISAM COMMENT='Contains the site document tree.'; From 88c1739d12ffae2517cd8be0071630916450b02a Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 01:59:33 +0900 Subject: [PATCH 308/530] Fix --- manager/actions/mutate_role.dynamic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/manager/actions/mutate_role.dynamic.php b/manager/actions/mutate_role.dynamic.php index 6b9d348511..77f6ff741c 100644 --- a/manager/actions/mutate_role.dynamic.php +++ b/manager/actions/mutate_role.dynamic.php @@ -287,6 +287,7 @@ function deletedocument() { echo render_form('manage_metatags', $_lang['role_manage_metatags']); echo render_form('import_static', $_lang['role_import_static']); echo render_form('export_static', $_lang['role_export_static']); + echo render_form('remove_locks', $_lang['role_remove_locks']); ?> From 7342d01447d856f95a93e3cdc346ace2dac64c21 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Sun, 25 Aug 2013 20:11:41 +0300 Subject: [PATCH 309/530] fix html --- manager/actions/mutate_plugin_priority.dynamic.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manager/actions/mutate_plugin_priority.dynamic.php b/manager/actions/mutate_plugin_priority.dynamic.php index d1f356857c..74e8df8f5b 100644 --- a/manager/actions/mutate_plugin_priority.dynamic.php +++ b/manager/actions/mutate_plugin_priority.dynamic.php @@ -77,7 +77,7 @@ - MODx + MODX @@ -159,7 +159,7 @@ function save() {
    • From dba757864de9b8e94a746708b9b40bc5be8bbffe Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 02:58:44 +0900 Subject: [PATCH 314/530] Fix --- manager/actions/mutate_plugin_priority.dynamic.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/manager/actions/mutate_plugin_priority.dynamic.php b/manager/actions/mutate_plugin_priority.dynamic.php index e205613fe7..c868b63345 100644 --- a/manager/actions/mutate_plugin_priority.dynamic.php +++ b/manager/actions/mutate_plugin_priority.dynamic.php @@ -159,10 +159,7 @@ function save() {
  • '.$_lang['cancel'].'
    • -<<<<<<< HEAD -======= ->>>>>>> cf3d3ab0e53c4edea388e4abdda4e86b5c7c2fa5
    '.$_lang['plugin_priority'].'
    From 25dd2649d18dcf66445fdb6d625140303d21a09f Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 03:33:55 +0900 Subject: [PATCH 315/530] Fix - style --- manager/actions/user_management.static.php | 1 - manager/actions/web_user_management.static.php | 1 - manager/media/style/MODxCarbon/style.css | 1 + manager/media/style/MODxRE/style.css | 2 -- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/manager/actions/user_management.static.php b/manager/actions/user_management.static.php index ad0075f116..0118dcd9ab 100644 --- a/manager/actions/user_management.static.php +++ b/manager/actions/user_management.static.php @@ -106,7 +106,6 @@ function menuAction(a) {
    -
    -
    Date: Mon, 26 Aug 2013 03:44:59 +0900 Subject: [PATCH 316/530] Refactor #10120 01-01-1970 01:00:00 when "0" http://tracker.modx.com/issues/10120 --- manager/includes/document.parser.class.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index cdc5f41b7f..97ff2935e7 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -2316,6 +2316,7 @@ function parseChunk($chunkName, $chunkArr, $prefix= "{", $suffix= "}") { */ function toDateFormat($timestamp = 0, $mode = '') { $timestamp = trim($timestamp); + if($mode !== 'formatOnly' && empty($timestamp)) return '-'; $timestamp = intval($timestamp); switch($this->config['datetime_format']) { From 368d47a7b4d1c43a1352f473e8b6ed41e82b32ce Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 14:38:56 +0900 Subject: [PATCH 317/530] Fix - QuickManager cancel button --- assets/plugins/qm/qm.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/plugins/qm/qm.inc.php b/assets/plugins/qm/qm.inc.php index 22a671daaf..ef58a22972 100755 --- a/assets/plugins/qm/qm.inc.php +++ b/assets/plugins/qm/qm.inc.php @@ -719,7 +719,8 @@ function getCookie(cookieName) else $jq_mode = '$'; // Add action buttons - $mc->addLine('var controls = "";'); + $url = $this->modx->makeUrl($doc_id,'','','full'); + $mc->addLine('var controls = "";'); // Modify head $mc->head = ''; From 11a87dd861691d444835b0cda433686c978ce421 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 08:42:02 +0300 Subject: [PATCH 318/530] fix russian lang --- manager/includes/lang/russian-UTF8.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/lang/russian-UTF8.inc.php b/manager/includes/lang/russian-UTF8.inc.php index 81801b1b0f..cb3e6071fc 100755 --- a/manager/includes/lang/russian-UTF8.inc.php +++ b/manager/includes/lang/russian-UTF8.inc.php @@ -1167,7 +1167,7 @@ $_lang['email_method_title'] = 'Метод отправки писем'; $_lang['email_method_mail'] = 'MAIL - cообщения отправляются с помощью функции mail().'; -$_lang['email_method_smtp'] = 'Адрес SMTP-сервера'; +$_lang['email_method_smtp'] = 'Через SMTP-сервер'; $_lang['smtp_auth_title'] = 'SMTP авторизация'; $_lang['smtp_host_title'] = 'Адрес SMTP-сервера'; $_lang['smtp_username_title'] = 'SMTP почта'; From a1d22c45a13895ad2f2673ccfe46ba92dd8c051c Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 08:47:17 +0300 Subject: [PATCH 319/530] Bug #9989 Cannot change email address for an exisiting web user --- manager/processors/save_web_user.processor.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/manager/processors/save_web_user.processor.php b/manager/processors/save_web_user.processor.php index 825e2c7f49..9e32e1f76b 100755 --- a/manager/processors/save_web_user.processor.php +++ b/manager/processors/save_web_user.processor.php @@ -255,12 +255,14 @@ } // check if the email address already exists - $rs = $modx->db->select('internalKey', '[+prefix+]web_user_attributes', "email='{$esc_email}'"); - $limit = $modx->db->getRecordCount($rs); - if (!$limit) { - webAlert("An error occurred while attempting to retrieve all users with email {$email}."); - exit; - } + // check if the email address already exists + if (!$rs = $modx->db->select('internalKey','[+prefix+]web_user_attributes', "email='{$esc_email}'")) { + webAlert("An error occurred while attempting to retrieve all users with email {$email}."); + exit; + } + $limit = $modx->db->getRecordCount($rs); + + if ($limit > 0) { $row = $modx->db->getRow($rs); if ($row['internalKey'] != $id) { From b54aac7be693ba06702ce609af5a1ed966350cd0 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 09:04:05 +0300 Subject: [PATCH 320/530] add youtube in tinyMCE --- .../tinymce/settings/toolbar.settings.inc.php | 20 ++-- .../plugins/youtubeIframe/css/style.css | 84 ++++++++++++++++ .../plugins/youtubeIframe/editor_plugin.js | 1 + .../youtubeIframe/editor_plugin_src.js | 90 ++++++++++++++++++ .../plugins/youtubeIframe/img/youtube.png | Bin 0 -> 1833 bytes .../tiny_mce/plugins/youtubeIframe/index.html | 86 +++++++++++++++++ .../plugins/youtubeIframe/js/scripts.js | 1 + .../plugins/youtubeIframe/js/scripts_src.js | 81 ++++++++++++++++ .../plugins/youtubeIframe/langs/en.js | 3 + .../plugins/youtubeIframe/langs/en_dlg.js | 12 +++ .../plugins/youtubeIframe/langs/ru.js | 3 + .../plugins/youtubeIframe/langs/ru_dlg.js | 12 +++ 12 files changed, 383 insertions(+), 10 deletions(-) create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/css/style.css create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin.js create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin_src.js create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/img/youtube.png create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/index.html create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts.js create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts_src.js create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en.js create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en_dlg.js create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru.js create mode 100644 assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru_dlg.js diff --git a/assets/plugins/tinymce/settings/toolbar.settings.inc.php b/assets/plugins/tinymce/settings/toolbar.settings.inc.php index 4a835034b9..cf62c9f172 100644 --- a/assets/plugins/tinymce/settings/toolbar.settings.inc.php +++ b/assets/plugins/tinymce/settings/toolbar.settings.inc.php @@ -5,19 +5,19 @@ $set['simple']['b4'] = ''; $set['simple']['b4'] = ''; -$set['creative']['p'] = 'autolink,inlinepopups,autosave,advlist,layer,style,fullscreen,advimage,advhr,paste,advlink,media,contextmenu,table'; +$set['creative']['p'] = 'autolink,inlinepopups,autosave,advlist,layer,style,fullscreen,advimage,advhr,paste,advlink,media,contextmenu,table,youtubeIframe'; $set['creative']['b1'] = 'undo,undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,styleselect,fontsizeselect,code'; -$set['creative']['b2'] = 'image,media,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,advhr,|,styleprops,removeformat,|,pastetext,pasteword'; +$set['creative']['b2'] = 'image,media,youtubeIframe,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,advhr,|,styleprops,removeformat,|,pastetext,pasteword'; $set['creative']['b3'] = 'insertlayer,absolute,moveforward,movebackward,|,tablecontrols,|,fullscreen,help'; $set['creative']['b4'] = ''; -$set['logic']['p'] = 'autolink,inlinepopups,autosave,advlist,xhtmlxtras,style,fullscreen,advimage,paste,advlink,media,contextmenu,table'; +$set['logic']['p'] = 'autolink,inlinepopups,autosave,advlist,xhtmlxtras,style,fullscreen,advimage,paste,advlink,media,contextmenu,table,youtubeIframe'; $set['logic']['b1'] = 'undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,styleselect,fontsizeselect,code,|,fullscreen,help'; -$set['logic']['b2'] = 'image,media,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,table,|,hr,|,styleprops,removeformat,|,pastetext,pasteword'; +$set['logic']['b2'] = 'image,media,youtubeIframe,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,table,|,hr,|,styleprops,removeformat,|,pastetext,pasteword'; $set['logic']['b3'] = 'charmap,sup,sub,|,cite,ins,del,abbr,acronym,attribs'; -$set['legacy']['p'] = 'autosave,advlist,style,advimage,advlink,searchreplace,print,contextmenu,paste,fullscreen,nonbreaking,xhtmlxtras,visualchars,media'; -$set['legacy']['b1'] = 'undo,redo,selectall,|,pastetext,pasteword,|,search,replace,|,nonbreaking,hr,charmap,|,image,link,unlink,anchor,media,|,cleanup,removeformat,|,fullscreen,print,code,help'; +$set['legacy']['p'] = 'autosave,advlist,style,advimage,advlink,searchreplace,print,contextmenu,paste,fullscreen,nonbreaking,xhtmlxtras,visualchars,media,youtubeIframe'; +$set['legacy']['b1'] = 'undo,redo,selectall,|,pastetext,pasteword,|,search,replace,|,nonbreaking,hr,charmap,|,image,link,unlink,anchor,media,youtubeIframe,|,cleanup,removeformat,|,fullscreen,print,code,help'; $set['legacy']['b2'] = 'bold,italic,underline,strikethrough,sub,sup,|,blockquote,|,bullist,numlist,outdent,indent,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,|,styleprops'; $set['legacy']['b3'] = ''; $set['legacy']['b4'] = ''; @@ -28,14 +28,14 @@ $set['advanced']['b3'] = 'hr,removeformat,visualaid,|,sub,sup,|,charmap'; $set['advanced']['b4'] = ''; -$set['full']['p'] = 'autolink,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave'; +$set['full']['p'] = 'autolink,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave,youtubeIframe'; $set['full']['b1'] = 'save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect'; -$set['full']['b2'] = 'cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor'; +$set['full']['b2'] = 'cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,youtubeIframe,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor'; $set['full']['b3'] = 'tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen'; $set['full']['b4'] = 'insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft'; -$set['default']['p'] = 'template,visualblocks,autolink,inlinepopups,autosave,save,advlist,style,fullscreen,advimage,paste,advlink,media,contextmenu,table'; +$set['default']['p'] = 'template,visualblocks,autolink,inlinepopups,autosave,save,advlist,style,fullscreen,advimage,paste,advlink,media,contextmenu,table,youtubeIframe'; $set['default']['b1'] = 'undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,fontsizeselect,pastetext,pasteword,code,template,|,fullscreen,help'; -$set['default']['b2'] = 'image,media,link,unlink,anchor,|,justifyleft,justifycenter,justifyright,|,bullist,numlist,|,blockquote,outdent,indent,|,table,hr,|,visualblocks,styleprops,removeformat'; +$set['default']['b2'] = 'image,media,youtubeIframe,link,unlink,anchor,|,justifyleft,justifycenter,justifyright,|,bullist,numlist,|,blockquote,outdent,indent,|,table,hr,|,visualblocks,styleprops,removeformat'; $set['default']['b3'] = ''; $set['default']['b4'] = ''; diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/css/style.css b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/css/style.css new file mode 100644 index 0000000000..3b972392bf --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/css/style.css @@ -0,0 +1,84 @@ +li {list-style: none;} +li:hover, li.selected{background: #DDDDDD} +input[type=radio]:checked{} +.clear{display: block; clear: both; height: 10px;} +.share-embed-size-list { + margin: 0; + padding: 0; + min-width: 500px; + overflow: visible; + clear: both; +} +.share-embed-size { + border: 1px solid #FFFFFF; + cursor: pointer; + float: left; + margin: 4px; + padding: 4px; +} +.share-embed-size > label { + display: block; + text-align: center; +} + +label { + cursor: pointer; +} +.share-embed-size-radio { + display: none; +} + +body, button, input, textarea { + font: 12px arial,sans-serif; +} +.share-embed-size .share-embed-size-name { + color: #666666; + display: block; + white-space: nowrap; +} +.share-embed-size .share-embed-size-box { + background: none repeat scroll 0 0 #DDDDDD; + border: 1px solid #999999; + display: block; + margin: auto 0; + padding: 1px; +} +.share-embed-size.default .share-embed-size-box { + height: 32px; + margin-left: 4px; + width: 42px; +} +.share-embed-size.default.wide .share-embed-size-box { + height: 27px; + width: 49px; +} +.share-embed-size.medium.wide .share-embed-size-box { + height: 31px; + width: 56px; +} +.share-embed-size.large.wide .share-embed-size-box { + height: 35px; + width: 64px; +} +.share-embed-size.hd720.wide .share-embed-size-box { + height: 42px; + width: 75px; +} + + +.share-embed-size.custom { + text-align: right; +} +.share-embed-size { + border: 1px solid #FFFFFF; + cursor: pointer; + float: left; + margin: 4px; + padding: 4px; +} +.share-embed-customize { + padding: 0.5em; +} +.share-embed-size.custom .share-embed-customize li { + margin: 0.25em; +} \ No newline at end of file diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin.js new file mode 100644 index 0000000000..bb72b26cd6 --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.PluginManager.requireLangPack("youtubeIframe");tinymce.create("tinymce.plugins.YoutubeIframePlugin",{init:function(a,b){a.addCommand("mceYoutubeIframe",function(){a.windowManager.open({file:b+"/index.html",width:650,height:350,inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("youtubeIframe",{title:"youtubeIframe.desc",cmd:"mceYoutubeIframe",image:b+"/img/youtube.png"});a.onNodeChange.add(function(a,b,c){var d=false;if(c.nodeName=="IMG"){try{var e=c.attributes["src"].value;var f=c.attributes["alt"].value;var g=e.match("vi/([^&#]*)/0.jpg");d=g[1]===f}catch(h){}}b.setActive("youtubeIframe",d)})},createControl:function(a,b){return null},getInfo:function(){return{longname:"Youtube Iframe PlugIn",author:"Darius Matulionis",authorurl:"http://matulionis.lt",infourl:"darius@matulionis.lt",version:"1.1"}}});tinymce.PluginManager.add("youtubeIframe",tinymce.plugins.YoutubeIframePlugin)})() \ No newline at end of file diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin_src.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin_src.js new file mode 100644 index 0000000000..d98405499c --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/editor_plugin_src.js @@ -0,0 +1,90 @@ +/** + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + * + * @name editor_plugin_src + * @author Darius Matulionis + */ + +(function () { + // Load plugin specific language pack + tinymce.PluginManager.requireLangPack('youtubeIframe'); + + tinymce.create('tinymce.plugins.YoutubeIframePlugin', { + /** + * Initializes the plugin, this will be executed after the plugin has been created. + * This call is done before the editor instance has finished it's initialization so use the onInit event + * of the editor instance to intercept that event. + * + * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in. + * @param {string} url Absolute URL to where the plugin is located. + */ + init: function (ed, url) { + // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample'); + ed.addCommand('mceYoutubeIframe', function () { + + ed.windowManager.open({ + file: url + '/index.html', + width: 650, + height: 350, + inline: 1 + }, { + plugin_url: url, // Plugin absolute URL + some_custom_arg: 'custom arg' // Custom argument + }); + }); + + // Register example button + ed.addButton('youtubeIframe', { + title: 'youtubeIframe.desc', + cmd: 'mceYoutubeIframe', + image: url + '/img/youtube.png' + }); + + // Add a node change handler, selects the button in the UI when a image is selected + ed.onNodeChange.add(function (ed, cm, n) { + var active = false; + if (n.nodeName == 'IMG') { + try { + var src = n.attributes["src"].value; + var alt = n.attributes["alt"].value; + var regexRes = src.match("vi/([^&#]*)/0.jpg"); + active = regexRes[1] === alt; + } + catch (err) { + } + } + cm.setActive('youtubeIframe', active); + }); + }, + + /** + * Creates control instances based in the incomming name. This method is normally not + * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons + * but you sometimes need to create more complex controls like listboxes, split buttons etc then this + * method can be used to create those. + * + * @param {String} n Name of the control to create. + * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control. + * @return {tinymce.ui.Control} New control instance or null if no control was created. + */ + createControl: function (n, cm) { + return null; + }, + + getInfo: function () { + return { + longname: 'Youtube Iframe PlugIn', + author: 'Darius Matulionis', + authorurl: 'http://matulionis.lt', + infourl: 'darius@matulionis.lt', + version: "1.1" + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('youtubeIframe', tinymce.plugins.YoutubeIframePlugin); +})(); \ No newline at end of file diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/img/youtube.png b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/img/youtube.png new file mode 100644 index 0000000000000000000000000000000000000000..a157f17b33e0d38d4ac775be70a347bbea494a49 GIT binary patch literal 1833 zcmeHIOKTHR6dnv>scrEEVmFRc!3s_0(I!oX#@J*gHsXYuN1Kh0>CA01r1Nm*)+F87 zcBfXTf{W@#L_u9BC|0RTK?Ao(rI93*=KUuJ^*6XacNV)_VXRQN=Wf0Z}d- zc?{Yx%&}cbq+m+e$4a{D5^Wz>UNsOJ!`cFQLzJ=r;yoa(Xnx}Jy-5OBWIxgE7AV08 zfsE2IV1oESG$9RSC7(9PH+tuupD4NDS9v9u>_IT(foS|rjq)_)b=@!=QVVPEZxe+LuDfhB5F1#EI?fgUr zLW3pATrTIzHM?{(P0~J}&*oqlC-QJw1r3UMr)D*j7&u@_reZ)v*KnIr?9uz7pFo)| z9YHn9w3@YCCR8voFB&B6qUn%=12`gynRpUj-U0VdXM5OjX3%Vo(hfnFFSB6v$yy zSMkL|vr6S$xQcwsSh->@JYNw@qGU+>YX7+Ek_qX@UY3Q6Hf8Ap4e8xP!XDqf_9A*O zSm(Y3j~+*HE9%K&AXz+=EFMc1f6Nz=v51D1wo-xryaI);SN4CV8pfh=r1_!`c)v_cPJP=rGad4#XY0Suy!a5h z+x7F7d}b&b&o-{#_UWKn^K8vSNA=+4vqPKr4sN(Ky0Cie+SIvp-8j>JwYfh;rINFc s9JlXZIDci~ + + + + {#youtube_dlg.title} + + + + + + + +
    +

    + + +

    + + + {#youtube_dlg.choose_size}: + +
    + Choose type: + {#youtube_dlg.iframe} + {#youtube_dlg.embed} +
    +
    + + +
    +
    + + + diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts.js new file mode 100644 index 0000000000..c248284c7f --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts.js @@ -0,0 +1 @@ +tinyMCEPopup.requireLangPack();var YoutubeDialog={init:function(){var a=document.forms[0];a.youtubeURL.value=tinyMCEPopup.editor.selection.getContent({format:"text"});$(".share-embed-size-list li.share-embed-size").each(function(){$(this).click(function(){$("li.share-embed-size").removeClass("selected");$(this).addClass("selected")})})},insert:function(){var a=$("#youtubeURL").val();if(a===null){tinyMCEPopup.close();return}var b,c,d,e,f;c=a.match("[\\?&]v=([^&#]*)");b=$.trim(c===null?a:c[1]);if(b===""){tinyMCEPopup.close();return}d=$("li.selected label input").attr("data-width");e=$("li.selected label input").attr("data-height");if(d==-1&&e==-1){d=$("input.share-embed-size-custom-width").val();e=$("input.share-embed-size-custom-height").val()}if(d==""||d=="undefined"||e==""||e=="undefined"){alert("Error: No size selected");tinyMCEPopup.close();return}f=$("input[name='yType']:checked").val();if(f==""||f=="undefined"){alert("Error: No type selected");tinyMCEPopup.close();return}var g='';var h='\n \n\n \n\n \n\n \n\n \n\n \n\n ';if(f=="iframe"){tinyMCEPopup.editor.execCommand("mceInsertContent",false,g)}else{tinyMCEPopup.editor.execCommand("mceInsertContent",false,h)}tinyMCEPopup.close()}};tinyMCEPopup.onInit.add(YoutubeDialog.init,YoutubeDialog) \ No newline at end of file diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts_src.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts_src.js new file mode 100644 index 0000000000..8cd179096d --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/js/scripts_src.js @@ -0,0 +1,81 @@ +// @name scripts +// @author Darius Matulionis + +tinyMCEPopup.requireLangPack(); + +var YoutubeDialog = { + init: function () { + var f = document.forms[0]; + // Get the selected contents as text and place it in the input + f.youtubeURL.value = tinyMCEPopup.editor.selection.getContent({format: 'text'}); + + //Add click event form selection + $(".share-embed-size-list li.share-embed-size").each(function(){ + $(this).click(function(){ + $("li.share-embed-size").removeClass("selected"); + $(this).addClass("selected"); + }); + }); + }, + // Insert the contents from the input into the document + insert: function () { + + //Get Code from URL + var url = $("#youtubeURL").val(); + if (url === null) {tinyMCEPopup.close();return;} + + var code, regexRes, width, height, type; + regexRes = url.match("[\\?&]v=([^&#]*)"); + code = $.trim( (regexRes === null) ? url : regexRes[1] ); + if (code === "") {tinyMCEPopup.close();return;} + + //Get Size + width = $("li.selected label input").attr("data-width"); + height = $("li.selected label input").attr("data-height"); + + //Get Custom size + if(width == -1 && height == -1){ + width = $("input.share-embed-size-custom-width").val(); + height = $("input.share-embed-size-custom-height").val(); + } + + //No size or Some Error Accured + if(width == "" || width == "undefined" || height == "" || height == "undefined"){ + alert("Error: No size selected");tinyMCEPopup.close();return; + } + + //Get insert type + type = $("input[name='yType']:checked").val(); + + //No type or Some Error Accured + if(type == "" || type == "undefined"){ + alert("Error: No type selected");tinyMCEPopup.close();return; + } + + //Codes + var iFrame = ''; + var embeded = '\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + '; + + //Isert to edditor + if(type == "iframe"){ + tinyMCEPopup.editor.execCommand('mceInsertContent', false, iFrame); + }else{ + tinyMCEPopup.editor.execCommand('mceInsertContent', false, embeded); + } + + //Close + tinyMCEPopup.close(); + + + } +}; +tinyMCEPopup.onInit.add(YoutubeDialog.init, YoutubeDialog); + + diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en.js new file mode 100644 index 0000000000..b7dc7fa989 --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en.js @@ -0,0 +1,3 @@ +tinyMCE.addI18n('en.youtube',{ + desc : 'Insert youtube video' +}); diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en_dlg.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en_dlg.js new file mode 100644 index 0000000000..491185da0b --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/en_dlg.js @@ -0,0 +1,12 @@ +tinyMCE.addI18n('en.youtube_dlg',{ + title: 'Insert/edit youtube videos', + url_field: 'YouTube video url or code:', + url_example1: 'URL Example', + url_example2: 'Code Example', + choose_size: 'Choose size', + custom: 'Custom', + Width: 'Width', + Height: 'Height', + iframe: 'New iFrame style', + embed: 'Old Embeded Style' +}); diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru.js new file mode 100644 index 0000000000..094cdfa388 --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru.js @@ -0,0 +1,3 @@ +tinyMCE.addI18n('ru.youtube',{ + desc : 'Добавить Youtube видео' +}); diff --git a/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru_dlg.js b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru_dlg.js new file mode 100644 index 0000000000..c0e2a5c11c --- /dev/null +++ b/assets/plugins/tinymce/tiny_mce/plugins/youtubeIframe/langs/ru_dlg.js @@ -0,0 +1,12 @@ +tinyMCE.addI18n('ru.youtube_dlg',{ + title: 'Вставить/редактировать youtube видео', + url_field: 'YouTube ссылка или код:', + url_example1: 'пример URL', + url_example2: 'пример Code', + choose_size: 'выберите размер', + custom: 'Задать размер', + Width: 'Ширина', + Height: 'Высота', + iframe: 'iFrame - новый', + embed: 'Embeded - старый' +}); From d9853c5e9e566eafa881c02272c99df7d445e6ff Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 11:04:06 +0300 Subject: [PATCH 321/530] small fix in ditto --- assets/snippets/ditto/classes/ditto.class.inc.php | 4 ++-- assets/snippets/ditto/lang/russian-UTF8.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/snippets/ditto/classes/ditto.class.inc.php b/assets/snippets/ditto/classes/ditto.class.inc.php index 4fdfec26e8..f4446031e2 100644 --- a/assets/snippets/ditto/classes/ditto.class.inc.php +++ b/assets/snippets/ditto/classes/ditto.class.inc.php @@ -1157,12 +1157,12 @@ function paginate($start, $stop, $total, $summarize, $tplPaginateNext, $tplPagin } $modx->setPlaceholder($dittoID."next", $nextplaceholder); $modx->setPlaceholder($dittoID."previous", $previousplaceholder); + $modx->setPlaceholder($dittoID."pages", $pages); $modx->setPlaceholder($dittoID."splitter", $split); $modx->setPlaceholder($dittoID."start", $start +1); $modx->setPlaceholder($dittoID."urlStart", $start); $modx->setPlaceholder($dittoID."stop", $limiter); - $modx->setPlaceholder($dittoID."total", $total); - $modx->setPlaceholder($dittoID."pages", $pages); + $modx->setPlaceholder($dittoID."total", $total); $modx->setPlaceholder($dittoID."perPage", $summarize); $modx->setPlaceholder($dittoID."totalPages", $totalpages); $modx->setPlaceholder($dittoID."ditto_pagination_set", true); diff --git a/assets/snippets/ditto/lang/russian-UTF8.inc.php b/assets/snippets/ditto/lang/russian-UTF8.inc.php index eef3169d86..2a02b5d5a4 100755 --- a/assets/snippets/ditto/lang/russian-UTF8.inc.php +++ b/assets/snippets/ditto/lang/russian-UTF8.inc.php @@ -4,7 +4,7 @@ * Filename: assets/snippets/ditto/lang/russian-UTF8.inc.php * Language: Russian * Encoding: UTF8 - * Translated by: Russian MODx community, Jaroslav Sidorkin, based on translation by modx.ru + * Translated by: Russian MODX community, Jaroslav Sidorkin, based on translation by modx.ru * Date: 9 May 2010 * Version: 2.1.0 */ From 6ce7c0fefe8377c5430c16bc22cc646b1f45285e Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 11:06:05 +0300 Subject: [PATCH 322/530] fix index.html in eform lang --- assets/snippets/eform/lang/index.html | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 assets/snippets/eform/lang/index.html diff --git a/assets/snippets/eform/lang/index.html b/assets/snippets/eform/lang/index.html new file mode 100644 index 0000000000..fdd3791786 --- /dev/null +++ b/assets/snippets/eform/lang/index.html @@ -0,0 +1,2 @@ +

    Unauthorized access

    +You're not allowed to access file folder \ No newline at end of file From 8f4aca9da5a43a97f4a572f391f29ee1421e424e Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 11:13:53 +0300 Subject: [PATCH 323/530] set phpmailer default charset to utf-8 --- manager/includes/controls/phpmailer/class.phpmailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/controls/phpmailer/class.phpmailer.php b/manager/includes/controls/phpmailer/class.phpmailer.php index 44a0169fc2..ff877c4d12 100644 --- a/manager/includes/controls/phpmailer/class.phpmailer.php +++ b/manager/includes/controls/phpmailer/class.phpmailer.php @@ -57,7 +57,7 @@ class PHPMailer { * Sets the CharSet of the message. * @var string */ - public $CharSet = 'iso-8859-1'; + public $CharSet = 'utf-8'; /** * Sets the Content-type of the message. From 4b60d628df61fb92d70631a0fb9e630ba4590e65 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 11:41:13 +0300 Subject: [PATCH 324/530] fix version date --- manager/includes/version.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/version.inc.php b/manager/includes/version.inc.php index 45b93ea01c..f53547359c 100755 --- a/manager/includes/version.inc.php +++ b/manager/includes/version.inc.php @@ -1,5 +1,5 @@ Date: Mon, 26 Aug 2013 18:10:52 +0900 Subject: [PATCH 325/530] Fix html --- manager/actions/manage_metatags.dynamic.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manager/actions/manage_metatags.dynamic.php b/manager/actions/manage_metatags.dynamic.php index 94b8f06efb..69938895a5 100644 --- a/manager/actions/manage_metatags.dynamic.php +++ b/manager/actions/manage_metatags.dynamic.php @@ -102,6 +102,7 @@ function deleteTag() {
    +


    @@ -192,8 +193,10 @@ function deleteTag() {
    +
    +


    +
    From fc4d4a21b4b67164e2c5aa72e40b1ec33a00590c Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 12:12:46 +0300 Subject: [PATCH 326/530] update mm to 0.3.11 step1 --- .../plugins/managermanager/docs/changelog.htm | 51 ++- assets/plugins/managermanager/docs/css/mm.css | 204 +++++++-- .../managermanager/docs/field-names.htm | 6 +- assets/plugins/managermanager/docs/fields.htm | 6 +- .../managermanager/docs/getting-started.htm | 6 +- assets/plugins/managermanager/docs/index.htm | 21 +- .../plugins/managermanager/docs/install.htm | 7 +- .../plugins/managermanager/docs/sections.htm | 6 +- assets/plugins/managermanager/docs/tabs.htm | 6 +- .../plugins/managermanager/docs/widgets.htm | 405 ++++++++++++++++-- 10 files changed, 620 insertions(+), 98 deletions(-) diff --git a/assets/plugins/managermanager/docs/changelog.htm b/assets/plugins/managermanager/docs/changelog.htm index 4e72576b3e..6aec6701c9 100644 --- a/assets/plugins/managermanager/docs/changelog.htm +++ b/assets/plugins/managermanager/docs/changelog.htm @@ -9,9 +9,7 @@ - +
    @@ -29,8 +27,53 @@
    -
    +

    Changelog

    +

    0.3.11 (2012.02.15) by DivanDesign

    +
      +
    • Bugfix: ManagerManager plugin settings last tab (functions/tabs.inc.php: line 132)
      • +
    • New: mm_ddAutoFolders widget - Automatically move documents (OnBeforeDocFormSave event) based on their date (publication date; any date in tv) into folders of year and month (like 2012/02/).
      • +
    • mm_ddSetFieldValue update to 1.0.2 +
        +
      • Bugfix: Date format (widgets/ddsetfieldvalue/ddsetfieldvalue.php: line 34, 37)
        • +
      +
      • +
    • mm_ddGMap update to 1.0.2 +
        +
      • New: Multilingual map (widgets/ddgmap/ddgmap.php: line 14, 103)
        • +
      +
      • +
    • Added documentation for new widgets: mm_ddGMap, mm_ddYMap, mm_ddSetFieldValue, mm_ddMaxLength, mm_ddAutoFolders (docs/widgets.htm)
      • +
    • Change style of documentation (docs/css/mm.css & minor changes of all html files in docs/) like you see =)
      • +
    +

    0.3.10 (2012.01.16) by DivanDesign

    +
      +
    • Bugfix: Fix jQ selector for rules mm_moveFieldsToTab (functions/fields.inc.php: line 274)
      • +
    • New: mm_default now support all fields (for TV like tv99, where 12 - id of TV) (functions/fieldvalues.inc.php: line 170)
      • +
    • New: ManagerManager now support OnBeforeDocFormSave event: +
        +
      • Initialization on mm.inc.php: line 450-452
        • +
      • Added validating event on functions/fields.inc.php: line 17, 81, 161, 213, 318
        • +
      • Added validating event on functions/fieldvalues.inc.php: line 25, 199, 298
        • +
      • Added validating event on functions/sections.inc.php: line 16
        • +
      • Added validating event on functions/tabs.inc.php: line 15, 65, 132
        • +
      • Added validating event on functions/templates.inc.php: line 17
        • +
      • Added validating event on widgets/!template/!template.php: line 12. Moved the output to the browser into if on widgets/!template.php: line 59
        • +
      • Added validating event on widgets/accessdenied/accessdenied.php: line 16. Moved the output to the browser into if on widgets/!template.php: line 34
        • +
      • Added validating event on widgets/colors/colors.php: line 12
        • +
      • Added validating event on widgets/showimagetvs/showimagetvs.php: line 15
        • +
      • Added validating event on widgets/tags/tags.php: line 12. Moved the output to the browser into if on widgets/tags/tags.php: line 98
        • +
      +
      • +
    • New: mm_ddGMap widget - integrate the Google Maps
      • +
    • New: mm_ddYMap widget - integrate the Yandex Maps
      • +
    • New: mm_ddSetFieldValue widget - sets a value for a field (always!)
      • +
    • New: mm_ddMaxLength widget - limit the number of characters in the TV (like the Twitter)
      • +
    • jQuery update to 1.7.1 (plugin.txt: line 33, 34)
      • +
    • New event (OnBeforeDocFormSave) in installation instuctions (docs/install.htm)
      • +
    • Credits in docs/index.htm =)
      • +
    +

    0.3.9

    • Bugfix: PHP error with versions < 5.2.3 (thanks mamalovesyou)
      • diff --git a/assets/plugins/managermanager/docs/css/mm.css b/assets/plugins/managermanager/docs/css/mm.css index 61423e5c10..3e1672267a 100644 --- a/assets/plugins/managermanager/docs/css/mm.css +++ b/assets/plugins/managermanager/docs/css/mm.css @@ -1,56 +1,186 @@ -#nav { - background: #45A826; - float: left; - width: 200px; - font-size: 1.2em; - color: #FFF; +/** + * reset.css + * @version: 1.0.1 (2012-02-02) + * + * @copyright 2012, DivanDesign + * http://www.DivanDesign.ru + */ +@charset "utf-8"; + +html, body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, p, blockquote, th, td {margin:0; padding:0;} +img, body, html {border:0;} +html, body {width: 100%; height: 100%;} + +address, caption, cite, code, dfn, em, th, var {font-style: normal; font-weight: normal;} +*:focus, a, a:hover {outline: none;} +caption, th {text-align: left;} +td {vertical-align: top;} +q:before, q:after {content:'';} +blockquote, q {quotes: none;} +blockquote:before, blockquote:after, q:before, q:after {content: ''; content: none;} +table {border-collapse: collapse; border-spacing: 0;} + +/* html5*/ +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display: block;} + +.clear, .clearfix:after {clear: both; float: none !important;} +.clearfix:after { + display: block; + height: 0; + overflow: hidden; + visibility: hidden; + content: ' '; } -#content { - margin-left: 220px; + +.none {display: none;} +.hidden {visibility: hidden;} +.left {float: left;} +.right {float: right;} +.nolist { + padding: 0; + margin: 0; + list-style: none; } +.nobr {white-space: nowrap;} +/*_/reset.css*/ + +/** + * base.css + * @version: 1.0.6 (2012-02-02) + * + * @copyright 2012, DivanDesign + * http://www.DivanDesign.ru + */ body { - font: 82.5%/1.2 Tahoma, Geneva, sans-serif; + background-color: #fff; + position: relative; + font: 13px/1.615em Verdana, Tahoma, Arial, sans-serif; + color: #464646; + overflow-y: scroll; } -#banner { - background: url(../images/banner.png) no-repeat left top; - height: 57px; - margin-bottom: 20px; +*::selection { + background: #007cc3; + color:#fff; +} + +*::-moz-selection { + background: #007cc3; + color:#fff; +} + +a, a.strl span { + border-bottom-width: 1px; + text-decoration: none; +} + +a { + border-bottom-style: solid; + border-color: #bfd7e9; + color: #007cc3; + -webkit-transition: color 0.3s ease-out, border-color 0.3s ease-out; + -moz-transition: color 0.3s ease-out, border-color 0.3s ease-out; + -ms-transition: color 0.3s ease-out, border-color 0.3s ease-out; + -o-transition: color 0.3s ease-out, border-color 0.3s ease-out; + transition: color 0.3s ease-out, border-color 0.3s ease-out; +} + +a.strl span { + border-style: inherit; + border-color: inherit; +} + +a.false {border-bottom-style: dotted;} + +a:hover { + color: #f9720c; + border-color: #f9720c; } -#nav a { - color: #FFC; + +a:active, a.active, a.strl, a.strl:active span {border-bottom-width: 0;} + +h1, h2, h3, h4, h5, h6 { + padding-top: 0.64em; + padding-bottom: 0.444em; + font-family: Georgia, serif; + font-weight: normal; + line-height: 1.2em; } -h1 { - font-size: 1.6em; - color: #00670A; + +h1 {font-size: 50px;} +h2 {font-size: 24px;} +h3 {font-size: 18px;} + +h4 { + font-size: 16px; + line-height: 1.625em; } -h2 { - font-size: 1em; - color: #FFF; - background: #219910; + +.content p, .content ul, .content ol, .content table {margin-bottom: 1em;} +/* .content */ul, /* .content */ol {padding-left: 30px;} + +/* .content */ul li {padding-bottom: 0.24em;} + +.content table { + border-collapse: collapse; + margin-left: -6px; +} + +.content table td, .content table th { + border: 1px solid #cccccc; padding: 2px 5px; - margin-top: 2em; } -h3 { - font-size: 0.9em; - color: #43A82B; + +.content table th { + font-weight: bold; } -#nav ul li { - margin: 0px; - padding: 0px; - list-style: none; +/*_/base.css*/ + +#nav { + padding: 50px 0 0 10px; + float: left; + font-size: 1.2em; + line-height: 1.615em; } -.remove { text-decoration: line-through; +.content { + padding: 0 30px 30px 0; + margin-left: 220px; +} + +#banner { + padding: 0 0 0 40px; + background: #00b4ff; + background: -moz-linear-gradient(top, #00b4ff 0%, #00a7f0 24%, #007fc0 74%, #0070af 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00b4ff), color-stop(24%,#00a7f0), color-stop(74%,#007fc0), color-stop(100%,#0070af)); + background: -webkit-linear-gradient(top, #00b4ff 0%,#00a7f0 24%,#007fc0 74%,#0070af 100%); + background: -o-linear-gradient(top, #00b4ff 0%,#00a7f0 24%,#007fc0 74%,#0070af 100%); + background: -ms-linear-gradient(top, #00b4ff 0%,#00a7f0 24%,#007fc0 74%,#0070af 100%); + background: linear-gradient(top, #00b4ff 0%,#00a7f0 24%,#007fc0 74%,#0070af 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00b4ff', endColorstr='#0070af',GradientType=0 ); + box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); + font-size: 16px; + line-height: 3.2em; + color: #FFFFFF; + text-shadow: 0 -1px 0 #0070AF; + height: 57px; } + +#nav ul li {list-style: none;} + +.remove {text-decoration: line-through;} code { display: block; - margin: 5px; - background-color: #CCCCCC; - padding: 3px; -} -th, td { - padding: 2px 5px; + padding: 3px 5px; + margin: 5px 5px 5px -5px; + background-color: #E6E6E6; + font-family: Consolas, monospace; } + .warning { font-weight: bold; color: #F00; } + +em { + font-style: normal; + color: #007cc3; +} diff --git a/assets/plugins/managermanager/docs/field-names.htm b/assets/plugins/managermanager/docs/field-names.htm index 3443723494..d1b3a733f8 100644 --- a/assets/plugins/managermanager/docs/field-names.htm +++ b/assets/plugins/managermanager/docs/field-names.htm @@ -10,9 +10,7 @@ - +
      @@ -30,7 +28,7 @@
    -
    +

    Naming

    Fields

    diff --git a/assets/plugins/managermanager/docs/fields.htm b/assets/plugins/managermanager/docs/fields.htm index 98c8f68a37..fc479f32e5 100644 --- a/assets/plugins/managermanager/docs/fields.htm +++ b/assets/plugins/managermanager/docs/fields.htm @@ -10,9 +10,7 @@ - +
    @@ -30,7 +28,7 @@
    -
    +

    Function reference: Fields

    mm_renameField($field, $newlabel, $roles, $templates, $newhelp)

    diff --git a/assets/plugins/managermanager/docs/getting-started.htm b/assets/plugins/managermanager/docs/getting-started.htm index 0b45262041..fa01962deb 100644 --- a/assets/plugins/managermanager/docs/getting-started.htm +++ b/assets/plugins/managermanager/docs/getting-started.htm @@ -10,9 +10,7 @@ - +
    @@ -30,7 +28,7 @@
    -
    +

    How it works

    MM works by creating a series of actions (or "rules"), which can be applied to particular fields. Each rule can be applied to certain roles, certain templates or any combination or either.

    For example, to rename a field for all templates and all users, you might use:

    diff --git a/assets/plugins/managermanager/docs/index.htm b/assets/plugins/managermanager/docs/index.htm index 50339763f4..b0406c2bb9 100644 --- a/assets/plugins/managermanager/docs/index.htm +++ b/assets/plugins/managermanager/docs/index.htm @@ -10,9 +10,7 @@ - +
    @@ -30,15 +28,22 @@
    -
    +

    Introduction

    -

    ManagerManager lets you customise your ModX manager interface. You can rename, hide, and move fields and tabs. And do it just for certain users or templates. Absolute power!

    +

    ManagerManager lets you customise your ModX manager interface. You can rename, hide, move fields and tabs and doing many others intresting actions. And do it just for certain users or templates. Absolute power!

    +

    Credits

    -

    Nick Crossland - www.rckt.co.uk
    +

    Nick Crossland — www.rckt.co.uk
    Inspired by HideEditor plugin by Timon Reinhard and Gildas andHideManagerFields by Brett @ The Man Can!

    +

    DivanDesign — www.DivanDesign.biz: v0.3.10, 0.3.11.

    +

    License

    -

    Released under the GNU General Public License: http://creativecommons.org/licenses/GPL/2.0/
    -Code and documentation © 2007-9 Rocket Science Solutions Ltd

    +

    Released under the GNU General Public License: http://creativecommons.org/licenses/GPL/2.0/

    +

    Code and documentation © 2007-9 Rocket Science Solutions Ltd

    +

    Code and documentation © 2012 DivanDesign studio

    + +

    Feedback

    +

    Write us if you need help or have a great idea.

    diff --git a/assets/plugins/managermanager/docs/install.htm b/assets/plugins/managermanager/docs/install.htm index c7f652d327..7b98eb23f4 100644 --- a/assets/plugins/managermanager/docs/install.htm +++ b/assets/plugins/managermanager/docs/install.htm @@ -10,9 +10,7 @@ - +
    @@ -30,7 +28,7 @@
    -
    +

    Installation

    Compatibility

    If you are running ModX 0.9.6.x, this version will not work. You should download previous version 0.3.2 of ManagerManager.

    @@ -44,6 +42,7 @@

    New install

    • OnDocFormRender
    • OnDocFormPrerender
      • +
    • OnBeforeDocFormSave
    • OnPluginFormRender
    • OnTVFormRender
    diff --git a/assets/plugins/managermanager/docs/sections.htm b/assets/plugins/managermanager/docs/sections.htm index e45d2fa569..2ef08e1b7d 100644 --- a/assets/plugins/managermanager/docs/sections.htm +++ b/assets/plugins/managermanager/docs/sections.htm @@ -10,9 +10,7 @@ - +
    @@ -30,7 +28,7 @@
    -
    +

    Function reference: Sections

    "Sections" are the areas of a document edit tab, e.g. Resource content and Template Variable.

    mm_renameSection($section, $newlabel, $roles, $templates)

    diff --git a/assets/plugins/managermanager/docs/tabs.htm b/assets/plugins/managermanager/docs/tabs.htm index 4b7e7e8ce6..1cbf3b42ab 100644 --- a/assets/plugins/managermanager/docs/tabs.htm +++ b/assets/plugins/managermanager/docs/tabs.htm @@ -10,9 +10,7 @@ - +
    @@ -30,7 +28,7 @@
    -
    +

    Function reference: Tabs

    mm_renameTab($tab, $newlabel, $roles, $templates)

    Renames one of the default tabs within the manager.

    diff --git a/assets/plugins/managermanager/docs/widgets.htm b/assets/plugins/managermanager/docs/widgets.htm index 2b0820dfc4..1776d3993e 100644 --- a/assets/plugins/managermanager/docs/widgets.htm +++ b/assets/plugins/managermanager/docs/widgets.htm @@ -10,9 +10,7 @@ - +
    @@ -30,50 +28,407 @@
    -
    +

    Function reference: Widgets

    +

    mm_widget_tags($fields, $delimiter, $source, $display_count, $roles, $templates)

    Tags demo

    Changes the manager widget for this text field to tag-friendly format - e.g. it will display a clickable list of all other tags which have been used for this field.

    -

    $fields: The name(s) of the template variables this should apply to. Can accept multiple field separated by a comma. [Required]
    - $delimiter: Which character separates individual tags within this field [Optional - default is comma)
    - $source: The names(s) of the template variables the list of tags should come from. This allows the list of tags to come from a different field that the widget. By default it uses all the TVs listed in $fields [Optional - default is same as $fields]
    - $display_count: Display the number of documents using each tag (in brackets after it) [Optional - boolean - default is false]
    - $roles: comma separated list of role IDs this should be applied to. Leave empty (or omit) for all roles [Optional - default is all]
    - $templates: comma separated list of template IDs this should be applied to. Leave empty (or omit) for all templates [Optional - default is all]

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $fieldsstring; comma separated stringThe name(s) of the template variables this should apply to.Required
    $delimiterstringWhich character separates individual tags within this fieldOptional: Default: ','
    $sourcestring; comma separated stringThe names(s) of the template variables the list of tags should come from. This allows the list of tags to come from a different field that the widget. By default it uses all the TVs listed in $fieldsOptional; Default: = $fields
    $display_count0; 1Display the number of documents using each tag (in brackets after it).Optional; Default: 0
    $rolesstring; comma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    $templatesstring; comma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Optional; Default: ''.
    +

    mm_widget_tags('docTags'); // Adds the tag editing widget to the docTags template variable wherever it appearsmm_widget_tags('docTags,blogTags'); // Adds the tag editing widget to the docTags and blogTags template variables wherever they appear - making all previous values from both template variables available in both tagsmm_widget_tags('docTags', ',', '', '1', '', '2'); // Adds the tag editing widget to the docTags template variables in template 2, and shows the number of times each tag has been used

    Note: TV(s) must be a text input field

    +

    mm_widget_showimagetvs($fields, $w, $h, $thumbnailerUrl, $roles, $templates)

    Show Image preview

    Emulates the ShowImageTVs plugin - shows a preview of images chosen in image TVs.

    -

    $fields: The name(s) of the template variables this should apply to. Can accept multiple field separated by a comma. [Optional - default is to use all image TVs]
    - $w: Preferred maximum width of the preview [Optional - default is 300]
    - $h: Preferred maximum height of the preview [Optional - default is 100]
    - $thumbnailerUrl: If you have PHPThumb installed (for example through Maxigallery or phpthumb plugins/snippets), use this to make thumbnails rather than resizing the image previews via CSS. Particularly useful if you are using very large pictures, which would take a long time to download. [Optional - url]
    - $roles: comma separated list of role IDs this should be applied to. Leave empty (or omit) for all roles [Optional - default is all]
    - $templates: comma separated list of template IDs this should be applied to. Leave empty (or omit) for all templates [Optional - default is all]

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $fieldsstring; comma separated stringThe name(s) of the template variables this should apply to.Optional; Default: '' (is to use all image TVs)
    $wintegerPreferred maximum width of the preview.Optional; Default: 300
    $hintegerPreferred maximum height of the preview.Optional; Default: 300
    $thumbnailerUrlurl stringIf you have PHPThumb installed (for example through Maxigallery or phpthumb plugins/snippets), use this to make thumbnails rather than resizing the image previews via CSS. Particularly useful if you are using very large pictures, which would take a long time to download.Optional
    $rolesstring; comma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    $templatesstring; comma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Optional; Default: ''
    +

    mm_widget_showimagetvs(); // Adds an image preview to every Image-type template variablemm_widget_showimagetvs('', 150, 150); // Adds a 150x150px image preview to every Image-type template variablemm_widget_showimagetvs('mypic', '300', '200', '/assets/snippets/phpthumb/phpThumb.php', '', '2'); // Adds an image preview to the mypic template variables in template 2, resized to 300x200px using phpthumb at the URL supplied

    Note: TV(s) must be an image input field

    +

    mm_widget_colors($fields, $default, $roles, $templates)

    Color picker

    Turns a text field into a color picker - storing the chosen hex value in the field.

    -

    $fields: The name(s) of the template variables this should apply to. Can accept multiple field separated by a comma. [Required]
    - $default: Which color should be selected by default in new documents. This is only used in situations where the TV does not have a default value specified in the TV definition [Optional - default is white)
    - $roles: comma separated list of role IDs this should be applied to. Leave empty (or omit) for all roles [Optional - default is all]
    - $templates: comma separated list of template IDs this should be applied to. Leave empty (or omit) for all templates [Optional - default is all]

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $fieldsstring; comma separated stringThe name(s) of the template variables this should apply to.Required
    $defaultcolor stringWhich color should be selected by default in new documents. This is only used in situations where the TV does not have a default value specified in the TV definition.Optional; Default: '#ffffff'
    $rolesstring; comma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Default: ''
    $templatesstring; comma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Default: ''
    +

    mm_widget_colors('bgcolor'); // Adds the color picker widget to the bgcolor template variable wherever it appearsmm_widget_colors('bgcolor,foreground'); // Adds the color picker widget to the bgcolor and foreground template variables wherever they appearmm_widget_colors('bgcolor', '#000000', '1', '2'); // Adds the color picker widget to the bgcolor template variable, with a default value of black for new documents, only for role 1 and documents using template 2

    Note: TV(s) must be a text input field

    -

     

    +

    mm_widget_accessdenied($ids, $message, $roles)

    Denies access to specific documents (by ID) without inheritance.

    For example, if the parent document has some Ditto call (which you do not want a user to edit) but want to allow them to create child documents.

    Use this plugin with caution, as while it offers a basic level of protection, it does not prevent access to documents in the same way as ModX's permissions system. It would be possible for a user with technical knowledge to override it. Think of it as a "No entry" sign for an unlocked door, rather than a lock.

    Originally contributed by Metaller

    -

    $ids: comma separated list of documents ID to prevent access. [Required]
    - $message: HTML formatted message [Optional - default is "Access denied - Access to current document closed for security reasons.")
    - $roles: comma separated list of role IDs this should be applied to. Leave empty (or omit) for all roles [Optional - default is all]
    -

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $idsstring; comma separated stringList of documents ID to prevent access.Required
    $messagehtml stringHTML formatted messageOptional; Default: '"Access denied - Access to current document closed for security reasons."'
    $rolesstring; comma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    +

    mm_widget_accessdenied('1,15'); // Prevents all users from accessing documents 1 and 15 (displaying default message)mm_widget_accessdenied('1,15', 'Please select another document to edit' '2'); // Prevents users with role 2 from accessing documents 1 and 15 (displaying custom message)

    + +

    mm_ddGMap($tvs, $roles, $templates, $w, $h)

    +

    Integrate the Google Maps in MODx documents.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $tvsstring; comma separated stringThe name(s) of the template variables this should apply to.Required
    $rolesstring; comma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    $templatesstring; comma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Optional; Default: ''
    $wstring; integerWidth of container map.Optional; Default: 'auto'
    $hintegerHeight of container map.Optional; Default: 400
    +

    Created by DivanDesign.

    + +

    mm_ddYMap($tvs, $roles, $templates, $key, $w, $h)

    +

    Integrate the Yandex Maps in MODx documents.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $tvsstring; comma separated stringThe name(s) of the template variables this should apply to.Required
    $rolesstring; comma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    $templatesstring; comma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Optional; Default: ''
    $keystringYandex-map key for your domain.Required
    $wstring; integerWidth of container map.Optional; Default: 'auto'
    $hintegerHeight of container map.Optional; Default: 400
    +

    Created by DivanDesign.

    + +

    mm_ddSetFieldValue($field, $value, $roles, $templates)

    +

    Sets a value for a field (always!).

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $fieldstringThe name of the document field or template varible this should apply to.Required
    $valuestringThe value for the field specified.Optional; Default: ''
    $rolescomma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    $templatescomma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Optional; Default: ''
    +

    Created by DivanDesign.

    + +

    mm_ddMaxLength($tvs, $roles, $templates, $length)

    +

    Limit the number of characters in the TV (like the Twitter).

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $tvscomma separated stringThe name(s) of the template variables this should apply to.Required
    $rolescomma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    $templatescomma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Optional; Default: ''
    $lengthintegerCount of characters to limit.Optional; Default: 150
    +

    Created by DivanDesign.

    + +

    mm_ddAutoFolders($ddRoles, $ddTemplates, $ddParent, $ddDateSource, $ddYearTpl, $ddMonthTpl, $ddYearPub, $ddMonthPub)

    +

    Automatically move documents (OnBeforeDocFormSave event) based on their date (publication date; any date in tv) into folders of year and month (like 2012/02/).

    +

    If folders (documents) of year and month doesn`t exist they are created automatically OnBeforeDocFormSave event.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterTypeDesctiptionDefault
    $ddRolescomma separated stringList of role IDs this should be applied to. Leave empty (or omit) for all roles.Optional; Default: ''
    $ddTemplatescomma separated stringList of template IDs this should be applied to. Leave empty (or omit) for all templates.Optional; Default: ''
    $ddParentintegerUltimate parent ID (parent of the years).Required
    $ddDateSourcestringName of template variable which contains the date.Optional; Default: 'pub_date'
    $ddYearTplintegerTemplate ID for documents of year.Optional; Default: 0
    $ddMonthTplintegerTemplate ID for documents of month.Optional; Default: 0
    $ddYearPub0; 1Would the documents of year published?Optional; Default: 0
    $ddMonthPub0; 1Would the documents of month published?Optional; Default: 0
    +

    Created by DivanDesign.

    From 33a6c5118e74f4d47c372b9ee4054ff34affead7 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 12:17:00 +0300 Subject: [PATCH 327/530] update mm step2 --- .../managermanager/functions/fields.inc.php | 27 ++++------- .../functions/fieldvalues.inc.php | 8 ++-- .../managermanager/functions/sections.inc.php | 2 +- .../managermanager/functions/tabs.inc.php | 6 +-- .../functions/templates.inc.php | 2 +- assets/plugins/managermanager/mm.inc.php | 46 ++++++++++--------- .../plugins/managermanager/mm_rules.inc.php | 38 +++++++++++++++ .../widgets/!template/!template.php | 5 +- .../widgets/accessdenied/accessdenied.php | 5 +- .../managermanager/widgets/colors/colors.php | 2 +- .../managermanager/widgets/tags/tags.php | 4 +- 11 files changed, 86 insertions(+), 59 deletions(-) create mode 100755 assets/plugins/managermanager/mm_rules.inc.php diff --git a/assets/plugins/managermanager/functions/fields.inc.php b/assets/plugins/managermanager/functions/fields.inc.php index 94a48ba2e0..51f42ca31c 100644 --- a/assets/plugins/managermanager/functions/fields.inc.php +++ b/assets/plugins/managermanager/functions/fields.inc.php @@ -18,26 +18,24 @@ function mm_renameField($field, $newlabel, $roles='', $templates='', $newhelp='' $output = " // ----------- Rename field -------------- \n"; - $output .= '$j("select[id$=_prefix]").each( function() { $j(this).parents("tr:first").addClass("urltv"); } ); '; - switch ($field) { // Exceptions case 'keywords': - $output .= '$j("select[name*=keywords]").siblings("span.warning").html("'.jsSafe($newlabel).'");'; + $output .= '$j("select[name*=keywords]").siblings("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; break; case 'metatags': - $output .= '$j("select[name*=metatags]").siblings("span.warning").html("'.jsSafe($newlabel).'");'; + $output .= '$j("select[name*=metatags]").siblings("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; break; case 'hidemenu': case 'show_in_menu': - $output .= '$j("input[name=hidemenucheck]").siblings("span.warning").html("'.jsSafe($newlabel).'");'; + $output .= '$j("input[name=hidemenucheck]").siblings("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; break; case 'which_editor': - $output .= '$j("#which_editor").prev("span.warning").html("'.jsSafe($newlabel).'");'; + $output .= '$j("#which_editor").prev("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; break; // Ones that follow the regular pattern @@ -46,7 +44,7 @@ function mm_renameField($field, $newlabel, $roles='', $templates='', $newhelp='' if (isset($mm_fields[$field])) { $fieldtype = $mm_fields[$field]['fieldtype']; $fieldname = $mm_fields[$field]['fieldname']; - $output .= '$j(":input[name='.$fieldname.']").parents("tr:not(.urltv)").children("td:first").children("span.warning").html("'.jsSafe($newlabel).'");'; + $output .= '$j("'.$fieldtype.'[name='.$fieldname.']").parents("td").prev("td").children("span.warning").empty().prepend("'.jsSafe($newlabel).'");'; } break; @@ -88,8 +86,6 @@ function mm_hideFields($fields, $roles='', $templates='') { $output = ''; - $output .= '$j("select[id$=_prefix]").each( function() { $j(this).parents("tr:first").addClass("urltv"); } ); '; - switch ($field) { // Exceptions @@ -134,7 +130,7 @@ function mm_hideFields($fields, $roles='', $templates='') { // Ones that follow the regular pattern default: if (isset($mm_fields[$field])) { // Check the fields exist, so we're not writing JS for elements that don't exist - $output .= '$j(":input[name='.$mm_fields[$field]['fieldname'].']").parents("tr:not(.urltv)").hide().next("tr").find("td[colspan=2]").parent("tr").hide(); '; + $output .= '$j("'.$mm_fields[$field]['fieldtype'].'[name='.$mm_fields[$field]['fieldname'].']").parents("tr").hide().next("tr").find("td[colspan=2]").parent("tr").hide(); '; } break; } // end switch @@ -172,25 +168,18 @@ function mm_changeFieldHelp($field, $helptext='', $roles='', $templates='') { // Ones that follow the regular pattern default: - $output .= '$j("select[id$=_prefix]").each( function() { $j(this).parents("tr:first").addClass("urltv"); } ); ' . "\n"; - // What type is this field? if (isset($mm_fields[$field])) { $fieldtype = $mm_fields[$field]['fieldtype']; $fieldname = $mm_fields[$field]['fieldname']; // Give the help button an ID, and modify the alt/title text - $output .= 'if ($j(":input[name=' . $fieldname . ']").siblings("img[style:contains(\'cursor:help\')]").length) {' . "\n"; - $output .= '$j(":input[name=' . $fieldname . ']").siblings("img[style:contains(\'cursor:help\')]").attr("id", "' . $fieldname . '-help").attr("alt", "'.jsSafe($helptext).'").attr("title", "'.jsSafe($helptext).'"); ' . "\n"; - $output .= '} else {' . "\n"; - $output .= 'var help' . $fieldname . ' = $j("").attr("id", "' . $fieldname . '-help").addClass("tooltip").css("cursor", "help").attr("src", "media/style/' . $modx->config['manager_theme'] . '/images/icons/b02_trans.gif").attr("alt", "'.jsSafe($helptext).'").attr("title", "'.jsSafe($helptext).'");' . "\n"; - $output .= '$j(":input[name=' . $fieldname . ']").closest("tr").children("td:last").append(help' . $fieldname . ');' . "\n"; - $output .= '}' . "\n"; + $output .= '$j("'.$fieldtype.'[name='.$fieldname.']").siblings("img[style:contains(\'cursor:help\')]").attr("id", "'.$fieldname.'-help").attr("alt", "'.jsSafe($helptext).'").attr("title", "'.jsSafe($helptext).'"); '; } else { break; } - //alt="NEW pagetitle help" + break; } // end switch diff --git a/assets/plugins/managermanager/functions/fieldvalues.inc.php b/assets/plugins/managermanager/functions/fieldvalues.inc.php index 7ca6f3bc76..3d3bf3ac89 100644 --- a/assets/plugins/managermanager/functions/fieldvalues.inc.php +++ b/assets/plugins/managermanager/functions/fieldvalues.inc.php @@ -22,7 +22,7 @@ function mm_default($field, $value='', $roles='', $templates='', $eval=false) { return; } - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)) { // What's the new value, and does it include PHP? $new_value = ($eval) ? eval($value) : $value; @@ -167,7 +167,7 @@ function mm_default($field, $value='', $roles='', $templates='', $eval=false) { default: - return; + $output .= '$j("*[name='.$field.']").val("'.$new_value.'");' . "\n"; //return; break; } $e->output($output . "\n"); @@ -196,7 +196,7 @@ function mm_inherit($fields, $roles='', $templates='') { } // Are we using this rule? - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)) { // Get the parent info if (isset($_REQUEST['pid'])){ @@ -296,7 +296,7 @@ function mm_synch_fields($fields, $roles='', $templates='') { } // if the current page is being edited by someone in the list of roles, and uses a template in the list of templates - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)) { $output = " // ----------- Synch fields -------------- \n"; diff --git a/assets/plugins/managermanager/functions/sections.inc.php b/assets/plugins/managermanager/functions/sections.inc.php index 8e954125a7..fd40d8800b 100644 --- a/assets/plugins/managermanager/functions/sections.inc.php +++ b/assets/plugins/managermanager/functions/sections.inc.php @@ -13,7 +13,7 @@ function mm_renameSection($section, $newname, $roles='', $templates='') { $e = &$modx->Event; // if the current page is being edited by someone in the list of roles, and uses a template in the list of templates - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)) { $output = " // ----------- Rename section -------------- \n"; diff --git a/assets/plugins/managermanager/functions/tabs.inc.php b/assets/plugins/managermanager/functions/tabs.inc.php index 5bb9c463ba..4f4c27d83f 100644 --- a/assets/plugins/managermanager/functions/tabs.inc.php +++ b/assets/plugins/managermanager/functions/tabs.inc.php @@ -12,7 +12,7 @@ function mm_renameTab($tab, $newname, $roles='', $templates='') { $e = &$modx->Event; // if the current page is being edited by someone in the list of roles, and uses a template in the list of templates - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)){ $output = " // ----------- Rename tab -------------- \n"; @@ -62,7 +62,7 @@ function mm_hideTabs($tabs, $roles='', $templates='') { $tabs = makeArray($tabs); // if the current page is being edited by someone in the list of roles, and uses a template in the list of templates - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)){ $output = " // ----------- Hide tabs -------------- \n"; @@ -129,7 +129,7 @@ function mm_createTab($name, $id, $roles='', $templates='', $intro='', $width='6 $e = &$modx->Event; // if the current page is being edited by someone in the list of roles, and uses a template in the list of templates - if (useThisRule($roles, $templates)) { + if ((($e->name == 'OnDocFormRender') || ($e->name == 'OnPluginFormRender')) && useThisRule($roles, $templates)){ // Plugin page tabs use a differen name for the tab object $js_tab_object = ($e->name == 'OnPluginFormRender') ? 'tpSnippet' : 'tpSettings'; diff --git a/assets/plugins/managermanager/functions/templates.inc.php b/assets/plugins/managermanager/functions/templates.inc.php index 97c281f3a2..1e0b283c97 100644 --- a/assets/plugins/managermanager/functions/templates.inc.php +++ b/assets/plugins/managermanager/functions/templates.inc.php @@ -14,7 +14,7 @@ function mm_hideTemplates($tplIds, $roles='', $templates='') { $tplIds = makeArray($tplIds); - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)) { $output = " // ----------- Hide templates -------------- \n"; diff --git a/assets/plugins/managermanager/mm.inc.php b/assets/plugins/managermanager/mm.inc.php index 09f7e85559..ea069f66af 100644 --- a/assets/plugins/managermanager/mm.inc.php +++ b/assets/plugins/managermanager/mm.inc.php @@ -1,28 +1,22 @@ Здесь вы можете отредактировать всё, что касается поисковой оптимизации.

    "); +mm_moveFieldsToTab("longtitle,description,ddkeywords,sitemap_changefreq,sitemap_priority", "seoTab", "!$editorsRole"); +//Для редакторов +mm_hideFields("longtitle,description", "$editorsRole"); + +?> \ No newline at end of file diff --git a/assets/plugins/managermanager/widgets/!template/!template.php b/assets/plugins/managermanager/widgets/!template/!template.php index 3c817a3182..3ba9e3095d 100644 --- a/assets/plugins/managermanager/widgets/!template/!template.php +++ b/assets/plugins/managermanager/widgets/!template/!template.php @@ -9,7 +9,7 @@ function mm_widget_template($fields, $other_param='defaultValue', $roles='', $te global $modx, $content, $mm_fields; $e = &$modx->Event; - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)) { // Your output should be stored in a string, which is outputted at the end // It will be inserted as a Javascript block (with jQuery), which is executed on document ready @@ -56,10 +56,9 @@ function mm_widget_template($fields, $other_param='defaultValue', $roles='', $te } + $e->output($output . "\n"); // Send the output to the browser } // end if - $e->output($output . "\n"); // Send the output to the browser - } ?> \ No newline at end of file diff --git a/assets/plugins/managermanager/widgets/accessdenied/accessdenied.php b/assets/plugins/managermanager/widgets/accessdenied/accessdenied.php index e668026edb..0c56bea8d0 100644 --- a/assets/plugins/managermanager/widgets/accessdenied/accessdenied.php +++ b/assets/plugins/managermanager/widgets/accessdenied/accessdenied.php @@ -13,7 +13,7 @@ function mm_widget_accessdenied($ids='', $message='', $roles='') { if (empty($message)) $message='Access deniedAccess to current document closed for security reasons.'; - if (useThisRule($roles)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles)) { $docid = (int)$_GET[id]; @@ -31,10 +31,9 @@ function mm_widget_accessdenied($ids='', $message='', $roles='') { $j("#aback").css({height: $j("body").height()} );'; } + $e->output($output . "\n"); // Send the output to the browser } // end if - $e->output($output . "\n"); // Send the output to the browser - } ?> diff --git a/assets/plugins/managermanager/widgets/colors/colors.php b/assets/plugins/managermanager/widgets/colors/colors.php index 3a2b0e942c..b66cef3b12 100644 --- a/assets/plugins/managermanager/widgets/colors/colors.php +++ b/assets/plugins/managermanager/widgets/colors/colors.php @@ -9,7 +9,7 @@ function mm_widget_colors($fields, $default='#ffffff', $roles='', $templates='') global $modx, $content, $mm_fields; $e = &$modx->Event; - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)) { $output = ''; diff --git a/assets/plugins/managermanager/widgets/tags/tags.php b/assets/plugins/managermanager/widgets/tags/tags.php index 3ce96e13f8..689d31229c 100644 --- a/assets/plugins/managermanager/widgets/tags/tags.php +++ b/assets/plugins/managermanager/widgets/tags/tags.php @@ -9,7 +9,7 @@ function mm_widget_tags($fields, $delimiter=',', $source='', $display_count=fals global $modx, $content, $mm_fields; $e = &$modx->Event; - if (useThisRule($roles, $templates)) { + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)){ $output = ''; @@ -95,7 +95,7 @@ function mm_widget_tags($fields, $delimiter=',', $source='', $display_count=fals $output .= 'var '.$tv_id.'_tags = new TagCompleter("'.$tv_id.'", "'.$tv_id.'_tagList", "'.$delimiter.'"); '; } + $e->output($output . "\n"); } - $e->output($output . "\n"); } ?> \ No newline at end of file From c56a4ef61e901e413da25d1a5ca46011dfeddda1 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 12:18:17 +0300 Subject: [PATCH 328/530] update mm step 3 --- .../widgets/ddautofolders/ddautofolders.php | 177 ++++++++++++++++ .../widgets/ddautofolders/index.html | 2 + .../ddautofolders/modx.ddtools.class.php | 154 ++++++++++++++ .../managermanager/widgets/ddgmap/ddgmap.php | 112 ++++++++++ .../managermanager/widgets/ddgmap/index.html | 2 + .../widgets/ddmaxlength/ddmaxlength.css | 13 ++ .../widgets/ddmaxlength/ddmaxlength.php | 95 +++++++++ .../widgets/ddmaxlength/index.html | 2 + .../ddmaxlength/jquery.ddmaxlength-1.0.min.js | 5 + .../ddsetfieldvalue/ddsetfieldvalue.php | 192 ++++++++++++++++++ .../widgets/ddsetfieldvalue/index.html | 2 + .../managermanager/widgets/ddymap/ddymap.php | 107 ++++++++++ .../managermanager/widgets/ddymap/index.html | 2 + 13 files changed, 865 insertions(+) create mode 100755 assets/plugins/managermanager/widgets/ddautofolders/ddautofolders.php create mode 100755 assets/plugins/managermanager/widgets/ddautofolders/index.html create mode 100755 assets/plugins/managermanager/widgets/ddautofolders/modx.ddtools.class.php create mode 100755 assets/plugins/managermanager/widgets/ddgmap/ddgmap.php create mode 100755 assets/plugins/managermanager/widgets/ddgmap/index.html create mode 100755 assets/plugins/managermanager/widgets/ddmaxlength/ddmaxlength.css create mode 100755 assets/plugins/managermanager/widgets/ddmaxlength/ddmaxlength.php create mode 100755 assets/plugins/managermanager/widgets/ddmaxlength/index.html create mode 100755 assets/plugins/managermanager/widgets/ddmaxlength/jquery.ddmaxlength-1.0.min.js create mode 100755 assets/plugins/managermanager/widgets/ddsetfieldvalue/ddsetfieldvalue.php create mode 100755 assets/plugins/managermanager/widgets/ddsetfieldvalue/index.html create mode 100755 assets/plugins/managermanager/widgets/ddymap/ddymap.php create mode 100755 assets/plugins/managermanager/widgets/ddymap/index.html diff --git a/assets/plugins/managermanager/widgets/ddautofolders/ddautofolders.php b/assets/plugins/managermanager/widgets/ddautofolders/ddautofolders.php new file mode 100755 index 0000000000..32478fff1d --- /dev/null +++ b/assets/plugins/managermanager/widgets/ddautofolders/ddautofolders.php @@ -0,0 +1,177 @@ +Event; + + //$ddParent is required + if (is_numeric($ddParent) && $e->name == 'OnBeforeDocFormSave' && useThisRule($ddRoles, $ddTemplates)){ + $base_path = $modx->config['base_path']; + $widgetDir = $base_path.'assets/plugins/managermanager/widgets/ddautofolders/'; + + //Подключаем библиотеку ddTools + require_once $widgetDir.'modx.ddtools.class.php'; + + //Текущее правило + $rule = array(); + + //Дата + $ddDate = array(); + + //Если задано, откуда брать дату и это не дата публикации, пытаемся найти в tv`шках + if ($ddDateSource && $ddDateSource != 'pub_date'){ + //Получаем tv с датой для данного шаблона + $dateTv = tplUseTvs($template, $ddDateSource); + + //Если tv удалось получить, такая tv есть и есть её значение + if ($dateTv && $dateTv[0]['id'] && $tmplvars[$dateTv[0]['id']] && $tmplvars[$dateTv[0]['id']][1]){ + //Если дата в юникс-времени + if (is_numeric($tmplvars[$dateTv[0]['id']][1])){ + $ddDate['date'] = $tmplvars[$dateTv[0]['id']][1]; + }else{ + //Пытаемся преобразовать в unix-время + $ddDate['date'] = strtotime($tmplvars[$dateTv[0]['id']][1]); + } + //Пытаемся преобразовать в unix-время + if (!is_numeric($tmplvars[$dateTv[0]['id']][1])) $ddDate['date'] = strtotime($tmplvars[$dateTv[0]['id']][1]); + } + }else{ + $ddDate['date'] = $pub_date; + } + + //Если не задана дата, выбрасываем + if (!$ddDate['date']) return; + + //Псевдонимы родителей (какие должны быть) + //Год в формате 4 цифры + $ddDate['y'] = date('Y', $ddDate['date']); + //Название месяца на английском + $ddDate['m'] = strtolower(date('F', $ddDate['date'])); + //Порядковый номер месяца + $ddDate['n'] = date('n', $ddDate['date']); + + //Если язык админки — русский + if (strtolower($modx_lang_attribute) == 'ru'){ + //Все месяцы на русском + $ruMonthes = array('Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'); + + //Название месяца на русском + $ddDate['mTitle'] = $ruMonthes[$ddDate['n'] - 1]; + }else{ + //Просто запишем на английском + $ddDate['mTitle'] = date('F', $ddDate['date']); + } + + //Получаем список групп документов, к которым принадлежит текущий документ (пригодится при создании годов и месяцев) + $docGroups = preg_replace('/,\d*/', '', $document_groups); + + //Получаем псевдоним корневого родителя + $ultimateAlias = ''; + //Если корневой родитель не в корне, допишем путь к нему + if ($modx->aliasListing[$ddParent]['path'] != '') $ultimateAlias .= $modx->aliasListing[$ddParent]['path'].'/'; + $ultimateAlias .= $modx->aliasListing[$ddParent]['alias']; + + //Получаем годы (непосредственных детей корневого родителя) + $years = $modx->getChildIds($ddParent, 1); + + //Получаем id нужного нам года + $yearId = $years[$ultimateAlias.'/'.$ddDate['y']]; + + //Если нужный год существует + if ($yearId){ + //Проставим году нужные параметры + ddTools::udateDocument($yearId, array( + 'isfolder' => 1, + 'template' => $ddYearTpl, + 'published' => $ddYearPub + )); + //Получаем месяцы (непосредственных детей текущего года) + $months = $modx->getChildIds($yearId, 1); + //Получаем id нужного нам месяца + $monthId = $months[$ultimateAlias.'/'.$ddDate['y'].'/'.$ddDate['m']]; + //Если нужный год не существует + }else{ + //Создадим его + $yearId = ddTools::createDocument(array( + 'pagetitle' => $ddDate['y'], + 'alias' => $ddDate['y'], + 'parent' => $ddParent, + 'isfolder' => 1, + 'template' => $ddYearTpl, + //Года запихиваем тупо в самый конец +// 'menuindex' => count($years), + //Да пусть будут тупо по году, сортироваться нормально зато будут + 'menuindex' => $ddDate['y'] - 2000, + 'published' => $ddYearPub + ), $docGroups); + } + +// if (!$monthId && $yearId){ + //Если нужный месяц существует + if ($monthId){ + //Проставим месяцу нужные параметры + ddTools::udateDocument($monthId, array( + 'isfolder' => 1, + 'template' => $ddMonthTpl, + 'published' => $ddMonthPub + )); + //Если нужный месяц не существует (на всякий случай проверим ещё и год) + }else if($yearId){ + $monthId = ddTools::createDocument(array( + 'pagetitle' => $ddDate['mTitle'], + 'alias' => $ddDate['m'], + 'parent' => $yearId, + 'isfolder' => 1, + 'template' => $ddMonthTpl, + //Для месяца выставляем menuindex в соответствии с его порядковым номером + 'menuindex' => $ddDate['n'] - 1, + 'published' => $ddMonthPub + ), $docGroups); + } + + //Ещё раз на всякий случай проверим, что с месяцем всё хорошо + if ($monthId && $monthId != $parent) $parent = $monthId; + } +} +?> \ No newline at end of file diff --git a/assets/plugins/managermanager/widgets/ddautofolders/index.html b/assets/plugins/managermanager/widgets/ddautofolders/index.html new file mode 100755 index 0000000000..cfb7d0fe18 --- /dev/null +++ b/assets/plugins/managermanager/widgets/ddautofolders/index.html @@ -0,0 +1,2 @@ +

    Unauthorized access

    +You're not allowed to access file folder \ No newline at end of file diff --git a/assets/plugins/managermanager/widgets/ddautofolders/modx.ddtools.class.php b/assets/plugins/managermanager/widgets/ddautofolders/modx.ddtools.class.php new file mode 100755 index 0000000000..c6b3e3798b --- /dev/null +++ b/assets/plugins/managermanager/widgets/ddautofolders/modx.ddtools.class.php @@ -0,0 +1,154 @@ +db->insert($fields, $modx->getFullTableName('site_content')); + + //Если заданы группы (и на всякий проверим ID) + if ($groups && $id){ + //Перебираем все группы + foreach ($groups as $gr){ + $modx->db->insert(array('document_group' => $gr, 'document' => $id), $modx->getFullTableName('document_groups')); + } + } + + return $id; + } + + /** + * udateDocument + * @version 1.0 (2012-02-13) + * + * Обновляет информацию по документу. + * + * @desc $id и/или $where должны быть переданы + * + * @param $id {integer} - ID документа, который необхоидмо отредактировать. + * @param $update {array} - Ассоциативный массив значений полей документа (в таблице `site_content`). + * @param $where {string} - SQL условие WHERE. + * + * @return {mixed} - ID отредактированного документа или false, если что-то не так. + */ + public static function udateDocument($id = 0, $update = array(), $where = ''){ + global $modx; + + //Формируем WHERE для SQL + $where = (($id != 0) ? "`id`='$id'" : "") . (($id != 0 && $where != '') ? " OR " : "") . $where; + + //Обновляем информацию по документу, получаем id, если что-то пошло не так, выкидываем + return $modx->db->update($update, $modx->getFullTableName('site_content'), $where); + } + + /** + * generateString + * @version 1.0 (2012-02-13) + * + * Генерация строки заданного размера. + * + * @param $length {integer} - Размер строки на выходе. + * @param $chars {string} - Символы для генерации. + * + * @return {string} + */ + public static function generateString($length = 8, $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789'){ + $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789'; + $numChars = strlen($chars); + $string = ''; + for ($i = 0; $i < $length; $i++){ + $string .= substr($chars, rand(1, $numChars) - 1, 1); + } + + return $string; + } + + /** + * parseText + * @version 1.0 (2012-02-13) + * + * Аналог модексовского parseChunk, только принимает текст. + * + * @param $chunk {string} - Строка, которую нужно парсить. + * @param $chunkArr {array} - Ассоциативный массив значений. + * @param $prefix {string} - Префикс плэйсхолдеров. + * @param $suffix {string} - Суффикс плэйсхолдеров. + * + * @return {string} + */ + public static function parseText($chunk, $chunkArr, $prefix= '[+', $suffix= '+]'){ + global $modx; + + //Если значения для парсинга не переданы, ничего не делаем + if (!is_array($chunkArr)){ + return $chunk; + } + + //TODO: Возможно, стоит убрать в одельный параметр + $chunk = $modx->mergeDocumentContent($chunk); + $chunk = $modx->mergeSettingsContent($chunk); + $chunk = $modx->mergeChunkContent($chunk); + + foreach ($chunkArr as $key => $value) { + $chunk = str_replace($prefix.$key.$suffix, $value, $chunk); + } + + return $chunk; + } + + /** + * parseSourse + * @version 1.0 (2012-02-13) + * + * Парсит ресурс. + * + * @param $sourse {string} + * + * @return {string} + */ + public static function parseSourse($sourse){ + global $modx; + + return $modx->rewriteUrls($modx->parseDocumentSource($sourse)); + } +} +} + +?> \ No newline at end of file diff --git a/assets/plugins/managermanager/widgets/ddgmap/ddgmap.php b/assets/plugins/managermanager/widgets/ddgmap/ddgmap.php new file mode 100755 index 0000000000..28355a9b8e --- /dev/null +++ b/assets/plugins/managermanager/widgets/ddgmap/ddgmap.php @@ -0,0 +1,112 @@ +Event; + + if ($e->name == 'OnDocFormRender' && useThisRule($roles, $templates)){ + + // Your output should be stored in a string, which is outputted at the end + // It will be inserted as a Javascript block (with jQuery), which is executed on document ready + $output = ''; + + // if we've been supplied with a string, convert it into an array + $tvs = makeArray($tvs); + + // You might want to check whether the current page's template uses the TVs that have been + // supplied, to save processing page which don't contain them + + // Which template is this page using? + if (isset($content['template'])) { + $page_template = $content['template']; + } else { + // If no content is set, it's likely we're adding a new page at top level. + // So use the site default template. This may need some work as it might interfere with a default template set by MM? + $page_template = $modx->config['default_template']; + } + + $tvs = tplUseTvs($content['template'], $tvs); + if ($tvs == false) { + return; + } + + + $style = 'width: '.$w.'px; height: '.$h.'px; position: relative; border: 1px solid #c3c3c3;'; + // We always put a JS comment, which makes debugging much easier + $output .= "// -------------- mm_ddGMap :: Begin ------------- \n"; + + // We have functions to include JS or CSS external files you might need + // The standard ModX API methods don't work here + //$output .= includeJs('http://maps.google.com/maps/api/js?sensor=false'); + + // Do something for each of the fields supplied + foreach ($tvs as $tv) { + // If it's a TV, we may need to map the field name, to what it's ID is. + // This can be obtained from the mm_fields array + $tv_id = 'tv'.$tv['id']; + $output .= ' +var coordinatesField = $j("#'.$tv_id.'");//TV с координатами +var ddLatLng = coordinatesField.val();//Координаты +//Скрываем поле, запоминаем название поля +var sectionName = coordinatesField.parents("tr:first").hide().find(".warning").text(); +coordinatesField.parents("tr:first").prev("tr").hide(); +//Контейнер для карты +var sectionConteiner = $j("
    "+sectionName+"
    "); +//Добавляем контейнер +coordinatesField.parents(".tab-page:first").append(sectionConteiner); +//Если координаты не заданны, то задаём дефолт +if(ddLatLng == "") ddLatLng = "55.19396010947335,61.3670539855957"; +ddLatLng = ddLatLng.split(","); + +//Callback функция для GM +window.ddgminitialize = function(){ + var GM = google.maps; + var myOptions = { + zoom: 15, + center: new GM.LatLng(ddLatLng[0],ddLatLng[1]), + mapTypeId: GM.MapTypeId.ROADMAP, + streetViewControl: false, + scrollwheel: false + }; + var map = new GM.Map(sectionConteiner.find(".ddGMap").get(0), myOptions); + //Добавляем маркер на карту + var GMMarker = new GM.Marker({ + position: new GM.LatLng(ddLatLng[0],ddLatLng[1]), + map: map, + draggable: true + }); + //При перетаскивании маркера + GM.event.addListener(GMMarker, "drag", function(event){ + var position = event.latLng;//Координаты + coordinatesField.val(position.lat() + "," + position.lng());//Сохраняем значение в поле + }); + //При клике на карте + GM.event.addListener(map, "click", function(event){ + var position = event.latLng;//Новые координаты + GMMarker.setPosition(position);//Меняем позицию маркера + map.setCenter(position);//Центрируем карту на маркере + coordinatesField.val(position.lat() + "," + position.lng());//Сохраняем значение в поле + }); +}; +//Подключаем карту, вызываем callback функцию +$j(window).on("load.ddEvents", function(){ + $j("body").append(" diff --git a/manager/actions/import_site.static.php b/manager/actions/import_site.static.php index 0df088c681..8162f4bcdc 100644 --- a/manager/actions/import_site.static.php +++ b/manager/actions/import_site.static.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('import_static')) { $e->setError(3); $e->dumpError(); diff --git a/manager/actions/logging.static.php b/manager/actions/logging.static.php index bdcdd1385f..ca015550b2 100644 --- a/manager/actions/logging.static.php +++ b/manager/actions/logging.static.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('logs')) { $e->setError(3); $e->dumpError(); diff --git a/manager/actions/manage_metatags.dynamic.php b/manager/actions/manage_metatags.dynamic.php index 94b8f06efb..82801948c4 100644 --- a/manager/actions/manage_metatags.dynamic.php +++ b/manager/actions/manage_metatags.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('manage_metatags')) { $e->setError(3); $e->dumpError(); diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php index 4608e530b7..4ba221852f 100644 --- a/manager/actions/messages.static.php +++ b/manager/actions/messages.static.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('messages')) { $e->setError(3); $e->dumpError(); diff --git a/manager/actions/modules.static.php b/manager/actions/modules.static.php index d0ca3a1ace..f487e75345 100644 --- a/manager/actions/modules.static.php +++ b/manager/actions/modules.static.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!($modx->hasPermission('new_module')||$modx->hasPermission('edit_module')||$modx->hasPermission('exec_module'))) { $e->setError(3); diff --git a/manager/actions/move_document.dynamic.php b/manager/actions/move_document.dynamic.php index 30a7ed11b3..71eeb5d16d 100644 --- a/manager/actions/move_document.dynamic.php +++ b/manager/actions/move_document.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('save_document')) { $e->setError(3); $e->dumpError(); diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index 9dd4500be9..808370af13 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly.'); +if (IN_MANAGER_MODE != 'true') die('INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly.'); /********************/ $sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC'; diff --git a/manager/actions/mutate_htmlsnippet.dynamic.php b/manager/actions/mutate_htmlsnippet.dynamic.php index 98bdd019ec..23dc1f1388 100644 --- a/manager/actions/mutate_htmlsnippet.dynamic.php +++ b/manager/actions/mutate_htmlsnippet.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != 'true') die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); switch ((int) $_REQUEST['a']) { case 78: diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index a61107019a..9a52e6909e 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly.'); +if(IN_MANAGER_MODE!='true') die('INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly.'); switch ((int) $_REQUEST['a']) { case 107: diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php index f1cabeffcb..3f04d30dca 100644 --- a/manager/actions/mutate_module_resources.dynamic.php +++ b/manager/actions/mutate_module_resources.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != 'true') die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if (!$modx->hasPermission('edit_module')) { $e->setError(3); diff --git a/manager/actions/mutate_password.dynamic.php b/manager/actions/mutate_password.dynamic.php index ed98092bb5..f5f762e54f 100644 --- a/manager/actions/mutate_password.dynamic.php +++ b/manager/actions/mutate_password.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE != 'true') die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('change_password')) { $e->setError(3); diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php index 584be80334..cf4bbc10ca 100644 --- a/manager/actions/mutate_plugin.dynamic.php +++ b/manager/actions/mutate_plugin.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); switch((int) $_REQUEST['a']) { case 102: diff --git a/manager/actions/mutate_plugin_priority.dynamic.php b/manager/actions/mutate_plugin_priority.dynamic.php index c868b63345..31266a58d8 100644 --- a/manager/actions/mutate_plugin_priority.dynamic.php +++ b/manager/actions/mutate_plugin_priority.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('save_plugin')) { $e->setError(3); $e->dumpError(); diff --git a/manager/actions/mutate_role.dynamic.php b/manager/actions/mutate_role.dynamic.php index 77f6ff741c..6f385cc424 100644 --- a/manager/actions/mutate_role.dynamic.php +++ b/manager/actions/mutate_role.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); switch((int) $_REQUEST['a']) { diff --git a/manager/actions/mutate_settings.dynamic.php b/manager/actions/mutate_settings.dynamic.php index 03b314c13b..6f4103aee7 100644 --- a/manager/actions/mutate_settings.dynamic.php +++ b/manager/actions/mutate_settings.dynamic.php @@ -1,5 +1,5 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); +if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

    Please use the MODX Content Manager instead of accessing this file directly."); if(!$modx->hasPermission('settings')) { $e->setError(3); $e->dumpError(); From e6f01265121b97dde080ddf6d6b42a74f9df9742 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 19:04:44 +0900 Subject: [PATCH 344/530] Use new mail function (send webuser password) --- .../processors/save_web_user.processor.php | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/manager/processors/save_web_user.processor.php b/manager/processors/save_web_user.processor.php index 825e2c7f49..31f267cd8b 100755 --- a/manager/processors/save_web_user.processor.php +++ b/manager/processors/save_web_user.processor.php @@ -405,7 +405,7 @@ function save_user_quoted_printable($string) { // Send an email to the user function sendMailMessage($email, $uid, $pwd, $ufn) { - global $websignupemail_message; + global $modx,$_lang,$websignupemail_message; global $emailsubject, $emailsender; global $site_name, $site_start, $site_url; $message = sprintf($websignupemail_message, $uid, $pwd); // use old method @@ -418,22 +418,14 @@ function sendMailMessage($email, $uid, $pwd, $ufn) { $message = str_replace("[+semail+]", $emailsender, $message); $message = str_replace("[+surl+]", $site_url, $message); - $headers = "From: " . $emailsender . "\r\n"; - $headers .= "X-Mailer: Content Manager - PHP/" . phpversion(); - $headers .= "\r\n"; - $headers .= "MIME-Version: 1.0\r\n"; - $headers .= "Content-Type: text/plain; charset=utf-8\r\n"; - $headers .= "Content-Transfer-Encoding: quoted-printable\r\n"; - $subject = "=?UTF-8?Q?".$emailsubject."?="; - $message = save_user_quoted_printable($message); - - if (ini_get('safe_mode') == FALSE) { - if (!mail($email, $subject, $message, $headers, "-f $emailsender")) { - webAlert("$email - {$_lang['error_sending_email']}"); - exit; - } - } elseif (!mail($email, $subject, $message, $headers)) { - webAlert("$email - {$_lang['error_sending_email']}"); + $param = array(); + $param['from'] = "{$site_name}<{$emailsender}>"; + $param['subject'] = $emailsubject; + $param['body'] = $message; + $param['to'] = $email; + $rs = $modx->sendmail($param); + if (!$rs) { + webAlert("{$email} - {$_lang['error_sending_email']}"); exit; } } From fa02b6e927f744b13620a92e26f56bfc5bf53013 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 13:10:28 +0300 Subject: [PATCH 345/530] fix html --- manager/actions/eventlog.dynamic.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manager/actions/eventlog.dynamic.php b/manager/actions/eventlog.dynamic.php index c7adf6052c..864e484674 100644 --- a/manager/actions/eventlog.dynamic.php +++ b/manager/actions/eventlog.dynamic.php @@ -98,7 +98,7 @@ function menuAction(a) {

    - +
    " align="absmiddle" /> @@ -114,7 +114,6 @@ function menuAction(a) {
    -
    Date: Mon, 26 Aug 2013 13:15:22 +0300 Subject: [PATCH 346/530] fix html in eventlog --- manager/actions/eventlog.dynamic.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manager/actions/eventlog.dynamic.php b/manager/actions/eventlog.dynamic.php index 864e484674..59bea3073f 100644 --- a/manager/actions/eventlog.dynamic.php +++ b/manager/actions/eventlog.dynamic.php @@ -100,14 +100,14 @@ function menuAction(a) {
    - + From 9eee4828aadb696ddf962bebfd8d333b75e06bd0 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 13:16:16 +0300 Subject: [PATCH 347/530] fix html in user_management --- manager/actions/user_management.static.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manager/actions/user_management.static.php b/manager/actions/user_management.static.php index 0b557354f1..486efcb086 100644 --- a/manager/actions/user_management.static.php +++ b/manager/actions/user_management.static.php @@ -94,12 +94,12 @@ function menuAction(a) {
    " align="absmiddle" /> " /> - - - + + +
    - + From 9c7e40cc5c081ccf3a8ea9471511f1bf30fc3497 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 13:17:37 +0300 Subject: [PATCH 348/530] fix html in web_user_management --- manager/actions/web_user_management.static.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manager/actions/web_user_management.static.php b/manager/actions/web_user_management.static.php index 63ee64301c..6258f255d7 100644 --- a/manager/actions/web_user_management.static.php +++ b/manager/actions/web_user_management.static.php @@ -93,12 +93,12 @@ function menuAction(a) {
    " /> " /> - - - + + +
    " onclick="searchResource();return false;">" onclick="resetSearch();return false;">images/icons/refresh.gif" width="16" height="16"/>" onclick="changeListMode();return false;">images/icons/table.gif" width="16" height="16"/>" onclick="searchResource();return false;">" onclick="resetSearch();return false;">images/icons/refresh.gif" width="16" height="16"/>" onclick="changeListMode();return false;">images/icons/table.gif" width="16" height="16"/>
    - + From 7f0a0e2b56d6b8ac4ed47783ce8c100c97b00479 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 13:56:56 +0300 Subject: [PATCH 349/530] add htaccess in images --- assets/cache/images/.htaccess | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 assets/cache/images/.htaccess diff --git a/assets/cache/images/.htaccess b/assets/cache/images/.htaccess new file mode 100644 index 0000000000..8f91d28b69 --- /dev/null +++ b/assets/cache/images/.htaccess @@ -0,0 +1,2 @@ +order deny,allow +allow from all \ No newline at end of file From b315c2ad3fd8cd991f91d824adeb9c9b0960c8e3 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 14:04:30 +0300 Subject: [PATCH 350/530] user send messages by modx->sendmail --- manager/processors/save_user.processor.php | 26 ++++++++-------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/manager/processors/save_user.processor.php b/manager/processors/save_user.processor.php index 991b098ccf..918c8f0a8b 100755 --- a/manager/processors/save_user.processor.php +++ b/manager/processors/save_user.processor.php @@ -468,7 +468,7 @@ function save_user_quoted_printable($string) { // Send an email to the user function sendMailMessage($email, $uid, $pwd, $ufn) { - global $signupemail_message; + global $modx,$_lang,$signupemail_message; global $emailsubject, $emailsender; global $site_name, $site_start, $site_url; $manager_url = MODX_MANAGER_URL; @@ -482,22 +482,14 @@ function sendMailMessage($email, $uid, $pwd, $ufn) { $message = str_replace("[+semail+]", $emailsender, $message); $message = str_replace("[+surl+]", $manager_url, $message); - $headers = "From: " . $emailsender . "\r\n"; - $headers .= "X-Mailer: Content Manager - PHP/" . phpversion(); - $headers .= "\r\n"; - $headers .= "MIME-Version: 1.0\r\n"; - $headers .= "Content-Type: text/plain; charset=utf-8\r\n"; - $headers .= "Content-Transfer-Encoding: quoted-printable\r\n"; - $subject = "=?UTF-8?Q?".$emailsubject."?="; - $message = save_user_quoted_printable($message); - - if (ini_get('safe_mode') == FALSE) { - if (!mail($email, $subject, $message, $headers, "-f $emailsender")) { - webAlert("$email - {$_lang['error_sending_email']}"); - exit; - } - } elseif (!mail($email, $subject, $message, $headers)) { - webAlert("$email - {$_lang['error_sending_email']}"); + $param = array(); + $param['from'] = "{$site_name}<{$emailsender}>"; + $param['subject'] = $emailsubject; + $param['body'] = $message; + $param['to'] = $email; + $rs = $modx->sendmail($param); + if (!$rs) { + webAlert("{$email} - {$_lang['error_sending_email']}"); exit; } } From a488ddbb08fc1fd70340e086c24167f5ffba5044 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 20:18:09 +0900 Subject: [PATCH 351/530] Refactor #10126 Rewrite Export Static HTML function http://tracker.modx.com/issues/10126 --- manager/actions/export_site.static.php | 324 +++--------------- .../includes/document.parser.class.inc.php | 10 +- .../includes/extenders/export.class.inc.php | 271 +++++++++++++++ manager/includes/lang/english.inc.php | 11 +- manager/processors/export_site.processor.php | 58 ++++ 5 files changed, 401 insertions(+), 273 deletions(-) create mode 100644 manager/includes/extenders/export.class.inc.php create mode 100644 manager/processors/export_site.processor.php diff --git a/manager/actions/export_site.static.php b/manager/actions/export_site.static.php index 4253931b55..d6403ce1c3 100644 --- a/manager/actions/export_site.static.php +++ b/manager/actions/export_site.static.php @@ -1,313 +1,95 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); -if(!$modx->hasPermission('export_static')) { +if(!$modx->hasPermission('export_static')) +{ $e->setError(3); $e->dumpError(); } // figure out the base of the server, so we know where to get the documents in order to export them -$base = MODX_SITE_URL; +?> +

    -?> +
    + +
    + -

    -
    +
    +
    +

    + + '.$_lang['export_site_message'].'

    '; +if(isset($_POST['export'])) +{ + $rs = include_once($modx->config['base_path'] . 'manager/processors/export_site.processor.php'); + echo $rs; +} +else +{ ?> -
    -
    " /> " /> - - - + + +
    " onclick="searchResource();return false;">" onclick="resetSearch();return false;">images/icons/refresh.gif" width="16" height="16"/>" onclick="changeListMode();return false;">images/icons/table.gif" width="16" height="16"/>" onclick="searchResource();return false;">" onclick="resetSearch();return false;">images/icons/refresh.gif" width="16" height="16"/>" onclick="changeListMode();return false;">images/icons/table.gif" width="16" height="16"/>
    + +
    + + + + - - - + + - - - + + - - - + + - - +
    +
     
    -
     
     
     
    - +
    - -
    -
    '.$_lang["export_site_failed"]." ".$_lang["export_site_failed_no_open_filepath"].'

    '; - return FALSE; - } else { - // Write $somecontent to our opened file. - if(fwrite($handle, $somecontent) === FALSE) { - echo '

    '.$_lang["export_site_failed"]." ".$_lang["export_site_failed_no_write"].'

    '; - return FALSE; - } - fclose($handle); - echo '

    '.$_lang["export_site_success"].'

    '; - } - } else { - echo '

    '.$_lang["export_site_failed"]." ".$_lang["export_site_failed_no_retrieve"].'

    '; -// return FALSE; - } - return TRUE; - } - - function getPageName($docid, $alias, $prefix, $suffix) { - if(empty($alias)) { - $filename = $prefix.$docid.$suffix; - } else { - $pa = pathinfo($alias); // get path info array - $tsuffix = !empty($pa['extension']) ? '':$suffix; - $filename = $prefix.$alias.$tsuffix; - } - return $filename; - } - - function scanDirectory($path, $files) { - // if the path has a slash at the end, remove it - if(substr($path, -1) == '/') { - $path = substr($path, 0, -1); - } - // if the path is not valid or is not a directory ... - if(!file_exists($path) || !is_dir($path)) { - return FALSE; - } elseif(!is_readable($path)) { - return FALSE; - } else { - $dh = opendir($path); - while (FALSE !== ($filename = @readdir($dh))) { - if($filename != '.' && $filename != '..' && substr($filename, 1) != '.') { - if (!in_array($filename, $files)) { - $file = $path."/".$filename; - if (is_dir($file)) { - removeDirectoryAll($file); - } else { - @unlink($file); - } - } - } - } - closedir($dh); - return TRUE; - } - } - - function exportDir($dirid, $dirpath, &$i) { - global $_lang; - global $base; - global $modx; - global $limit; - global $dbase; - global $table_prefix; - global $sqlcond; - - $sql = "SELECT id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, editedon FROM $dbase.`".$table_prefix."site_content` WHERE $dbname.`".$table_prefix."site_content`.parent = ".$dirid." AND ".$sqlcond; - $rs = $modx->db->query($sql); - $dircontent = array(); - while($row = $modx->db->getRow($rs)) { - if (!$row['wasNull']) { // needs writing a document - $docname = getPageName($row['id'], $row['alias'], $modx->config['friendly_url_prefix'], $suffix = $modx->config['friendly_url_suffix']); - printf($_lang['export_site_exporting_document'], $i++, $limit, $row['pagetitle'], $row['id']); - $filename = $dirpath.$docname; - if (is_dir($filename)) { - removeDirectoryAll($filename); - } - if (!file_exists($filename) || (filemtime($filename) < $row['editedon'])) { - if (!writeAPage($base, $row['id'], $filename)) exit; - } else { - echo '

    '.$_lang['export_site_success']." ".$_lang["export_site_success_skip_doc"].'

    '; - } - $dircontent[] = $docname; - } - if ($row['isfolder']) { // needs making a folder - $dirname = $dirpath.$row['alias']; - if (!is_dir($dirname)) { - if (file_exists($dirname)) @unlink($dirname); - mkdir($dirname); - if ($row['wasNull']) { - printf($_lang['export_site_exporting_document'], $i++, $limit, $row['pagetitle'], $row['id']); - echo '

    '.$_lang['export_site_success'].'

    '; - } - } else { - if ($row['wasNull']) { - printf($_lang['export_site_exporting_document'], $i++, $limit, $row['pagetitle'], $row['id']); - echo '

    '.$_lang['export_site_success'].$_lang["export_site_success_skip_dir"].'

    '; - } - } - exportDir($row['id'], $dirname."/", $i); - $dircontent[] = $row['alias']; - } - } - // remove No-MODx files/dirs - if (!scanDirectory($dirpath, $dircontent)) exit; -// print_r ($dircontent); - } - - if($modx->config['friendly_urls']==1 && $modx->config['use_alias_path']==1) { - $sqlcond = "$dbase.`".$table_prefix."site_content`.deleted=0 AND (($dbase.`".$table_prefix."site_content`.published=1 AND $dbase.`".$table_prefix."site_content`.type='document') OR ($dbase.`".$table_prefix."site_content`.isfolder=1)) $noncache"; - $sql = "SELECT count(*) as count1 FROM $dbase.`".$table_prefix."site_content` WHERE ".$sqlcond; - $rs = $modx->db->query($sql); - $row = $modx->db->getRow($rs,'num'); - $prefix = $modx->config['friendly_url_prefix']; - $suffix = $modx->config['friendly_url_suffix']; - $limit = $row[0]; - printf($_lang['export_site_numberdocs'], $limit); - $n = 1; - exportDir(0, $filepath, $n); - - } else { - // Modified for export alias path 2006/3/24 end - $sql = "SELECT id, alias, pagetitle FROM $dbase.`".$table_prefix."site_content` WHERE $dbase.`".$table_prefix."site_content`.deleted=0 AND $dbase.`".$table_prefix."site_content`.published=1 AND $dbase.`".$table_prefix."site_content`.type='document' $noncache"; - $rs = $modx->db->query($sql); - $limit = $modx->db->getRecordCount($rs); - printf($_lang['export_site_numberdocs'], $limit); - - for($i=0; $i<$limit; $i++) { - - $row=$modx->db->getRow($rs); - - $id = $row['id']; - printf($_lang['export_site_exporting_document'], $i, $limit, $row['pagetitle'], $id); - $alias = $row['alias']; - - if(empty($alias)) { - $filename = $prefix.$id.$suffix; - } else { - $pa = pathinfo($alias); // get path info array - $tsuffix = !empty($pa[extension]) ? '':$suffix; - $filename = $prefix.$alias.$tsuffix; - } - // get the file - if(@$handle = fopen("$base/index.php?id=$id", "r")) { - $buffer = ""; - while (!feof ($handle)) { - $buffer .= fgets($handle, 4096); - } - fclose ($handle); +} +?> - // save it - $filename = "$filepath$filename"; - $somecontent = $buffer; - if(!$handle = fopen($filename, 'w')) { - echo '

    '.$_lang["export_site_failed"]." ".$_lang["export_site_failed_no_open_filename"].'

    '; - exit; - } else { - // Write $somecontent to our opened file. - if(fwrite($handle, $somecontent) === FALSE) { - echo '

    '.$_lang["export_site_failed"]." ".$_lang["export_site_failed_no_writee"].'

    '; - exit; - } - fclose($handle); - echo '

    '.$_lang['export_site_success'].'

    '; - } - } else { - echo '

    '.$_lang["export_site_failed"]." ".$_lang["export_site_failed_no_retrieve"].'

    '; - } - } - } - $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $exportend = $mtime; - $totaltime = ($exportend - $exportstart); - printf ('

    '.$_lang["export_site_time"].'

    ', round($totaltime, 3)); -?> - +
    +
    +

    + \ No newline at end of file + echo '

    '.$_lang['export_site_message'].'

    '; +?> +
    +
    +
    diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index cd68426e9d..aee0060f16 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -117,8 +117,16 @@ function loadExtension($extname) { else return false; break; + case 'EXPORT_SITE' : + if(include_once(MODX_BASE_PATH . 'manager/includes/extenders/export.class.inc.php')) + { + $this->export= new EXPORT_SITE; + return true; + } + else return false; + break; case 'PHPCOMPAT' : - if(is_object($this->phpcompat)) return; + if(is_object($this->phpcompat)) return; include_once(MODX_BASE_PATH . 'manager/includes/extenders/phpcompat.class.inc.php'); $this->phpcompat = new PHPCOMPAT; break; diff --git a/manager/includes/extenders/export.class.inc.php b/manager/includes/extenders/export.class.inc.php new file mode 100644 index 0000000000..72c7b64d12 --- /dev/null +++ b/manager/includes/extenders/export.class.inc.php @@ -0,0 +1,271 @@ +exportstart = $this->get_mtime(); + $this->count = 0; + $this->setUrlMode(); + $this->dirCheckCount = 0; + $this->generate_mode = 'crawl'; + $this->targetDir = $modx->config['base_path'] . 'temp/export'; + if(!isset($this->total)) $this->getTotal(); + } + + function setExportDir($dir) + { + $dir = str_replace('\\','/',$dir); + $dir = rtrim($dir, '/'); + $this->targetDir = $dir; + } + + function get_mtime() + { + $mtime = microtime(); + $mtime = explode(' ', $mtime); + $mtime = $mtime[1] + $mtime[0]; + return $mtime; + } + + function setUrlMode() + { + global $modx; + + if($modx->config['friendly_urls']==0) + { + $modx->config['friendly_urls'] = 1; + $modx->config['use_alias_path'] = 1; + $modx->clearCache(); + } + $modx->config['make_folders'] = '1'; + } + + function getTotal($ignore_ids='', $noncache='0') + { + global $modx; + + if($ignore_ids !== '') + { + $ignore_ids = explode(',', $ignore_ids); + foreach($ignore_ids as $i=>$v) + { + $v = $modx->db->escape(trim($v)); + $ignore_ids[$i] = "'{$v}'"; + } + $ignore_ids = join(',', $ignore_ids); + $ignore_ids = "AND NOT id IN ({$ignore_ids})"; + } + + $this->ignore_ids = $ignore_ids; + + $noncache = $include_noncache==1 ? '' : 'AND cacheable=1'; + $where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}"; + $rs = $modx->db->select('count(id) as total','[+prefix+]site_content',$where); + $row = $modx->db->getRow($rs); + $this->total = $row['total']; + return $row['total']; + } + + function removeDirectoryAll($directory='') + { + if(empty($directory)) $directory = $this->targetDir; + $directory = rtrim($directory,'/'); + // if the path is not valid or is not a directory ... + if(empty($directory)) return false; + if(strpos($directory,MODX_BASE_PATH)===false) return FALSE; + + if(!is_dir($directory)) return FALSE; + elseif(!is_readable($directory)) return FALSE; + else + { + $files = glob($directory . '/*'); + if(!empty($files)) + { + foreach($files as $path) + { + if(is_dir($path)) $this->removeDirectoryAll($path); + else $rs = unlink($path); + } + } + } + if($directory !== $this->targetDir) $rs = rmdir($directory); + + return $rs; + } + + function makeFile($docid, $filepath) + { + global $modx,$_lang; + $file_permission = octdec($modx->config['new_file_permissions']); + if($this->generate_mode==='direct') + { + $back_lang = $_lang; + $src = $modx->executeParser($docid); + + $_lang = $back_lang; + } + else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}"); + + + if($src !== false) + { + if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src); + $result = file_put_contents($filepath,$src); + if($result!==false) @chmod($filepath, $file_permission); + + if($result !== false) return 'success'; + else return 'failed_no_write'; + } + else return 'no_retrieve'; + } + + function getFileName($docid, $alias='', $prefix, $suffix) + { + global $modx; + + if($alias==='') $filename = $prefix.$docid.$suffix; + else + { + if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false) + { + $suffix = ''; + } + $filename = $prefix.$alias.$suffix; + } + return $filename; + } + + function run($parent=0) + { + global $_lang; + global $modx; + $ignore_ids = $this->ignore_ids; + $dirpath = $this->targetDir . '/'; + + $prefix = $modx->config['friendly_url_prefix']; + $suffix = $modx->config['friendly_url_suffix']; + + $tpl = ' [+msg1+] [+msg2+]'; + $ph = array(); + + $ph['status'] = 'fail'; + $ph['msg1'] = $_lang['export_site_failed']; + $ph['msg2'] = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath; + $msg_failed_no_write = $this->parsePlaceholder($tpl,$ph); + + $ph['msg2'] = $_lang["export_site_failed_no_retrieve"]; + $msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph); + + $ph['status'] = 'success'; + $ph['msg1'] = $_lang['export_site_success']; + $ph['msg2'] = ''; + $msg_success = $this->parsePlaceholder($tpl,$ph); + + $ph['msg2'] = $_lang['export_site_success_skip_doc']; + $msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph); + + $ph['msg2'] = $_lang['export_site_success_skip_dir']; + $msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph); + + $fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published"; + $noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1'; + $where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}"; + $rs = $modx->db->select($fields,'[+prefix+]site_content',$where); + + $ph = array(); + $ph['total'] = $this->total; + $folder_permission = octdec($modx->config['new_folder_permissions']); + while($row = $modx->db->getRow($rs)) + { + $this->count++; + + $row['count'] = $this->count; + + if (!$row['wasNull']) + { // needs writing a document + $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix); + $filename = $dirpath.$docname; + if (!is_file($filename)) + { + if($row['published']==='1') + { + $status = $this->makeFile($row['id'], $filename); + switch($status) + { + case 'failed_no_write' : $row['status'] = $msg_failed_no_write ; + case 'failed_no_retrieve': $row['status'] = $msg_failed_no_retrieve; + default: $row['status'] = $msg_success; + } + } + else $row['status'] = $msg_failed_no_retrieve; + } + else $row['status'] = $msg_success_skip_doc; + $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row); + } + else + { + $row['status'] = $msg_success_skip_dir; + $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row); + } + if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false)) + { // needs making a folder + $end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id']; + $dir_path = $dirpath . $end_dir; + if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE; + if (!is_dir($dir_path)) + { + if (is_file($dir_path)) @unlink($dir_path); + mkdir($dir_path); + @chmod($dir_path, $folder_permission); + + } + + + if($modx->config['make_folders']==='1' && $row['published']==='1') + { + if(is_file($filename)) rename($filename,$dir_path . '/index.html'); + } + $this->targetDir = $dir_path; + $this->run($row['id']); + } + } + return join("\n", $this->output); + } + + function curl_get_contents($url, $timeout = 30 ) + { + if(!function_exists('curl_init')) return @file_get_contents($url); + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_HEADER, false); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true ); + curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); + $result = curl_exec($ch); + curl_close($ch); + return $result; + } + + function parsePlaceholder($tpl,$ph=array()) + { + foreach($ph as $k=>$v) + { + $k = "[+{$k}+]"; + $tpl = str_replace($k,$v,$tpl); + } + return $tpl; + } +} diff --git a/manager/includes/lang/english.inc.php b/manager/includes/lang/english.inc.php index 49ab485248..a7a538c645 100755 --- a/manager/includes/lang/english.inc.php +++ b/manager/includes/lang/english.inc.php @@ -278,7 +278,7 @@ $_lang["expand_tree"] = 'Expand Site Tree'; $_lang["export_site"] = 'Export Static HTML'; $_lang["export_site_cacheable"] = 'Include non-cacheable files:'; -$_lang["export_site_exporting_document"] = 'Exporting file %s of %s
          %s, id %s
          '; +$_lang["export_site_exporting_document"] = '[+status+] ([+count+]) index.php?id=[+id+] - [+pagetitle+]
    '; $_lang["export_site_failed"] = 'Failed!'; $_lang["export_site_failed_no_open"] = 'Cannot open file: '; $_lang["export_site_failed_no_retrieve"] = 'Cannot retrieve document.'; @@ -1202,3 +1202,12 @@ $_lang["user_street"] = 'Street'; $_lang["user_city"] = 'City'; $_lang["user_other"] = 'Other'; + +$_lang["a83_ignore_ids_title"] = 'Ignore IDs(comma separate)'; +$_lang["export_site.static.php1"] = 'Target'; +$_lang["export_site.static.php2"] = 'Only edited resources'; +$_lang["export_site.static.php3"] = 'All resources'; +$_lang["export_site.static.php4"] = 'Replace string (before)'; +$_lang["export_site.static.php5"] = 'Replace string (after)'; +$_lang["export_site.static.php6"] = 'Target'; +$_lang["export_site.static.php7"] = 'Files cannot be outputted to [+rb_base_url+]'; diff --git a/manager/processors/export_site.processor.php b/manager/processors/export_site.processor.php new file mode 100644 index 0000000000..62c8bfae99 --- /dev/null +++ b/manager/processors/export_site.processor.php @@ -0,0 +1,58 @@ +hasPermission('export_static')) +{ + $e->setError(3); + $e->dumpError(); +} + +$maxtime = (is_numeric($_POST['maxtime'])) ? $_POST['maxtime'] : 30; +@set_time_limit($maxtime); + +$modx->loadExtension('EXPORT_SITE'); + + +if(is_dir(MODX_BASE_PATH . 'temp')) $export_dir = MODX_BASE_PATH . 'temp/export'; +elseif(is_dir(MODX_BASE_PATH . 'assets')) $export_dir = MODX_BASE_PATH . 'assets/export'; +$modx->export->targetDir = $export_dir; + +if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path']))) + return $_lang['export_site.static.php6']; +elseif($modx->config['rb_base_dir'] === $export_dir . '/') + return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']); +elseif(!is_writable($export_dir)) + return $_lang['export_site_target_unwritable']; + +$modx->export->generate_mode = $_POST['generate_mode']; + +$modx->export->setExportDir($export_dir); +$modx->export->removeDirectoryAll($export_dir); + +$ignore_ids = $_POST['ignore_ids']; +$repl_before = $_POST['repl_before']; +$repl_after = $_POST['repl_after']; +$includenoncache = $_POST['includenoncache']; + +if($ignore_ids!==$_POST['ignore_ids'] + ||$includenoncache!==$_POST['includenoncache'] + ||$repl_before!==$_POST['repl_before'] + ||$repl_after !==$_POST['repl_after']) { + $modx->clearCache(); +} + +$total = $modx->export->getTotal($_POST['ignore_ids'], $modx->config['export_includenoncache']); + +$output = sprintf($_lang['export_site_numberdocs'], $total); +$modx->export->total = $total; + +$modx->export->repl_before = $_POST['repl_before']; +$modx->export->repl_after = $_POST['repl_after']; + +$output .= $modx->export->run(); + +$exportend = $modx->export->get_mtime(); +$totaltime = ($exportend - $modx->export->exportstart); +$output .= sprintf ('

    '.$_lang["export_site_time"].'

    ', round($totaltime, 3)); +return $output; + + From 987b5a14b4296e79dc70d38e9a4138f19855e69a Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 20:18:38 +0900 Subject: [PATCH 352/530] Backup manager - Fix result message box --- manager/actions/bkmanager.static.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/manager/actions/bkmanager.static.php b/manager/actions/bkmanager.static.php index 0a907b3973..e7444ab43e 100644 --- a/manager/actions/bkmanager.static.php +++ b/manager/actions/bkmanager.static.php @@ -151,15 +151,21 @@ switch($_SESSION['result_msg']) { case 'import_ok': - $ph['result_msg'] = '
    ' . $_lang["bkmgr_import_ok"] . '
    '; + $ph['result_msg_import'] = '
    ' . $_lang["bkmgr_import_ok"] . '
    '; + $ph['result_msg_snapshot'] = '
    ' . $_lang["bkmgr_import_ok"] . '
    '; break; case 'snapshot_ok': - $ph['result_msg'] = '
    ' . $_lang["bkmgr_snapshot_ok"] . '
    '; + $ph['result_msg_import'] = ''; + $ph['result_msg_snapshot'] = '
    ' . $_lang["bkmgr_snapshot_ok"] . '
    '; break; } $_SESSION['result_msg'] = ''; } -else $ph['result_msg'] = ''; +else +{ + $ph['result_msg_import'] = ''; + $ph['result_msg_snapshot'] = ''; +} ?> @@ -283,7 +289,7 @@ function backup(){

    - +
    @@ -379,7 +385,7 @@ function checked($cond)

    - + "snapshot_path={$modx->config['snapshot_path']}"));?> From d7c45b4d552ca71b4fc2c9718081e2f64abd09fd Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 20:45:05 +0900 Subject: [PATCH 353/530] Fix - Export function --- manager/includes/extenders/export.class.inc.php | 12 +++++++++++- manager/includes/lang/english.inc.php | 2 +- manager/processors/export_site.processor.php | 10 +++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/manager/includes/extenders/export.class.inc.php b/manager/includes/extenders/export.class.inc.php index 72c7b64d12..319171036e 100644 --- a/manager/includes/extenders/export.class.inc.php +++ b/manager/includes/extenders/export.class.inc.php @@ -48,7 +48,7 @@ function setUrlMode() { $modx->config['friendly_urls'] = 1; $modx->config['use_alias_path'] = 1; - $modx->clearCache(); + $this->clearCache(); } $modx->config['make_folders'] = '1'; } @@ -193,6 +193,7 @@ function run($parent=0) $this->count++; $row['count'] = $this->count; + $row['url'] = $modx->makeUrl($row['id']); if (!$row['wasNull']) { // needs writing a document @@ -268,4 +269,13 @@ function parsePlaceholder($tpl,$ph=array()) } return $tpl; } + + function clearCache() + { + include_once(MODX_BASE_PATH . 'manager/processors/cache_sync.class.processor.php'); + $sync = new synccache(); + $sync->setCachepath(MODX_BASE_PATH . 'assets/cache/'); + $sync->setReport(false); + $sync->emptyCache(); + } } diff --git a/manager/includes/lang/english.inc.php b/manager/includes/lang/english.inc.php index a7a538c645..6860051a0d 100755 --- a/manager/includes/lang/english.inc.php +++ b/manager/includes/lang/english.inc.php @@ -278,7 +278,7 @@ $_lang["expand_tree"] = 'Expand Site Tree'; $_lang["export_site"] = 'Export Static HTML'; $_lang["export_site_cacheable"] = 'Include non-cacheable files:'; -$_lang["export_site_exporting_document"] = '[+status+] ([+count+]) index.php?id=[+id+] - [+pagetitle+]
    '; +$_lang["export_site_exporting_document"] = '[+status+] [+url+] - [+pagetitle+] ([+id+])
    '; $_lang["export_site_failed"] = 'Failed!'; $_lang["export_site_failed_no_open"] = 'Cannot open file: '; $_lang["export_site_failed_no_retrieve"] = 'Cannot retrieve document.'; diff --git a/manager/processors/export_site.processor.php b/manager/processors/export_site.processor.php index 62c8bfae99..0cf1722c03 100644 --- a/manager/processors/export_site.processor.php +++ b/manager/processors/export_site.processor.php @@ -37,7 +37,7 @@ ||$includenoncache!==$_POST['includenoncache'] ||$repl_before!==$_POST['repl_before'] ||$repl_after !==$_POST['repl_after']) { - $modx->clearCache(); + clearCache(); } $total = $modx->export->getTotal($_POST['ignore_ids'], $modx->config['export_includenoncache']); @@ -56,3 +56,11 @@ return $output; +function clearCache() +{ + include_once(MODX_BASE_PATH . 'manager/processors/cache_sync.class.processor.php'); + $sync = new synccache(); + $sync->setCachepath(MODX_BASE_PATH . 'assets/cache/'); + $sync->setReport(false); + $sync->emptyCache(); +} From 653f00fe63c5fdd17a84dd70a06d2a67fd3053ec Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 20:47:17 +0900 Subject: [PATCH 354/530] Refactor #10127 Rewrite Import HTML site function http://tracker.modx.com/issues/10127 --- manager/actions/import_site.static.php | 538 ++++++++++++++++++------- manager/includes/lang/english.inc.php | 6 + 2 files changed, 408 insertions(+), 136 deletions(-) diff --git a/manager/actions/import_site.static.php b/manager/actions/import_site.static.php index 0df088c681..01d584c771 100644 --- a/manager/actions/import_site.static.php +++ b/manager/actions/import_site.static.php @@ -1,13 +1,13 @@ INCLUDE_ORDERING_ERROR

    Please use the MODx Content Manager instead of accessing this file directly."); -if(!$modx->hasPermission('import_static')) { +if(!$modx->hasPermission('import_static')) +{ $e->setError(3); $e->dumpError(); } // Files to upload $allowedfiles = array('html','htm','shtml','xml'); - ?>

    + +
    + +
    +
    ".$_lang['import_site_message']."

    "; ?> -
    +
    @@ -43,165 +50,424 @@ function reloadTree() { 0 () - +  
    - + + + + + +   + +
    + + + + + +   + + + +
    -
    0) { - importFiles($parent,$filepath,$files); - } - - $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $importend = $mtime; - $totaltime = ($importend - $importstart); - printf ("

    ".$_lang['import_site_time']."

    ", round($totaltime, 3)); +} +else +{ + run(); + clearCache(); ?> +
    +
    -function importFiles($parent,$filepath,$files) { +getFullTableName('site_content'); + $modx->db->delete('[+prefix+]site_content'); + $modx->db->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1"); + } + + $parent = intval($_POST['parent']); + + if(is_dir(MODX_BASE_PATH . 'temp/import')) $filedir = MODX_BASE_PATH . 'temp/import/'; + elseif(is_dir(MODX_BASE_PATH . 'assets/import')) $filedir = MODX_BASE_PATH . 'assets/import/'; + + $filesfound = 0; + + $files = getFiles($filedir); + $files = pop_index($files); + + // no. of files to import + $output .= sprintf('

    ' . $_lang['import_files_found'] . '

    ', $filesfound); + + // import files + if(0 < count($files)) + { + $rs = $modx->db->update(array('isfolder'=>1),'[+prefix+]site_content',"id={$parent}"); + importFiles($parent,$filedir,$files,'root'); + } + + $mtime = microtime(); $mtime = explode(' ', $mtime); $mtime = $mtime[1] + $mtime[0]; + $importend = $mtime; + $totaltime = ($importend - $importstart); + $output .= sprintf ('

    '.$_lang['import_site_time'].'

    ', round($totaltime, 3)); + + if($_POST['convert_link']=='on') convertLink(); + + return $output; +} +function importFiles($parent,$filedir,$files,$mode) { global $modx; global $_lang, $allowedfiles; - global $dbase, $table_prefix; - global $default_template, $search_default, $cache_default, $publish_default; - - + global $search_default, $cache_default, $publish_default; + $createdon = time(); $createdby = $modx->getLoginUserID(); if (!is_array($files)) return; - foreach($files as $id => $value){ - if(is_array($value)) { - // create folder - $alias = !isset($modx->documentListing[$id]) ? $id:$id.'-'.substr(uniqid(''),-3); - $modx->documentListing[$alias] = true; - printf("

    ".$_lang['import_site_importing_document']."

    ", $id); - $sql = "INSERT INTO $dbase.`".$table_prefix."site_content` - (type, contentType, pagetitle, alias, published, parent, isfolder, content, template, menuindex, searchable, cacheable, createdby, createdon) VALUES - ('document', 'text/html', '".$modx->db->escape($id)."', '".$modx->stripAlias($alias)."', ".$publish_default.", '$parent', 1, '', '".$default_template."', 0, ".$search_default.", ".$cache_default.", $createdby, $createdon);"; - $rs = $modx->db->query($sql); - $new_parent = $modx->db->getInsertId(); - - echo "

    ".$_lang["import_site_success"]."

    "; - importFiles($new_parent,$filepath."/$id/",$value); - } - else { - // create dcoument - $filename = $value; - $fparts = explode(".",$value); - $value = $fparts[0]; - $ext = (count($fparts)>1)? $fparts[count($fparts)-1]:""; - printf("

    ".$_lang['import_site_importing_document']."

    ", $filename); - $alias = !isset($modx->documentListing[$value]) ? $value:$value.'-'.substr(uniqid(''),-3); - $modx->documentListing[$alias] = true; - if(!in_array($ext,$allowedfiles)) echo "

    ".$_lang["import_site_skip"]."

    "; - else { - $file = getFileContent("$filepath/$filename"); - if (preg_match("/(.*)<\/title>/i",$file,$matches)) { - $pagetitle = $matches[1]; - } else $pagetitle = $value; - if(!$pagetitle) $pagetitle = $value; - if (preg_match("/<body[^>]*>(.*)[^<]+<\/body>/is",$file,$matches)) { - $content = $matches[1]; - - } else $content = $file; - $sql = "INSERT INTO $dbase.`".$table_prefix."site_content` - (type, contentType, pagetitle, alias, published, parent, isfolder, content, template, menuindex, searchable, cacheable, createdby, createdon) VALUES - ('document', 'text/html', '".$modx->db->escape($pagetitle)."', '".$modx->stripAlias($alias)."', ".$publish_default.", '$parent', 0, '".$modx->db->escape($content)."', '".$default_template."', 0, ".$search_default.", ".$cache_default.", $createdby, $createdon);"; - $rs = $modx->db->query($sql); - if(!$rs) { - echo "<p><span class=\"fail\">".$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError()."</p>"; - exit; - } - echo "<p class=\"success\">".$_lang["import_site_success"]."</p>"; - } - } - } + if ($_POST['object']=='all') + { + $modx->config['default_template'] = '0'; + $richtext = '0'; + } + else + { + $richtext = '1'; + } + + foreach($files as $id => $value) + { + if(is_array($value)) + { + // create folder + $alias = $id; + printf('<span>'.$_lang['import_site_importing_document'].'</span>', $alias); + $field = array(); + $field['type'] = 'document'; + $field['contentType'] = 'text/html'; + $field['published'] = $publish_default; + $field['parent'] = $parent; + $field['alias'] = $modx->stripAlias($alias); + $field['richtext'] = $richtext; + $field['template'] = $modx->config['default_template']; + $field['searchable'] = $search_default; + $field['cacheable'] = $cache_default; + $field['createdby'] = $createdby; + $field['isfolder'] = 1; + $field['menuindex'] = 1; + $find = false; + foreach(array('index.html','index.htm') as $filename) + { + $filepath = $filedir . $alias . '/' . $filename; + if($find===false && file_exists($filepath)) + { + $file = getFileContent($filepath); + list($pagetitle,$content,$description) = treatContent($file,$filename,$alias); + + $date = filemtime($filepath); + $field['pagetitle'] = $pagetitle; + $field['longtitle'] = $pagetitle; + $field['description'] = $description; + $field['content'] = $modx->db->escape($content); + $field['createdon'] = $date; + $field['editedon'] = $date; + $newid = $modx->db->insert($field,'[+prefix+]site_content'); + if($newid) + { + $find = true; + echo ' - <span class="success">'.$_lang['import_site_success'] . '</span><br />' . "\n"; + importFiles($newid, $filedir . $alias . '/',$value,'sub'); + } + else + { + echo '<span class="fail">'.$_lang["import_site_failed"]."</span> " + .$_lang["import_site_failed_db_error"].$modx->db->getLastError(); + exit; + } + } + } + if($find===false) + { + $date = time(); + $field['pagetitle'] = '---'; + $field['content'] = ''; + $field['createdon'] = $date; + $field['editedon'] = $date; + $field['hidemenu'] = '1'; + $newid = $modx->db->insert($field,'[+prefix+]site_content'); + if($newid) + { + $find = true; + echo ' - <span class="success">'.$_lang['import_site_success'] . '</span><br />' . "\n"; + importFiles($newid, $filedir . $alias . '/',$value,'sub'); + } + else + { + echo '<span class="fail">'.$_lang["import_site_failed"]."</span> " + .$_lang["import_site_failed_db_error"].$modx->db->getLastError(); + exit; + } + } + } + else + { + // create document + if($mode=='sub' && $value == 'index.html') continue; + $filename = $value; + $fparts = explode('.',$value); + $alias = $fparts[0]; + $ext = (count($fparts)>1)? $fparts[count($fparts)-1]:""; + printf("<span>".$_lang['import_site_importing_document']."</span>", $filename); + + if(!in_array($ext,$allowedfiles)) echo ' - <span class="fail">'.$_lang["import_site_skip"].'</span><br />' . "\n"; + else + { + $filepath = $filedir . $filename; + $file = getFileContent($filepath); + list($pagetitle,$content,$description) = treatContent($file,$filename,$alias); + + $date = filemtime($filepath); + $field = array(); + $field['type'] = 'document'; + $field['contentType'] = 'text/html'; + $field['pagetitle'] = $pagetitle; + $field['longtitle'] = $pagetitle; + $field['description'] = $description; + $field['alias'] = $modx->stripAlias($alias); + $field['published'] = $publish_default; + $field['parent'] = $parent; + $field['content'] = $modx->db->escape($content); + $field['richtext'] = $richtext; + $field['template'] = $modx->config['default_template']; + $field['searchable'] = $search_default; + $field['cacheable'] = $cache_default; + $field['createdby'] = $createdby; + $field['createdon'] = $date; + $field['editedon'] = $date; + $field['isfolder'] = 0; + $field['menuindex'] = ($alias=='index') ? 0 : 2; + $newid = $modx->db->insert($field,'[+prefix+]site_content'); + if($newid) + { + echo ' - <span class="success">'.$_lang['import_site_success'] . '</span><br />' . "\n"; + } + else + { + echo '<span class="fail">'.$_lang["import_site_failed"]."</span> " + .$_lang["import_site_failed_db_error"].$modx->db->getLastError(); + exit; + } + + $is_site_start = false; + if($filename == 'index.html') $is_site_start = true; + if($is_site_start==true && $_POST['reset']=='on') + { + $modx->db->update("setting_value={$newid}",'[+prefix+]system_settings',"setting_name='site_start'"); + $modx->db->update('menuindex=0','[+prefix+]site_content',"id='{$newid}'"); + } + } + } + } } -function getFiles($directory,$listing = array(), $count = 0){ - global $_lang; - global $filesfound; - $dummy = $count; - if (@$handle = opendir($directory)) { - while ($file = readdir($handle)) { - if ($file=='.' || $file=='..') continue; - else if ($h = @opendir($directory.$file."/")) { - closedir($h); - $count = -1; - $listing["$file"] = getFiles($directory.$file."/",array(), $count + 1); - } - else { - $listing[$dummy] = $file; - $dummy = $dummy + 1; - $filesfound++; - } - } - } - else { - echo "<p><span class=\"fail\">".$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_no_open_dir"].$directory.".</p>"; - } - @closedir($handle); - return ($listing); +function getFiles($directory,$listing = array(), $count = 0) +{ + global $_lang; + global $filesfound; + $dummy = $count; + if ($files = scandir($directory)) + { + foreach($files as $file) + { + if ($file=='.' || $file=='..') continue; + elseif ($h = @opendir($directory.$file."/")) + { + closedir($h); + $count = -1; + $listing[$file] = getFiles($directory.$file."/",array(), $count + 1); + } + elseif(strpos($file,'.htm')!==false) + { + $listing[$dummy] = $file; + $dummy = $dummy + 1; + $filesfound++; + } + } + } + else + { + echo '<p><span class="fail">'.$_lang["import_site_failed"]."</span> " + .$_lang["import_site_failed_no_open_dir"].$directory.".</p>"; + } + return ($listing); } -function getFileContent($file) { - global $_lang; - // get the file - if(@$handle = fopen($file, "r")) { - $buffer = ""; - while (!feof ($handle)) { - $buffer .= fgets($handle, 4096); - } - fclose ($handle); - } - else { - echo "<p><span class=\"fail\">".$_lang['import_site_failed']."</span> ".$_lang["import_site_failed_no_retrieve_file"].$file.".</p>"; - } - return $buffer; +function getFileContent($filepath) +{ + global $_lang; + // get the file + if(!$buffer=file_get_contents($filepath)) + { + echo '<p><span class="fail">' . $_lang['import_site_failed']."</span> " + .$_lang["import_site_failed_no_retrieve_file"].$filepath.".</p>"; + } + else return $buffer; +} + +function pop_index($array) +{ + $new_array = array(); + foreach($array as $k=>$v) + { + if($v!=='index.html' && $v!=='index.htm') + { + $new_array[$k] = $v; + } + else + { + array_unshift($new_array, $v); + } + } + foreach($array as $k=>$v) + { + if(is_array($v)) + { + $new_array[$k] = $v; + } + } + return $new_array; } -/** - * @deprecated Use $modx->stripAlias() - */ -function stripAlias($alias) { - return $GLOBALS['modx']->stripAlias($alias); +function treatContent($src,$filename,$alias) +{ + global $modx; + + $src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII'); + + if (preg_match("@<title>(.*)@i",$src,$matches)) + { + $pagetitle = ($matches[1]!=='') ? $matches[1] : $filename; + $pagetitle = str_replace('[*pagetitle*]','',$pagetitle); + } + else $pagetitle = $alias; + if(!$pagetitle) $pagetitle = $alias; + + if (preg_match('@]+"description"[^>]+content=[\'"](.*)[\'"].+>@i',$src,$matches)) + { + $description = ($matches[1]!=='') ? $matches[1] : $filename; + $description = str_replace('[*description*]','',$description); + } + else $description = ''; + + if ((preg_match("@]*>(.*)[^<]+@is",$src,$matches)) && $_POST['object']=='body') + { + $content = $matches[1]; + } + else + { + $content = $src; + $s = '/(]+charset\s*=)[^>"\'=]+(.+>)/i'; + $r = '$1' . $modx->config['modx_charset'] . '$2'; + $content = preg_replace($s, $r, $content); + $content = preg_replace('@.*@i', "[*pagetitle*]", $content); + } + $content = str_replace('[*content*]','[ *content* ]',$content); + $content = trim($content); + $pagetitle = $modx->db->escape($pagetitle); + return array($pagetitle,$content,$description); +} + +function convertLink() +{ + global $modx; + + $rs = $modx->db->select('id,content','[+prefix+]site_content'); + while($row=$modx->db->getRow($rs)) + { + $id = $row['id']; + $array = explode('config['site_url'])!==false) + { + $_ = $modx->config['base_url'] . str_replace($modx->config['site_url'],'',$_); + } + if($_[0]==='/') $_ = substr($_,1); + $_ = str_replace('/index.html','.html',$_); + $level = substr_count($_,'../'); + if(1<$level) + { + if(!isset($p[$id])) $p[$id] = $modx->getParentIds($id); + $k = array_keys($p[$id]); + while(0<$level) + { + $dir = array_shift($k); + $level--; + } + if($dir!='') $dir .= '/'; + } + else $dir = ''; + + $_ = trim($_,'./'); + if(strpos($_,'/')!==false) $_ = substr($_,strrpos($_,'/')); + $_ = $dir . str_replace('.html','',$_); + if(!isset($target[$_])) $target[$_] = $modx->getIdFromAlias($_); + $target[$_] = trim($target[$_]); + if(!empty($target[$_])) $href = '[~' . $target[$_] . '~]'; + $array[$c] = 'db->escape($content); + $modx->db->update($f,'[+prefix+]site_content',"id='{$id}'"); + } +} +function clearCache() +{ + include_once(MODX_BASE_PATH . 'manager/processors/cache_sync.class.processor.php'); + $sync = new synccache(); + $sync->setCachepath(MODX_BASE_PATH . 'assets/cache/'); + $sync->setReport(false); + $sync->emptyCache(); } -?> \ No newline at end of file diff --git a/manager/includes/lang/english.inc.php b/manager/includes/lang/english.inc.php index 6860051a0d..5c10213c92 100755 --- a/manager/includes/lang/english.inc.php +++ b/manager/includes/lang/english.inc.php @@ -1203,6 +1203,12 @@ $_lang["user_city"] = 'City'; $_lang["user_other"] = 'Other'; +$_lang["import_site.static.php1"] = 'Reset resource tree'; +$_lang["import_site.static.php2"] = 'Reset resource tree, all IDs are initialize.'; +$_lang["import_site.static.php3"] = 'Target'; +$_lang["import_site.static.php4"] = '<body></body> only'; +$_lang["import_site.static.php5"] = 'File contain all'; + $_lang["a83_ignore_ids_title"] = 'Ignore IDs(comma separate)'; $_lang["export_site.static.php1"] = 'Target'; $_lang["export_site.static.php2"] = 'Only edited resources'; From f18b7caaa0f1140e173701c3e0f5f21456ad2440 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 26 Aug 2013 23:21:51 +0900 Subject: [PATCH 355/530] Fix phpThumb path issue --- assets/snippets/phpthumb/snippet.phpthumb.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/assets/snippets/phpthumb/snippet.phpthumb.php b/assets/snippets/phpthumb/snippet.phpthumb.php index e1042c8486..fde3d0c340 100644 --- a/assets/snippets/phpthumb/snippet.phpthumb.php +++ b/assets/snippets/phpthumb/snippet.phpthumb.php @@ -5,15 +5,13 @@ $base="assets/cache/images"; // тут можно менять путь -if(!defined('MODX_BASE_PATH')){die('What are you doing? Get out of here!');} - -if($input == '' || !file_exists($_SERVER['DOCUMENT_ROOT']."/".$input)){ +if($input === '' || !file_exists(MODX_BASE_PATH . $input)){ $input = 'assets/snippets/phpthumb/noimage.png'; } $options = 'f=jpg&q=96&'.strtr($options, Array("," => "&", "_" => "=")); $path_parts=pathinfo($input); - require_once MODX_BASE_PATH."/assets/snippets/phpthumb/phpthumb.class.php"; + require_once MODX_BASE_PATH.'assets/snippets/phpthumb/phpthumb.class.php'; $phpThumb = new phpthumb(); $phpThumb->setSourceFilename($input); @@ -24,7 +22,7 @@ $op[$thumb[0]]=$thumb[1]; } - $tmp=str_replace($_SERVER['DOCUMENT_ROOT']."assets/images","",$path_parts['dirname']); + $tmp=str_replace(MODX_BASE_PATH . "assets/images","",$path_parts['dirname']); $tmp=str_replace("assets/images","",$tmp); $tmp=explode("/",$tmp); $folder=$base; @@ -39,5 +37,4 @@ $outputFilename =MODX_BASE_PATH.$fname; if (!file_exists($outputFilename)) if ($phpThumb->GenerateThumbnail()) $phpThumb->RenderToFile($outputFilename) ; return $fname; - ?> \ No newline at end of file From d45bee8cf30f483c87f54daea657d12e9dbb6c02 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:10:26 +0300 Subject: [PATCH 356/530] update phpthumb class --- assets/snippets/phpthumb/phpthumb.class.php | 7568 ++++++++++--------- 1 file changed, 3888 insertions(+), 3680 deletions(-) diff --git a/assets/snippets/phpthumb/phpthumb.class.php b/assets/snippets/phpthumb/phpthumb.class.php index 4feb673856..a6dd3342de 100644 --- a/assets/snippets/phpthumb/phpthumb.class.php +++ b/assets/snippets/phpthumb/phpthumb.class.php @@ -10,16 +10,16 @@ ob_start(); if (!include_once(dirname(__FILE__).'/phpthumb.functions.php')) { - ob_end_flush(); - die('failed to include_once("'.realpath(dirname(__FILE__).'/phpthumb.functions.php').'")'); + ob_end_flush(); + die('failed to include_once("'.realpath(dirname(__FILE__).'/phpthumb.functions.php').'")'); } ob_end_clean(); class phpthumb { - // public: - // START PARAMETERS (for object mode and phpThumb.php) - // See phpthumb.readme.txt for descriptions of what each of these values are + // public: + // START PARAMETERS (for object mode and phpThumb.php) + // See phpthumb.readme.txt for descriptions of what each of these values are public $src = null; // SouRCe filename public $new = null; // NEW image (phpThumb.php only) public $w = null; // Width @@ -58,14 +58,14 @@ class phpthumb { public $file = null; // >>>deprecated, DO NOT USE, will be removed in future versions<<< public $phpThumbDebug = null; - // END PARAMETERS + // END PARAMETERS - // public: - // START CONFIGURATION OPTIONS (for object mode only) - // See phpThumb.config.php for descriptions of what each of these settings do + // public: + // START CONFIGURATION OPTIONS (for object mode only) + // See phpThumb.config.php for descriptions of what each of these settings do - // * Directory Configuration + // * Directory Configuration public $config_cache_directory = null; public $config_cache_directory_depth = 0; public $config_cache_disable_warning = true; @@ -74,13 +74,13 @@ class phpthumb { public $config_temp_directory = null; public $config_document_root = null; - // * Default output configuration: + // * Default output configuration: public $config_output_format = 'jpeg'; public $config_output_maxwidth = 0; public $config_output_maxheight = 0; public $config_output_interlace = true; - // * Error message configuration + // * Error message configuration public $config_error_image_width = 400; public $config_error_image_height = 100; public $config_error_message_image_default = ''; @@ -91,12 +91,12 @@ class phpthumb { public $config_error_silent_die_on_error = false; public $config_error_die_on_source_failure = true; - // * Anti-Hotlink Configuration: + // * Anti-Hotlink Configuration: public $config_nohotlink_enabled = true; public $config_nohotlink_valid_domains = array(); public $config_nohotlink_erase_image = true; public $config_nohotlink_text_message = 'Off-server thumbnailing is not allowed'; - // * Off-server Linking Configuration: + // * Off-server Linking Configuration: public $config_nooffsitelink_enabled = false; public $config_nooffsitelink_valid_domains = array(); public $config_nooffsitelink_require_refer = false; @@ -104,11 +104,11 @@ class phpthumb { public $config_nooffsitelink_watermark_src = ''; public $config_nooffsitelink_text_message = 'Off-server linking is not allowed'; - // * Border & Background default colors + // * Border & Background default colors public $config_border_hexcolor = '000000'; public $config_background_hexcolor = 'FFFFFF'; - // * TrueType Fonts + // * TrueType Fonts public $config_ttf_directory = './fonts'; public $config_max_source_pixels = null; @@ -128,14 +128,14 @@ class phpthumb { public $config_cache_force_passthru = true; public $config_cache_prefix = ''; // default value set in the constructor below - // * MySQL + // * MySQL public $config_mysql_query = null; public $config_mysql_hostname = null; public $config_mysql_username = null; public $config_mysql_password = null; public $config_mysql_database = null; - // * Security + // * Security public $config_high_security_enabled = false; public $config_high_security_password = null; public $config_disable_debug = false; @@ -144,27 +144,27 @@ class phpthumb { public $config_allow_parameter_file = false; public $config_allow_parameter_goto = false; - // * HTTP fopen + // * HTTP fopen public $config_http_fopen_timeout = 10; public $config_http_follow_redirect = true; - // * Compatability + // * Compatability public $config_disable_pathinfo_parsing = false; public $config_disable_imagecopyresampled = false; public $config_disable_onlycreateable_passthru = false; public $config_http_user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7'; - // END CONFIGURATION OPTIONS + // END CONFIGURATION OPTIONS - // public: error messages (read-only; persistant) + // public: error messages (read-only; persistant) public $debugmessages = array(); public $debugtiming = array(); public $fatalerror = null; - // private: (should not be modified directly) + // private: (should not be modified directly) public $thumbnailQuality = 75; public $thumbnailFormat = null; @@ -199,172 +199,193 @@ class phpthumb { public $thumbnail_image_width = null; public $thumbnail_image_height = null; - public $cache_filename = null; + public $tempFilesToDelete = array(); + public $cache_filename = null; public $AlphaCapableFormats = array('png', 'ico', 'gif'); public $is_alpha = false; - public $iswindows = null; - - public $phpthumb_version = '1.7.9-200712090829'; - - ////////////////////////////////////////////////////////////////////// - - // public: constructor - function __construct() { - $this->DebugTimingMessage('phpThumb() constructor', __FILE__, __LINE__); - $this->DebugMessage('phpThumb() v'.$this->phpthumb_version, __FILE__, __LINE__); - $this->config_max_source_pixels = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 * 0.20); // 20% of memory_limit - $this->iswindows = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'); - $this->config_document_root = (@$_SERVER['DOCUMENT_ROOT'] ? $_SERVER['DOCUMENT_ROOT'] : $this->config_document_root); - $this->config_cache_prefix = 'phpThumb_cache_'.@$_SERVER['SERVER_NAME']; - - $php_sapi_name = strtolower(function_exists('php_sapi_name') ? php_sapi_name() : ''); - if ($php_sapi_name == 'cli') { - $this->config_allow_src_above_docroot = true; - } - } - - // public: - function setSourceFilename($sourceFilename) { - //$this->resetObject(); - //$this->rawImageData = null; - $this->sourceFilename = $sourceFilename; - $this->src = $sourceFilename; - if (is_null($this->config_output_format)) { - $sourceFileExtension = strtolower(substr(strrchr($sourceFilename, '.'), 1)); - if (preg_match('/^[a-z]{3,4}$/', $sourceFileExtension)) { - $this->config_output_format = $sourceFileExtension; - $this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->config_output_format to "'.$sourceFileExtension.'"', __FILE__, __LINE__); - } else { - $this->DebugMessage('setSourceFilename('.$sourceFilename.') did NOT set $this->config_output_format to "'.$sourceFileExtension.'" because it did not seem like an appropriate image format', __FILE__, __LINE__); - } - } - $this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->sourceFilename to "'.$this->sourceFilename.'"', __FILE__, __LINE__); - return true; - } - - // public: - function setSourceData($rawImageData, $sourceFilename='') { - //$this->resetObject(); - //$this->sourceFilename = null; - $this->rawImageData = $rawImageData; - $this->DebugMessage('setSourceData() setting $this->rawImageData ('.strlen($this->rawImageData).' bytes; magic="'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).'))', __FILE__, __LINE__); - if ($this->config_cache_source_enabled) { - $sourceFilename = ($sourceFilename ? $sourceFilename : md5($rawImageData)); - if (!is_dir($this->config_cache_source_directory)) { - $this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not a directory'); - } elseif (!@is_writable($this->config_cache_source_directory)) { - $this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not writable'); - } - $this->DebugMessage('setSourceData() attempting to save source image to "'.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).'"', __FILE__, __LINE__); - if ($fp = @fopen($this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename), 'wb')) { - fwrite($fp, $rawImageData); - fclose($fp); - } elseif (!$this->phpThumbDebug) { - $this->ErrorImage('setSourceData() failed to write to source cache ('.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).')'); - } - } - return true; - } - - // public: - function setSourceImageResource($gdimg) { - //$this->resetObject(); - $this->gdimg_source = $gdimg; - return true; - } - - // public: - function setParameter($param, $value) { - if ($param == 'src') { - $this->setSourceFilename($this->ResolveFilenameToAbsolute($value)); - } elseif (@is_array($this->$param)) { - if (is_array($value)) { - foreach ($value as $arraykey => $arrayvalue) { - array_push($this->$param, $arrayvalue); - } - } else { - array_push($this->$param, $value); - } - } else { - $this->$param = $value; - } - return true; - } - - // public: - function getParameter($param) { - //if (property_exists('phpThumb', $param)) { - return $this->$param; - //} - //$this->DebugMessage('setParameter() attempting to get non-existant parameter "'.$param.'"', __FILE__, __LINE__); - //return false; - } - - - // public: - function GenerateThumbnail() { - - $this->setOutputFormat(); - $this->phpThumbDebug('8a'); - $this->ResolveSource(); - $this->phpThumbDebug('8b'); - $this->SetCacheFilename(); - $this->phpThumbDebug('8c'); - $this->ExtractEXIFgetImageSize(); - $this->phpThumbDebug('8d'); - if ($this->useRawIMoutput) { - $this->DebugMessage('Skipping rest of GenerateThumbnail() because ($this->useRawIMoutput == true)', __FILE__, __LINE__); - return true; - } - $this->phpThumbDebug('8e'); - if (!$this->SourceImageToGD()) { - $this->DebugMessage('SourceImageToGD() failed', __FILE__, __LINE__); - return false; - } - $this->phpThumbDebug('8f'); - $this->Rotate(); - $this->phpThumbDebug('8g'); - $this->CreateGDoutput(); - $this->phpThumbDebug('8h'); - - switch ($this->far) { - case 'L': - case 'TL': - case 'BL': - $destination_offset_x = 0; - $destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2); - break; - case 'R': - case 'TR': - case 'BR': - $destination_offset_x = round($this->thumbnail_width - $this->thumbnail_image_width); - $destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2); - break; - case 'T': - case 'TL': - case 'TR': - $destination_offset_x = round(($this->thumbnail_width - $this->thumbnail_image_width) / 2); - $destination_offset_y = 0; - break; - case 'B': - case 'BL': - case 'BR': - $destination_offset_x = round(($this->thumbnail_width - $this->thumbnail_image_width) / 2); - $destination_offset_y = round($this->thumbnail_height - $this->thumbnail_image_height); - break; - case 'C': - default: - $destination_offset_x = round(($this->thumbnail_width - $this->thumbnail_image_width) / 2); - $destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2); - } + public $iswindows = null; + public $issafemode = null; + + public $phpthumb_version = '1.7.11-201108081537'; + + ////////////////////////////////////////////////////////////////////// + + // public: constructor + function phpThumb() { + $this->DebugTimingMessage('phpThumb() constructor', __FILE__, __LINE__); + $this->DebugMessage('phpThumb() v'.$this->phpthumb_version, __FILE__, __LINE__); + $this->config_max_source_pixels = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 * 0.20); // 20% of memory_limit + $this->iswindows = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'); + $this->issafemode = (bool) preg_match('#(1|ON)#i', ini_get('safe_mode')); + $this->config_document_root = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : $this->config_document_root); + $this->config_cache_prefix = ( isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'].'_' : ''); + + $this->purgeTempFiles(); // purge existing temp files if re-initializing object + + $php_sapi_name = strtolower(function_exists('php_sapi_name') ? php_sapi_name() : ''); + if ($php_sapi_name == 'cli') { + $this->config_allow_src_above_docroot = true; + } + } + + function __destruct() { + $this->purgeTempFiles(); + } + + // public: + function purgeTempFiles() { + foreach ($this->tempFilesToDelete as $tempFileToDelete) { + if (file_exists($tempFileToDelete)) { + $this->DebugMessage('Deleting temp file "'.$tempFileToDelete.'"', __FILE__, __LINE__); + @unlink($tempFileToDelete); + } + } + $this->tempFilesToDelete = array(); + return true; + } + + // public: + function setSourceFilename($sourceFilename) { + //$this->resetObject(); + //$this->rawImageData = null; + $this->sourceFilename = $sourceFilename; + $this->src = $sourceFilename; + if (is_null($this->config_output_format)) { + $sourceFileExtension = strtolower(substr(strrchr($sourceFilename, '.'), 1)); + if (preg_match('#^[a-z]{3,4}$#', $sourceFileExtension)) { + $this->config_output_format = $sourceFileExtension; + $this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->config_output_format to "'.$sourceFileExtension.'"', __FILE__, __LINE__); + } else { + $this->DebugMessage('setSourceFilename('.$sourceFilename.') did NOT set $this->config_output_format to "'.$sourceFileExtension.'" because it did not seem like an appropriate image format', __FILE__, __LINE__); + } + } + $this->DebugMessage('setSourceFilename('.$sourceFilename.') set $this->sourceFilename to "'.$this->sourceFilename.'"', __FILE__, __LINE__); + return true; + } + + // public: + function setSourceData($rawImageData, $sourceFilename='') { + //$this->resetObject(); + //$this->sourceFilename = null; + $this->rawImageData = $rawImageData; + $this->DebugMessage('setSourceData() setting $this->rawImageData ('.strlen($this->rawImageData).' bytes; magic="'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).'))', __FILE__, __LINE__); + if ($this->config_cache_source_enabled) { + $sourceFilename = ($sourceFilename ? $sourceFilename : md5($rawImageData)); + if (!is_dir($this->config_cache_source_directory)) { + $this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not a directory'); + } elseif (!@is_writable($this->config_cache_source_directory)) { + $this->ErrorImage('$this->config_cache_source_directory ('.$this->config_cache_source_directory.') is not writable'); + } + $this->DebugMessage('setSourceData() attempting to save source image to "'.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).'"', __FILE__, __LINE__); + if ($fp = @fopen($this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename), 'wb')) { + fwrite($fp, $rawImageData); + fclose($fp); + } elseif (!$this->phpThumbDebug) { + $this->ErrorImage('setSourceData() failed to write to source cache ('.$this->config_cache_source_directory.DIRECTORY_SEPARATOR.urlencode($sourceFilename).')'); + } + } + return true; + } + + // public: + function setSourceImageResource($gdimg) { + //$this->resetObject(); + $this->gdimg_source = $gdimg; + return true; + } + + // public: + function setParameter($param, $value) { + if ($param == 'src') { + $this->setSourceFilename($this->ResolveFilenameToAbsolute($value)); + } elseif (@is_array($this->$param)) { + if (is_array($value)) { + foreach ($value as $arraykey => $arrayvalue) { + array_push($this->$param, $arrayvalue); + } + } else { + array_push($this->$param, $value); + } + } else { + $this->$param = $value; + } + return true; + } + + // public: + function getParameter($param) { + //if (property_exists('phpThumb', $param)) { + return $this->$param; + //} + //$this->DebugMessage('setParameter() attempting to get non-existant parameter "'.$param.'"', __FILE__, __LINE__); + //return false; + } + + + // public: + function GenerateThumbnail() { + + $this->setOutputFormat(); + $this->phpThumbDebug('8a'); + $this->ResolveSource(); + $this->phpThumbDebug('8b'); + $this->SetCacheFilename(); + $this->phpThumbDebug('8c'); + $this->ExtractEXIFgetImageSize(); + $this->phpThumbDebug('8d'); + if ($this->useRawIMoutput) { + $this->DebugMessage('Skipping rest of GenerateThumbnail() because ($this->useRawIMoutput == true)', __FILE__, __LINE__); + return true; + } + $this->phpThumbDebug('8e'); + if (!$this->SourceImageToGD()) { + $this->DebugMessage('SourceImageToGD() failed', __FILE__, __LINE__); + return false; + } + $this->phpThumbDebug('8f'); + $this->Rotate(); + $this->phpThumbDebug('8g'); + $this->CreateGDoutput(); + $this->phpThumbDebug('8h'); + + switch ($this->far) { + case 'L': + case 'TL': + case 'BL': + $destination_offset_x = 0; + $destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2); + break; + case 'R': + case 'TR': + case 'BR': + $destination_offset_x = round($this->thumbnail_width - $this->thumbnail_image_width); + $destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2); + break; + case 'T': + case 'TL': + case 'TR': + $destination_offset_x = round(($this->thumbnail_width - $this->thumbnail_image_width) / 2); + $destination_offset_y = 0; + break; + case 'B': + case 'BL': + case 'BR': + $destination_offset_x = round(($this->thumbnail_width - $this->thumbnail_image_width) / 2); + $destination_offset_y = round($this->thumbnail_height - $this->thumbnail_image_height); + break; + case 'C': + default: + $destination_offset_x = round(($this->thumbnail_width - $this->thumbnail_image_width) / 2); + $destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2); + } // // copy/resize image to appropriate dimensions // $borderThickness = 0; // if (!empty($this->fltr)) { // foreach ($this->fltr as $key => $value) { -// if (preg_match('^bord\|([0-9]+)', $value, $matches)) { +// if (preg_match('#^bord\|([0-9]+)#', $value, $matches)) { // $borderThickness = $matches[1]; // break; // } @@ -374,3515 +395,3702 @@ function GenerateThumbnail() { // //$this->DebugMessage('Skipping ImageResizeFunction() because BorderThickness="'.$borderThickness.'"', __FILE__, __LINE__); // $this->thumbnail_image_height /= 2; // } - $this->ImageResizeFunction( - $this->gdimg_output, - $this->gdimg_source, - $destination_offset_x, - $destination_offset_y, - $this->thumbnailCropX, - $this->thumbnailCropY, - $this->thumbnail_image_width, - $this->thumbnail_image_height, - $this->thumbnailCropW, - $this->thumbnailCropH - ); - - $this->DebugMessage('memory_get_usage() after copy-resize = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__); - ImageDestroy($this->gdimg_source); - $this->DebugMessage('memory_get_usage() after ImageDestroy = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__); - - $this->phpThumbDebug('8i'); - $this->AntiOffsiteLinking(); - $this->phpThumbDebug('8j'); - $this->ApplyFilters(); - $this->phpThumbDebug('8k'); - $this->AlphaChannelFlatten(); - $this->phpThumbDebug('8l'); - $this->MaxFileSize(); - $this->phpThumbDebug('8m'); - - $this->DebugMessage('GenerateThumbnail() completed successfully', __FILE__, __LINE__); - return true; - } - - - // public: - function RenderOutput() { - if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) { - $this->DebugMessage('RenderOutput() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__); - return false; - } - if (!$this->thumbnailFormat) { - $this->DebugMessage('RenderOutput() failed because $this->thumbnailFormat is empty', __FILE__, __LINE__); - return false; - } - if ($this->useRawIMoutput) { - $this->DebugMessage('RenderOutput copying $this->IMresizedData ('.strlen($this->IMresizedData).' bytes) to $this->outputImage', __FILE__, __LINE__); - $this->outputImageData = $this->IMresizedData; - return true; - } - - $builtin_formats = array(); - if (function_exists('ImageTypes')) { - $imagetypes = ImageTypes(); - $builtin_formats['wbmp'] = (bool) ($imagetypes & IMG_WBMP); - $builtin_formats['jpg'] = (bool) ($imagetypes & IMG_JPG); - $builtin_formats['gif'] = (bool) ($imagetypes & IMG_GIF); - $builtin_formats['png'] = (bool) ($imagetypes & IMG_PNG); - } - $this->DebugMessage('RenderOutput() attempting Image'.strtoupper(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__); - ob_start(); - switch ($this->thumbnailFormat) { - case 'wbmp': - if (!@$builtin_formats['wbmp']) { - $this->DebugMessage('GD does not have required built-in support for WBMP output', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - ImageJPEG($this->gdimg_output, null, $this->thumbnailQuality); - $this->outputImageData = ob_get_contents(); - break; - - case 'jpeg': - case 'jpg': // should be "jpeg" not "jpg" but just in case... - if (!@$builtin_formats['jpg']) { - $this->DebugMessage('GD does not have required built-in support for JPEG output', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - ImageJPEG($this->gdimg_output, null, $this->thumbnailQuality); - $this->outputImageData = ob_get_contents(); - break; - - case 'png': - if (!@$builtin_formats['png']) { - $this->DebugMessage('GD does not have required built-in support for PNG output', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - ImagePNG($this->gdimg_output); - $this->outputImageData = ob_get_contents(); - break; - - case 'gif': - if (!@$builtin_formats['gif']) { - $this->DebugMessage('GD does not have required built-in support for GIF output', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - ImageGIF($this->gdimg_output); - $this->outputImageData = ob_get_contents(); - break; - - case 'bmp': - $ImageOutFunction = '"builtin BMP output"'; - if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) { - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - $phpthumb_bmp = new phpthumb_bmp(); - $this->outputImageData = $phpthumb_bmp->GD2BMPstring($this->gdimg_output); - unset($phpthumb_bmp); - break; - - case 'ico': - $ImageOutFunction = '"builtin ICO output"'; - if (!@include_once(dirname(__FILE__).'/phpthumb.ico.php')) { - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - $phpthumb_ico = new phpthumb_ico(); - $arrayOfOutputImages = array($this->gdimg_output); - $this->outputImageData = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages); - unset($phpthumb_ico); - break; - - default: - $this->DebugMessage('RenderOutput failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - ob_end_clean(); - if (!$this->outputImageData) { - $this->DebugMessage('RenderOutput() for "'.$this->thumbnailFormat.'" failed', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - $this->DebugMessage('RenderOutput() completing with $this->outputImageData = '.strlen($this->outputImageData).' bytes', __FILE__, __LINE__); - return true; - } - - - // public: - function RenderToFile($filename) { - if (preg_match('/^(f|ht)tps?\:\/\//i', $filename)) { - $this->DebugMessage('RenderToFile() failed because $filename ('.$filename.') is a URL', __FILE__, __LINE__); - return false; - } - // render thumbnail to this file only, do not cache, do not output to browser - //$renderfilename = $this->ResolveFilenameToAbsolute(dirname($filename)).DIRECTORY_SEPARATOR.basename($filename); - $renderfilename = $filename; - if (($filename{0} != '/') && ($filename{0} != '\\') && ($filename{1} != ':')) { - $renderfilename = $this->ResolveFilenameToAbsolute($renderfilename); - } - if (!@is_writable(dirname($renderfilename))) { - $this->DebugMessage('RenderToFile() failed because "'.dirname($renderfilename).'/" is not writable', __FILE__, __LINE__); - return false; - } - if (@is_file($renderfilename) && !@is_writable($renderfilename)) { - $this->DebugMessage('RenderToFile() failed because "'.$renderfilename.'" is not writable', __FILE__, __LINE__); - return false; - } - - if ($this->RenderOutput()) { - if (file_put_contents($renderfilename, $this->outputImageData)) { - $this->DebugMessage('RenderToFile('.$renderfilename.') succeeded', __FILE__, __LINE__); - /*if trouble with chmod (infobox hoster)*/ - //chmod($renderfilename, 0644); - return true; - } - if (!@file_exists($renderfilename)) { - $this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] did not appear to fail, but the output image does not exist either...', __FILE__, __LINE__); - } - } else { - $this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] failed', __FILE__, __LINE__); - } - return false; - } - - - // public: - function OutputThumbnail() { - if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) { - $this->DebugMessage('OutputThumbnail() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__); - return false; - } - if (headers_sent()) { - return $this->ErrorImage('OutputThumbnail() failed - headers already sent'); - exit; - } - - $downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($this->down ? $this->down : 'phpThumb_generated_thumbnail'.'.'.$this->thumbnailFormat)); - $this->DebugMessage('Content-Disposition header filename set to "'.$downloadfilename.'"', __FILE__, __LINE__); - if ($downloadfilename) { - header('Content-Disposition: '.($this->down ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"'); - } else { - $this->DebugMessage('failed to send Content-Disposition header because $downloadfilename is empty', __FILE__, __LINE__); - } - - if ($this->useRawIMoutput) { - - header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); - echo $this->IMresizedData; - - } else { - - $this->DebugMessage('ImageInterlace($this->gdimg_output, '.intval($this->config_output_interlace).')', __FILE__, __LINE__); - ImageInterlace($this->gdimg_output, intval($this->config_output_interlace)); - switch ($this->thumbnailFormat) { - case 'jpeg': - header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); - $ImageOutFunction = 'image'.$this->thumbnailFormat; - @$ImageOutFunction($this->gdimg_output, '', $this->thumbnailQuality); - break; - - case 'png': - case 'gif': - header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); - $ImageOutFunction = 'image'.$this->thumbnailFormat; - @$ImageOutFunction($this->gdimg_output); - break; - - case 'bmp': - if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) { - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__); - return false; - } - $phpthumb_bmp = new phpthumb_bmp(); - if (is_object($phpthumb_bmp)) { - $bmp_data = $phpthumb_bmp->GD2BMPstring($this->gdimg_output); - unset($phpthumb_bmp); - if (!$bmp_data) { - $this->DebugMessage('$phpthumb_bmp->GD2BMPstring() failed', __FILE__, __LINE__); - return false; - } - header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); - echo $bmp_data; - } else { - $this->DebugMessage('new phpthumb_bmp() failed', __FILE__, __LINE__); - return false; - } - break; - - case 'ico': - if (!@include_once(dirname(__FILE__).'/phpthumb.ico.php')) { - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__); - return false; - } - $phpthumb_ico = new phpthumb_ico(); - if (is_object($phpthumb_ico)) { - $arrayOfOutputImages = array($this->gdimg_output); - $ico_data = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages); - unset($phpthumb_ico); - if (!$ico_data) { - $this->DebugMessage('$phpthumb_ico->GD2ICOstring() failed', __FILE__, __LINE__); - return false; - } - header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); - echo $ico_data; - } else { - $this->DebugMessage('new phpthumb_ico() failed', __FILE__, __LINE__); - return false; - } - break; - - default: - $this->DebugMessage('OutputThumbnail failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__); - return false; - break; - } - - } - return true; - } - - - // public: - function CleanUpCacheDirectory() { - $this->DebugMessage('skipping CleanUpCacheDirectory() set to purge ('.number_format($this->config_cache_maxage / 86400, 1).' days; '.number_format($this->config_cache_maxsize / 1048576, 2).'MB; '.number_format($this->config_cache_maxfiles).' files)', __FILE__, __LINE__); - $DeletedKeys = array(); - $AllFilesInCacheDirectory = array(); - if (($this->config_cache_maxage > 0) || ($this->config_cache_maxsize > 0) || ($this->config_cache_maxfiles > 0)) { - $CacheDirOldFilesAge = array(); - $CacheDirOldFilesSize = array(); - $AllFilesInCacheDirectory = phpthumb_functions::GetAllFilesInSubfolders($this->config_cache_directory); - foreach ($AllFilesInCacheDirectory as $fullfilename) { - if (preg_match('/^phpThumb\_cache\_/i', basename($fullfilename)) && file_exists($fullfilename)) { - $CacheDirOldFilesAge[$fullfilename] = @fileatime($fullfilename); - if ($CacheDirOldFilesAge[$fullfilename] == 0) { - $CacheDirOldFilesAge[$fullfilename] = @filemtime($fullfilename); - } - $CacheDirOldFilesSize[$fullfilename] = @filesize($fullfilename); - } - } - if (empty($CacheDirOldFilesSize)) { - return true; - } - $DeletedKeys['zerobyte'] = array(); - foreach ($CacheDirOldFilesSize as $fullfilename => $filesize) { - // purge all zero-size files more than an hour old (to prevent trying to delete just-created and/or in-use files) - $cutofftime = time() - 3600; - if (($filesize == 0) && ($CacheDirOldFilesAge[$fullfilename] < $cutofftime)) { - if (@unlink($fullfilename)) { - $DeletedKeys['zerobyte'][] = $fullfilename; - unset($CacheDirOldFilesSize[$fullfilename]); - unset($CacheDirOldFilesAge[$fullfilename]); - } - } - } - $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['zerobyte']).' zero-byte files', __FILE__, __LINE__); - asort($CacheDirOldFilesAge); - - if ($this->config_cache_maxfiles > 0) { - $TotalCachedFiles = count($CacheDirOldFilesAge); - $DeletedKeys['maxfiles'] = array(); - foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) { - if ($TotalCachedFiles > $this->config_cache_maxfiles) { - if (@unlink($fullfilename)) { - $TotalCachedFiles--; - $DeletedKeys['maxfiles'][] = $fullfilename; - } - } else { - // there are few enough files to keep the rest - break; - } - } - $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxfiles']).' files based on (config_cache_maxfiles='.$this->config_cache_maxfiles.')', __FILE__, __LINE__); - foreach ($DeletedKeys['maxfiles'] as $fullfilename) { - unset($CacheDirOldFilesAge[$fullfilename]); - unset($CacheDirOldFilesSize[$fullfilename]); - } - } - - if ($this->config_cache_maxage > 0) { - $mindate = time() - $this->config_cache_maxage; - $DeletedKeys['maxage'] = array(); - foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) { - if ($filedate > 0) { - if ($filedate < $mindate) { - if (@unlink($fullfilename)) { - $DeletedKeys['maxage'][] = $fullfilename; - } - } else { - // the rest of the files are new enough to keep - break; - } - } - } - $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxage']).' files based on (config_cache_maxage='.$this->config_cache_maxage.')', __FILE__, __LINE__); - foreach ($DeletedKeys['maxage'] as $fullfilename) { - unset($CacheDirOldFilesAge[$fullfilename]); - unset($CacheDirOldFilesSize[$fullfilename]); - } - } - - if ($this->config_cache_maxsize > 0) { - $TotalCachedFileSize = array_sum($CacheDirOldFilesSize); - $DeletedKeys['maxsize'] = array(); - foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) { - if ($TotalCachedFileSize > $this->config_cache_maxsize) { - if (@unlink($fullfilename)) { - $TotalCachedFileSize -= $CacheDirOldFilesSize[$fullfilename]; - $DeletedKeys['maxsize'][] = $fullfilename; - } - } else { - // the total filesizes are small enough to keep the rest of the files - break; - } - } - $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxsize']).' files based on (config_cache_maxsize='.$this->config_cache_maxsize.')', __FILE__, __LINE__); - foreach ($DeletedKeys['maxsize'] as $fullfilename) { - unset($CacheDirOldFilesAge[$fullfilename]); - unset($CacheDirOldFilesSize[$fullfilename]); - } - } - - } else { - $this->DebugMessage('skipping CleanUpCacheDirectory() because config set to not use it', __FILE__, __LINE__); - } - $totalpurged = 0; - foreach ($DeletedKeys as $key => $value) { - $totalpurged += count($value); - } - $this->DebugMessage('CleanUpCacheDirectory() purged '.$totalpurged.' files (from '.count($AllFilesInCacheDirectory).') based on config settings', __FILE__, __LINE__); - if ($totalpurged > 0) { - $empty_dirs = array(); - foreach ($AllFilesInCacheDirectory as $fullfilename) { - if (is_dir($fullfilename)) { - $empty_dirs[realpath($fullfilename)] = 1; - } else { - unset($empty_dirs[realpath(dirname($fullfilename))]); - } - } - krsort($empty_dirs); - $totalpurgeddirs = 0; - foreach ($empty_dirs as $empty_dir => $dummy) { - if ($empty_dir == $this->config_cache_directory) { - // shouldn't happen, but just in case, don't let it delete actual cache directory - continue; - } elseif (@rmdir($empty_dir)) { - $totalpurgeddirs++; - } else { - $this->DebugMessage('failed to rmdir('.$empty_dir.')', __FILE__, __LINE__); - } - } - $this->DebugMessage('purged '.$totalpurgeddirs.' empty directories', __FILE__, __LINE__); - } - return true; - } - - ////////////////////////////////////////////////////////////////////// - - // private: re-initializator (call between rendering multiple images with one object) - function resetObject() { - $class_vars = get_class_vars(get_class($this)); - foreach ($class_vars as $key => $value) { - // do not clobber debug or config info - if (!preg_match('/^(config\_|debug|fatalerror)/i', $key)) { - $this->$key = $value; - } - } - $this->phpThumb(); // re-initialize some class variables - return true; - } - - ////////////////////////////////////////////////////////////////////// - - function ResolveSource() { - if (is_resource($this->gdimg_source)) { - $this->DebugMessage('ResolveSource() exiting because is_resource($this->gdimg_source)', __FILE__, __LINE__); - return true; - } - if ($this->rawImageData) { - $this->sourceFilename = null; - $this->DebugMessage('ResolveSource() exiting because $this->rawImageData is set ('.number_format(strlen($this->rawImageData)).' bytes)', __FILE__, __LINE__); - return true; - } - if ($this->sourceFilename) { - $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->sourceFilename); - $this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'"', __FILE__, __LINE__); - } elseif ($this->src) { - $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src); - $this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'" from $this->src ('.$this->src.')', __FILE__, __LINE__); - } else { - return $this->ErrorImage('$this->sourceFilename and $this->src are both empty'); - } - if ($this->iswindows && ((substr($this->sourceFilename, 0, 2) == '//') || (substr($this->sourceFilename, 0, 2) == '\\\\'))) { - // Windows \\share\filename.ext - } elseif (preg_match('/^(f|ht)tps?\:\/\//i', $this->sourceFilename)) { - // URL - if ($this->config_http_user_agent) { - ini_set('user_agent', $this->config_http_user_agent); - } - } elseif (!@file_exists($this->sourceFilename)) { - return $this->ErrorImage('"'.$this->sourceFilename.'" does not exist'); - } elseif (!@is_file($this->sourceFilename)) { - return $this->ErrorImage('"'.$this->sourceFilename.'" is not a file'); - } - return true; - } - - function setOutputFormat() { - static $alreadyCalled = false; - if ($this->thumbnailFormat && $alreadyCalled) { - return true; - } - $alreadyCalled = true; - - $AvailableImageOutputFormats = array(); - $AvailableImageOutputFormats[] = 'text'; - if (@is_readable(dirname(__FILE__).'/phpthumb.ico.php')) { - $AvailableImageOutputFormats[] = 'ico'; - } - if (@is_readable(dirname(__FILE__).'/phpthumb.bmp.php')) { - $AvailableImageOutputFormats[] = 'bmp'; - } - - $this->thumbnailFormat = 'ico'; - - // Set default output format based on what image types are available - if (function_exists('ImageTypes')) { - $imagetypes = ImageTypes(); - if ($imagetypes & IMG_WBMP) { - $this->thumbnailFormat = 'wbmp'; - $AvailableImageOutputFormats[] = 'wbmp'; - } - if ($imagetypes & IMG_GIF) { - $this->thumbnailFormat = 'gif'; - $AvailableImageOutputFormats[] = 'gif'; - } - if ($imagetypes & IMG_PNG) { - $this->thumbnailFormat = 'png'; - $AvailableImageOutputFormats[] = 'png'; - } - if ($imagetypes & IMG_JPG) { - $this->thumbnailFormat = 'jpeg'; - $AvailableImageOutputFormats[] = 'jpeg'; - } - } else { - //return $this->ErrorImage('ImageTypes() does not exist - GD support might not be enabled?'); - $this->DebugMessage('ImageTypes() does not exist - GD support might not be enabled?', __FILE__, __LINE__); - } - if ($this->ImageMagickVersion()) { - $IMformats = array('jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp'); - $this->DebugMessage('Addding ImageMagick formats to $AvailableImageOutputFormats ('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__); - foreach ($IMformats as $key => $format) { - $AvailableImageOutputFormats[] = $format; - } - } - $AvailableImageOutputFormats = array_unique($AvailableImageOutputFormats); - $this->DebugMessage('$AvailableImageOutputFormats = array('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__); - - $this->f = preg_replace('/[^a-z]/', '', strtolower($this->f)); - if (strtolower($this->config_output_format) == 'jpg') { - $this->config_output_format = 'jpeg'; - } - if (strtolower($this->f) == 'jpg') { - $this->f = 'jpeg'; - } - if (phpthumb_functions::CaseInsensitiveInArray($this->config_output_format, $AvailableImageOutputFormats)) { - // set output format to config default if that format is available - $this->DebugMessage('$this->thumbnailFormat set to $this->config_output_format "'.strtolower($this->config_output_format).'"', __FILE__, __LINE__); - $this->thumbnailFormat = strtolower($this->config_output_format); - } elseif ($this->config_output_format) { - $this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->config_output_format ('.strtolower($this->config_output_format).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__); - } - if ($this->f && (phpthumb_functions::CaseInsensitiveInArray($this->f, $AvailableImageOutputFormats))) { - // override output format if $this->f is set and that format is available - $this->DebugMessage('$this->thumbnailFormat set to $this->f "'.strtolower($this->f).'"', __FILE__, __LINE__); - $this->thumbnailFormat = strtolower($this->f); - } elseif ($this->f) { - $this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->f ('.strtolower($this->f).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__); - } - - // for JPEG images, quality 1 (worst) to 99 (best) - // quality < 25 is nasty, with not much size savings - not recommended - // problems with 100 - invalid JPEG? - $this->thumbnailQuality = max(1, min(99, ($this->q ? $this->q : 75))); - $this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__); - - return true; - } - - function setCacheDirectory() { - // resolve cache directory to absolute pathname - $this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__); - if (substr($this->config_cache_directory, 0, 1) == '.') { - if (preg_match('/^(f|ht)tps?\:\/\//i', $this->src)) { - if (!$this->config_cache_disable_warning) { - $this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') cannot be used for remote images. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php'); - } - } elseif ($this->src) { - // resolve relative cache directory to source image - $this->config_cache_directory = dirname($this->ResolveFilenameToAbsolute($this->src)).DIRECTORY_SEPARATOR.$this->config_cache_directory; - } else { - // $this->new is probably set - } - } - if (substr($this->config_cache_directory, -1) == '/') { - $this->config_cache_directory = substr($this->config_cache_directory, 0, -1); - } - if ($this->iswindows) { - $this->config_cache_directory = str_replace('/', DIRECTORY_SEPARATOR, $this->config_cache_directory); - } - if ($this->config_cache_directory) { - $real_cache_path = realpath($this->config_cache_directory); - if (!$real_cache_path) { - $this->DebugMessage('realpath($this->config_cache_directory) failed for "'.$this->config_cache_directory.'"', __FILE__, __LINE__); - if (!is_dir($this->config_cache_directory)) { - $this->DebugMessage('!is_dir('.$this->config_cache_directory.')', __FILE__, __LINE__); - } - } - if ($real_cache_path) { - $this->DebugMessage('setting config_cache_directory to realpath('.$this->config_cache_directory.') = "'.$real_cache_path.'"', __FILE__, __LINE__); - $this->config_cache_directory = $real_cache_path; - } - } - if (!is_dir($this->config_cache_directory)) { - if (!$this->config_cache_disable_warning) { - $this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') does not exist. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php'); - } - $this->DebugMessage('$this->config_cache_directory ('.$this->config_cache_directory.') is not a directory', __FILE__, __LINE__); - $this->config_cache_directory = null; - } elseif (!@is_writable($this->config_cache_directory)) { - $this->DebugMessage('$this->config_cache_directory is not writable ('.$this->config_cache_directory.')', __FILE__, __LINE__); - } - - $this->InitializeTempDirSetting(); - if (!@is_dir($this->config_temp_directory) && !@is_writable($this->config_temp_directory) && @is_dir($this->config_cache_directory) && @is_writable($this->config_cache_directory)) { - $this->DebugMessage('setting $this->config_temp_directory = $this->config_cache_directory ('.$this->config_cache_directory.')', __FILE__, __LINE__); - $this->config_temp_directory = $this->config_cache_directory; - } - return true; - } - - - function ResolveFilenameToAbsolute($filename) { - if (!$filename) { - return false; - } - - //if (eregi('^(f|ht)tps?\://', $filename)) { - if (preg_match('/^[a-z0-9]+\:\/{1,2}/i', $filename)) { - // eg: http://host/path/file.jpg (HTTP URL) - // eg: ftp://host/path/file.jpg (FTP URL) - // eg: data1:/path/file.jpg (Netware path) - - //$AbsoluteFilename = $filename; - return $filename; - - } elseif ($this->iswindows && ($filename{1} == ':')) { - - // absolute pathname (Windows) - $AbsoluteFilename = $filename; - - } elseif ($this->iswindows && ((substr($filename, 0, 2) == '//') || (substr($filename, 0, 2) == '\\\\'))) { - - // absolute pathname (Windows) - $AbsoluteFilename = $filename; - - } elseif ($filename{0} == '/') { - - if (@is_readable($filename) && !@is_readable($this->config_document_root.$filename)) { - - // absolute filename (*nix) - $AbsoluteFilename = $filename; - - } elseif ($filename{1} == '~') { - - // /~user/path - if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray($filename)) { - $AbsoluteFilename = $ApacheLookupURIarray['filename']; - } else { - $AbsoluteFilename = realpath($filename); - if (@is_readable($AbsoluteFilename)) { - $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with realpath($filename)', __FILE__, __LINE__); - } elseif (is_dir(dirname($AbsoluteFilename))) { - $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname($filename).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with realpath(.)', __FILE__, __LINE__); - } else { - return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'". This has been known to fail on Apache2 - try using the absolute filename for the source image (ex: "/home/user/httpdocs/image.jpg" instead of "/~user/image.jpg")'); - } - } - - } else { - - // relative filename (any OS) - if (preg_match('#^'.preg_quote($this->config_document_root).'#', $filename)) { - $AbsoluteFilename = $filename; - $this->DebugMessage('ResolveFilenameToAbsolute() NOT prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__); - } else { - $AbsoluteFilename = $this->config_document_root.$filename; - $this->DebugMessage('ResolveFilenameToAbsolute() prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__); - } - - } - - } else { - - // relative to current directory (any OS) - $AbsoluteFilename = $this->config_document_root.dirname(@$_SERVER['PHP_SELF']).DIRECTORY_SEPARATOR.$filename; - //if (!@file_exists($AbsoluteFilename) && @file_exists(realpath($this->DotPadRelativeDirectoryPath($filename)))) { - // $AbsoluteFilename = realpath($this->DotPadRelativeDirectoryPath($filename)); - //} - - if (substr(dirname(@$_SERVER['PHP_SELF']), 0, 2) == '/~') { - if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) { - $AbsoluteFilename = $ApacheLookupURIarray['filename'].DIRECTORY_SEPARATOR.$filename; - } else { - $AbsoluteFilename = realpath('.').DIRECTORY_SEPARATOR.$filename; - if (@is_readable($AbsoluteFilename)) { - $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with realpath(.)/$filename', __FILE__, __LINE__); - } elseif (is_dir(dirname($AbsoluteFilename))) { - $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with realpath(.)', __FILE__, __LINE__); - } else { - return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'". This has been known to fail on Apache2 - try using the absolute filename for the source image'); - } - } - } - - } - if (is_link($AbsoluteFilename)) { - $this->DebugMessage('is_link()==true, changing "'.$AbsoluteFilename.'" to "'.readlink($AbsoluteFilename).'"', __FILE__, __LINE__); - $AbsoluteFilename = readlink($AbsoluteFilename); - } - if (realpath($AbsoluteFilename)) { - $AbsoluteFilename = realpath($AbsoluteFilename); - } - if ($this->iswindows) { - $AbsoluteFilename = preg_replace('#^'.preg_quote(realpath($this->config_document_root)).'#i', realpath($this->config_document_root), $AbsoluteFilename); - $AbsoluteFilename = str_replace(DIRECTORY_SEPARATOR, '/', $AbsoluteFilename); - } - if (!$this->config_allow_src_above_docroot && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', realpath($this->config_document_root))).'#', $AbsoluteFilename)) { - $this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.realpath($this->config_document_root).'") to null', __FILE__, __LINE__); - return false; - } - if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))).'#', $AbsoluteFilename)) { - $this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'.dirname(__FILE__).'") to null', __FILE__, __LINE__); - return false; - } - return $AbsoluteFilename; - } - - function ImageMagickWhichConvert() { - static $WhichConvert = null; - if (is_null($WhichConvert)) { - if ($this->iswindows) { - $WhichConvert = false; - } else { - $WhichConvert = trim(phpthumb_functions::SafeExec('which convert')); - } - } - return $WhichConvert; - } - - function ImageMagickCommandlineBase() { - static $commandline = null; - if (is_null($commandline)) { - $commandline = (!is_null($this->config_imagemagick_path) ? $this->config_imagemagick_path : ''); - - if ($this->config_imagemagick_path && ($this->config_imagemagick_path != realpath($this->config_imagemagick_path))) { - if (@is_executable(realpath($this->config_imagemagick_path))) { - $this->DebugMessage('Changing $this->config_imagemagick_path ('.$this->config_imagemagick_path.') to realpath($this->config_imagemagick_path) ('.realpath($this->config_imagemagick_path).')', __FILE__, __LINE__); - $this->config_imagemagick_path = realpath($this->config_imagemagick_path); - } else { - $this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable(realpath($this->config_imagemagick_path)) ('.realpath($this->config_imagemagick_path).')', __FILE__, __LINE__); - } - } - $this->DebugMessage(' file_exists('.$this->config_imagemagick_path.') = '.intval( @file_exists($this->config_imagemagick_path)), __FILE__, __LINE__); - $this->DebugMessage('is_executable('.$this->config_imagemagick_path.') = '.intval(@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__); - if (@file_exists($this->config_imagemagick_path)) { - $this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path ('.$this->config_imagemagick_path.')', __FILE__, __LINE__); - if ($this->iswindows) { - $commandline = substr($this->config_imagemagick_path, 0, 2).' && cd "'.str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2)).'" && '.basename($this->config_imagemagick_path); - } else { - $commandline = '"'.$this->config_imagemagick_path.'"'; - } - return $commandline; - } - - $which_convert = $this->ImageMagickWhichConvert(); - $IMversion = $this->ImageMagickVersion(); - - if ($which_convert && ($which_convert{0} == '/') && (function_exists('stream_resolve_include_path') ? @stream_resolve_include_path($which_convert) : @file_exists($which_convert))) { - - // `which convert` *should* return the path if "convert" exist, or nothing if it doesn't - // other things *may* get returned, like "sh: convert: not found" or "no convert in /usr/local/bin /usr/sbin /usr/bin /usr/ccs/bin" - // so only do this if the value returned exists as a file - $this->DebugMessage('using ImageMagick path from `which convert` ('.$which_convert.')', __FILE__, __LINE__); - $commandline = 'convert'; - - } elseif ($IMversion) { - - $this->DebugMessage('setting ImageMagick path to $this->config_imagemagick_path ('.$this->config_imagemagick_path.') ['.$IMversion.']', __FILE__, __LINE__); - $commandline = $this->config_imagemagick_path; - - } else { - - $this->DebugMessage('ImageMagickThumbnailToGD() aborting because cannot find convert in $this->config_imagemagick_path ('.$this->config_imagemagick_path.'), and `which convert` returned ('.$which_convert.')', __FILE__, __LINE__); - $commandline = ''; - - } - } - return $commandline; - } - - function ImageMagickVersion($returnRAW=false) { - static $versionstring = null; - if (is_null($versionstring)) { - $commandline = $this->ImageMagickCommandlineBase(); - $commandline = (!is_null($commandline) ? $commandline : ''); - - $versionstring = array(0=>'', 1=>''); - if ($commandline) { - $commandline .= ' --version'; - $this->DebugMessage('ImageMagick version checked with "'.$commandline.'"', __FILE__, __LINE__); - $versionstring[1] = trim(phpthumb_functions::SafeExec($commandline)); - if (preg_match('#^Version\: [^0-9]*([ 0-9\\.\\:Q/]+) (http|file)\:#i', $versionstring[1], $matches)) { - $versionstring[0] = $matches[1]; - } else { - $versionstring[0] = false; - $this->DebugMessage('ImageMagick did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__); - } - $imsg = isset($matches[0]) ? $matches[0] : 'Unknown'; - $this->DebugMessage('ImageMagick convert --version says "'.$imsg.'"', __FILE__, __LINE__); - } - } - return @$versionstring[intval($returnRAW)]; - } - - function ImageMagickSwitchAvailable($switchname) { - static $IMoptions = null; - if (is_null($IMoptions)) { - $IMoptions = array(); - $commandline = $this->ImageMagickCommandlineBase(); - if (!is_null($commandline)) { - $commandline .= ' -help'; - $IMhelp_lines = explode("\n", phpthumb_functions::SafeExec($commandline)); - foreach ($IMhelp_lines as $line) { - if (preg_match('#^[\+\-]([a-z\-]+)#', trim($line), $matches)) { - $IMoptions[$matches[1]] = true; - } - } - } - } - if (is_array($switchname)) { - $allOK = true; - foreach ($switchname as $key => $value) { - if (!isset($IMoptions[$value])) { - $allOK = false; - break; - } - } - $this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '.intval($allOK).'', __FILE__, __LINE__); - } else { - $allOK = isset($IMoptions[$switchname]); - $this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '.intval($allOK).'', __FILE__, __LINE__); - } - return $allOK; - } - - function ImageMagickFormatsList() { - static $IMformatsList = null; - if (is_null($IMformatsList)) { - $IMformatsList = ''; - $commandline = $this->ImageMagickCommandlineBase(); - if (!is_null($commandline)) { - $commandline = dirname($commandline).DIRECTORY_SEPARATOR.str_replace('convert', 'identify', basename($commandline)); - $commandline .= ' -list format'; - $IMformatsList = phpthumb_functions::SafeExec($commandline); - } - } - return $IMformatsList; - } - - function ImageMagickThumbnailToGD() { - // http://www.imagemagick.org/script/command-line-options.php - - if (ini_get('safe_mode')) { - $this->DebugMessage('ImageMagickThumbnailToGD() aborting because safe_mode is enabled', __FILE__, __LINE__); - $this->useRawIMoutput = false; - return false; - } - $this->useRawIMoutput = true; - if (phpthumb_functions::gd_version()) { - // if GD is not available, must use whatever ImageMagick can output - - // $UnAllowedParameters contains options that can only be processed in GD, not ImageMagick - // note: 'fltr' *may* need to be processed by GD, but we'll check that in more detail below - $UnAllowedParameters = array('xto', 'ar', 'bg', 'bc'); - // 'ra' may be part of this list, if not a multiple of 90� - foreach ($UnAllowedParameters as $parameter) { - if (isset($this->$parameter)) { - $this->DebugMessage('$this->useRawIMoutput=false because "'.$parameter.'" is set', __FILE__, __LINE__); - $this->useRawIMoutput = false; - break; - } - } - } - $this->DebugMessage('$this->useRawIMoutput='.($this->useRawIMoutput ? 'true' : 'false').' after checking $UnAllowedParameters', __FILE__, __LINE__); - $outputFormat = $this->thumbnailFormat; - if (phpthumb_functions::gd_version()) { - if ($this->useRawIMoutput) { - switch ($this->thumbnailFormat) { - case 'gif': - $ImageCreateFunction = 'ImageCreateFromGIF'; - $this->is_alpha = true; - break; - case 'png': - $ImageCreateFunction = 'ImageCreateFromPNG'; - $this->is_alpha = true; - break; - case 'jpg': - case 'jpeg': - $ImageCreateFunction = 'ImageCreateFromJPEG'; - break; - default: - $this->DebugMessage('Forcing output to PNG because $this->thumbnailFormat ('.$this->thumbnailFormat.' is not a GD-supported format)', __FILE__, __LINE__); - $outputFormat = 'png'; - $ImageCreateFunction = 'ImageCreateFromPNG'; - $this->is_alpha = true; - $this->useRawIMoutput = false; - break; - } - if (!function_exists(@$ImageCreateFunction)) { - // ImageMagickThumbnailToGD() depends on ImageCreateFromPNG/ImageCreateFromGIF - //$this->DebugMessage('ImageMagickThumbnailToGD() aborting because '.@$ImageCreateFunction.'() is not available', __FILE__, __LINE__); - $this->useRawIMoutput = true; - //return false; - } - } else { - $outputFormat = 'png'; - $ImageCreateFunction = 'ImageCreateFromPNG'; - $this->is_alpha = true; - $this->useRawIMoutput = false; - } - } - - if (!$this->sourceFilename && $this->rawImageData) { - if ($IMtempSourceFilename = $this->phpThumb_tempnam()) { - $IMtempSourceFilename = realpath($IMtempSourceFilename); - $this->sourceFilename = $IMtempSourceFilename; - $this->DebugMessage('ImageMagickThumbnailToGD() setting $this->sourceFilename to "'.$IMtempSourceFilename.'" from $this->rawImageData ('.strlen($this->rawImageData).' bytes)', __FILE__, __LINE__); - } - } - if (!$this->sourceFilename) { - $this->DebugMessage('ImageMagickThumbnailToGD() aborting because $this->sourceFilename is empty', __FILE__, __LINE__); - $this->useRawIMoutput = false; - return false; - } - - $commandline = $this->ImageMagickCommandlineBase(); - if ($commandline) { - if ($IMtempfilename = $this->phpThumb_tempnam()) { - $IMtempfilename = realpath($IMtempfilename); - - $IMuseExplicitImageOutputDimensions = false; - if ($this->ImageMagickSwitchAvailable('thumbnail') && $this->config_imagemagick_use_thumbnail) { - $IMresizeParameter = 'thumbnail'; - } else { - $IMresizeParameter = 'resize'; - - // some (older? around 2002) versions of IM won't accept "-resize 100x" but require "-resize 100x100" - $commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x "'.$IMtempfilename.'" 2>&1'; - $IMresult_test = phpthumb_functions::SafeExec($commandline_test); - $IMuseExplicitImageOutputDimensions = preg_match('/image dimensions are zero/i', $IMresult_test); - $this->DebugMessage('IMuseExplicitImageOutputDimensions = '.intval($IMuseExplicitImageOutputDimensions), __FILE__, __LINE__); - if ($fp_im_temp = @fopen($IMtempfilename, 'wb')) { - // erase temp image so ImageMagick logo doesn't get output if other processing fails - fclose($fp_im_temp); - } - } - - - if (!is_null($this->dpi) && $this->ImageMagickSwitchAvailable('density')) { - // for raster source formats only (WMF, PDF, etc) - $commandline .= ' -density '.$this->dpi; - } - ob_start(); - $getimagesize = GetImageSize($this->sourceFilename); - $GetImageSizeError = ob_get_contents(); - ob_end_clean(); - if (is_array($getimagesize)) { - $this->DebugMessage('GetImageSize('.$this->sourceFilename.') SUCCEEDED: '.serialize($getimagesize), __FILE__, __LINE__); - } else { - $this->DebugMessage('GetImageSize('.$this->sourceFilename.') FAILED with error "'.$GetImageSizeError.'"', __FILE__, __LINE__); - } - if (is_array($getimagesize)) { - $this->DebugMessage('GetImageSize('.$this->sourceFilename.') returned [w='.$getimagesize[0].';h='.$getimagesize[1].';f='.$getimagesize[2].']', __FILE__, __LINE__); - $this->source_width = $getimagesize[0]; - $this->source_height = $getimagesize[1]; - $this->DebugMessage('source dimensions set to '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__); - $this->SetOrientationDependantWidthHeight(); - - if (!preg_match('/('.implode('|', $this->AlphaCapableFormats).')/i', $outputFormat)) { - // not a transparency-capable format - $commandline .= ' -background "#'.($this->bg ? $this->bg : 'FFFFFF').'"'; - if ($getimagesize[2] == 1) { - // GIF - $commandline .= ' -flatten'; - } - } - if ($getimagesize[2] == 1) { - // GIF - $commandline .= ' -coalesce'; // may be needed for animated GIFs - } - if ($this->source_width || $this->source_height) { - if ($this->zc) { - - $borderThickness = 0; - if (!empty($this->fltr)) { - foreach ($this->fltr as $key => $value) { - if (preg_match('/^bord\|([0-9]+)/', $value, $matches)) { - $borderThickness = $matches[1]; - break; - } - } - } - $wAll = intval(max($this->w, $this->wp, $this->wl, $this->ws)) - (2 * $borderThickness); - $hAll = intval(max($this->h, $this->hp, $this->hl, $this->hs)) - (2 * $borderThickness); - $imAR = $this->source_width / $this->source_height; - $zcAR = (($wAll && $hAll) ? $wAll / $hAll : 1); - $side = phpthumb_functions::nonempty_min($this->source_width, $this->source_height, max($wAll, $hAll)); - $sideX = phpthumb_functions::nonempty_min($this->source_width, $wAll, round($hAll * $zcAR)); - $sideY = phpthumb_functions::nonempty_min( $this->source_height, $hAll, round($wAll / $zcAR)); - - $thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR)); - if ($IMuseExplicitImageOutputDimensions) { - $commandline .= ' -'.$IMresizeParameter.' '.$thumbnailH.'x'.$thumbnailH; - } else { - $commandline .= ' -'.$IMresizeParameter.' x'.$thumbnailH; - } - - switch (strtoupper($this->zc)) { - case 'T': - $commandline .= ' -gravity north'; - break; - case 'B': - $commandline .= ' -gravity south'; - break; - case 'L': - $commandline .= ' -gravity west'; - break; - case 'R': - $commandline .= ' -gravity east'; - break; - case 'TL': - $commandline .= ' -gravity northwest'; - break; - case 'TR': - $commandline .= ' -gravity northeast'; - break; - case 'BL': - $commandline .= ' -gravity southwest'; - break; - case 'BR': - $commandline .= ' -gravity southeast'; - break; - case '1': - case 'C': - default: - $commandline .= ' -gravity center'; - break; - } - - if (($wAll > 0) && ($hAll > 0)) { - $commandline .= ' -crop '.$wAll.'x'.$hAll.'+0+0'; - } else { - $commandline .= ' -crop '.$side.'x'.$side.'+0+0'; - } - if ($this->ImageMagickSwitchAvailable('repage')) { - $commandline .= ' +repage'; - } else { - $this->DebugMessage('Skipping "+repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__); - } - - } elseif ($this->sw || $this->sh || $this->sx || $this->sy) { - - $commandline .= ' -crop '.($this->sw ? $this->sw : $this->source_width).'x'.($this->sh ? $this->sh : $this->source_height).'+'.$this->sx.'+'.$this->sy; - // this is broken for aoe=1, but unsure how to fix. Send advice to info@silisoftware.com - if ($this->w || $this->h) { - if ($this->ImageMagickSwitchAvailable('repage')) { - $commandline .= ' -repage'; - } else { - $this->DebugMessage('Skipping "-repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__); - } - if ($IMuseExplicitImageOutputDimensions) { - if ($this->w && !$this->h) { - $this->h = ceil($this->w / ($this->source_width / $this->source_height)); - } elseif ($this->h && !$this->w) { - $this->w = ceil($this->h * ($this->source_width / $this->source_height)); - } - } - $commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h; - } - - } else { - - if ($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) { - //$commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h.'!'; - list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra); - $nw = ((round($nw) != 0) ? round($nw) : ''); - $nh = ((round($nh) != 0) ? round($nh) : ''); - $commandline .= ' -'.$IMresizeParameter.' '.$nw.'x'.$nh.'!'; - } else { - $this->w = ((($this->aoe || $this->far) && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : '')); - $this->h = ((($this->aoe || $this->far) && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : '')); - if ($this->w || $this->h) { - if ($IMuseExplicitImageOutputDimensions) { - if ($this->w && !$this->h) { - $this->h = ceil($this->w / ($this->source_width / $this->source_height)); - } elseif ($this->h && !$this->w) { - $this->w = ceil($this->h * ($this->source_width / $this->source_height)); - } - } - //$commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h; - list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra); - $nw = ((round($nw) != 0) ? round($nw) : ''); - $nh = ((round($nh) != 0) ? round($nh) : ''); - $commandline .= ' -'.$IMresizeParameter.' '.$nw.'x'.$nh; - } - } - } - } - - } else { - - $this->DebugMessage('GetImageSize('.$this->sourceFilename.') failed', __FILE__, __LINE__); - if ($this->w || $this->h) { - if ($IMuseExplicitImageOutputDimensions) { - // unknown source aspect ration, just put large number and hope IM figures it out - $commandline .= ' -'.$IMresizeParameter.' '.($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999'); - } else { - $commandline .= ' -'.$IMresizeParameter.' '.$this->w.'x'.$this->h; - } - if ($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) { - $commandline .= '!'; - } - } - - } - - if ($this->ra) { - $this->ra = intval($this->ra); - if ($this->ImageMagickSwitchAvailable('rotate')) { - if (!preg_match('/('.implode('|', $this->AlphaCapableFormats).')/i', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) { - $this->DebugMessage('Using ImageMagick rotate', __FILE__, __LINE__); - $commandline .= ' -rotate '.$this->ra; - if (($this->ra % 90) != 0) { - if (preg_match('/('.implode('|', $this->AlphaCapableFormats).')/i', $outputFormat)) { - // alpha-capable format - $commandline .= ' -background rgba(255,255,255,0)'; - } else { - $commandline .= ' -background "#'.($this->bg ? $this->bg : 'FFFFFF').'"'; - } - } - $this->ra = 0; - } else { - $this->DebugMessage('Not using ImageMagick rotate because alpha background buggy before v6.3.7', __FILE__, __LINE__); - } - } else { - $this->DebugMessage('Not using ImageMagick rotate because not supported', __FILE__, __LINE__); - } - } - - foreach ($this->fltr as $filterkey => $filtercommand) { - @list($command, $parameter) = explode('|', $filtercommand, 2); - switch ($command) { - case 'brit': - if ($this->ImageMagickSwitchAvailable('modulate')) { - $commandline .= ' -modulate '.(100 + $parameter).',100,100'; - unset($this->fltr[$filterkey]); - } - break; - - case 'cont': - if ($this->ImageMagickSwitchAvailable('contrast')) { - $contDiv10 = round($parameter / 10); - if ($contDiv10 > 0) { - for ($i = 0; $i < $contDiv10; $i++) { - $commandline .= ' -contrast'; // increase contrast by 10% - } - } elseif ($contDiv10 < 0) { - for ($i = $contDiv10; $i < 0; $i++) { - $commandline .= ' +contrast'; // decrease contrast by 10% - } - } else { - // do nothing - } - unset($this->fltr[$filterkey]); - } - break; - - case 'ds': - if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) { - if ($parameter == 100) { - $commandline .= ' -colorspace GRAY -modulate 100,0,100'; - } else { - $commandline .= ' -modulate 100,'.(100 - $parameter).',100'; - } - unset($this->fltr[$filterkey]); - } - break; - - case 'sat': - if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) { - if ($parameter == -100) { - $commandline .= ' -colorspace GRAY -modulate 100,0,100'; - } else { - $commandline .= ' -modulate 100,'.(100 + $parameter).',100'; - } - unset($this->fltr[$filterkey]); - } - break; - - case 'gray': - if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) { - $commandline .= ' -colorspace GRAY -modulate 100,0,100'; - //$commandline .= ' -colorspace GRAY'; - unset($this->fltr[$filterkey]); - } - break; - - case 'clr': - if ($this->ImageMagickSwitchAvailable(array('fill', 'colorize'))) { - @list($amount, $color) = explode('|', $parameter); - $commandline .= ' -fill "#'.$color.'" -colorize '.$amount; - } - break; - - case 'sep': - if ($this->ImageMagickSwitchAvailable('sepia-tone')) { - @list($amount, $color) = explode('|', $parameter); - $amount = ($amount ? $amount : 80); - if (!$color) { - $commandline .= ' -sepia-tone '.$amount.'%'; - unset($this->fltr[$filterkey]); - } - } - break; - - case 'gam': - if ($this->ImageMagickSwitchAvailable('gamma')) { - $commandline .= ' -gamma '.$parameter; - unset($this->fltr[$filterkey]); - } - break; - - case 'neg': - if ($this->ImageMagickSwitchAvailable('negate')) { - $commandline .= ' -negate'; - unset($this->fltr[$filterkey]); - } - break; - - case 'th': - if ($this->ImageMagickSwitchAvailable(array('threshold', 'dither', 'monochrome'))) { - $commandline .= ' -threshold '.round($parameter / 2.55).'% -dither -monochrome'; - unset($this->fltr[$filterkey]); - } - break; - - case 'rcd': - if ($this->ImageMagickSwitchAvailable(array('colors', 'dither'))) { - @list($colors, $dither) = explode('|', $parameter); - $colors = ($colors ? (int) $colors : 256); - $dither = ((strlen($dither) > 0) ? (bool) $dither : true); - $commandline .= ' -colors '.max($colors, 8); // ImageMagick will otherwise fail with "cannot quantize to fewer than 8 colors" - $commandline .= ($dither ? ' -dither' : ' +dither'); - unset($this->fltr[$filterkey]); - } - break; - - case 'flip': - if ($this->ImageMagickSwitchAvailable(array('flip', 'flop'))) { - if (strpos(strtolower($parameter), 'x') !== false) { - $commandline .= ' -flop'; - } - if (strpos(strtolower($parameter), 'y') !== false) { - $commandline .= ' -flip'; - } - unset($this->fltr[$filterkey]); - } - break; - - case 'edge': - if ($this->ImageMagickSwitchAvailable('edge')) { - $parameter = ($parameter ? $parameter : 2); - $commandline .= ' -edge '.($parameter ? $parameter : 1); - unset($this->fltr[$filterkey]); - } - break; - - case 'emb': - if ($this->ImageMagickSwitchAvailable(array('emboss', 'negate'))) { - $parameter = ($parameter ? $parameter : 2); - $commandline .= ' -emboss '.$parameter; - if ($parameter < 2) { - $commandline .= ' -negate'; // ImageMagick negates the image for some reason with '-emboss 1'; - } - unset($this->fltr[$filterkey]); - } - break; - - case 'lvl': - @list($band, $method, $threshold) = explode('|', $parameter); - $band = ($band ? preg_replace('/[^RGBA\\*]/', '', strtoupper($band)) : '*'); - $method = ((strlen($method) > 0) ? intval($method) : 2); - $threshold = ((strlen($threshold) > 0) ? floatval($threshold) : 0.1); - - $band = preg_replace('/[^RGBA\\*]/', '', strtoupper($band)); - - if (($method > 1) && !$this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) { - // Because ImageMagick processing happens before PHP-GD filters, and because some - // clipping is involved in the "lvl" filter, if "lvl" happens before "wb" then the - // "wb" filter will have (almost) no effect. Therefore, if "wb" is enabled then - // force the "lvl" filter to be processed by GD, not ImageMagick. - foreach ($this->fltr as $fltr_key => $fltr_value) { - list($fltr_cmd) = explode('|', $fltr_value); - if ($fltr_cmd == 'wb') { - $this->DebugMessage('Setting "lvl" filter method to "0" (from "'.$method.'") because white-balance filter also enabled', __FILE__, __LINE__); - $method = 0; - } - } - } - - switch ($method) { - case 0: // internal RGB - case 1: // internal grayscale - break; - case 2: // ImageMagick "contrast-stretch" - if ($this->ImageMagickSwitchAvailable('contrast-stretch')) { - $thiscommand = ' -contrast-stretch '.$threshold.'%'; - $commandline .= (($band == '*') ? $thiscommand : ' -channel '.strtoupper($band).$thiscommand.' +channel'); - unset($this->fltr[$filterkey]); - } - break; - case 3: // ImageMagick "normalize" - if ($this->ImageMagickSwitchAvailable('normalize')) { - $thiscommand = ' -normalize'; - $commandline .= (($band == '*') ? $thiscommand : ' -channel '.strtoupper($band).$thiscommand.' +channel'); - unset($this->fltr[$filterkey]); - } - break; - default: - $this->DebugMessage('unsupported method ('.$method.') for "lvl" filter', __FILE__, __LINE__); - break; - } - if (isset($this->fltr[$filterkey]) && ($method > 1)) { - $this->fltr[$filterkey] = $command.'|'.$band.'|0|'.$threshold; - $this->DebugMessage('filter "lvl" remapped from method "'.$method.'" to method "0" because ImageMagick support is missing', __FILE__, __LINE__); - } - break; - - case 'wb': - if ($this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) { - @list($threshold) = explode('|', $parameter); - $threshold = (is_float($threshold) ? $threshold : 0.1); - $commandline .= ' -channel R -contrast-stretch '.$threshold.'%'; - $commandline .= ' -channel G -contrast-stretch '.$threshold.'%'; - $commandline .= ' -channel B -contrast-stretch '.$threshold.'%'; - $commandline .= ' +channel'; - unset($this->fltr[$filterkey]); - } - break; - - case 'blur': - if ($this->ImageMagickSwitchAvailable('blur')) { - @list($radius) = explode('|', $parameter); - $radius = ($radius ? $radius : 1); - $commandline .= ' -blur '.$radius; - unset($this->fltr[$filterkey]); - } - break; - - case 'gblr': - if ($this->ImageMagickSwitchAvailable('gaussian')) { - @list($radius) = explode('|', $parameter); - $radius = ($radius ? $radius : 1); - $commandline .= ' -gaussian '.$radius; - unset($this->fltr[$filterkey]); - } - break; - - case 'usm': - if ($this->ImageMagickSwitchAvailable('unsharp')) { - @list($amount, $radius, $threshold) = explode('|', $parameter); - $amount = ($amount ? $amount : 80); - $radius = ($radius ? $radius : 0.5); - $threshold = (strlen($threshold) ? $threshold : 3); - $commandline .= ' -unsharp '.number_format(($radius * 2) - 1, 2).'x1+'.number_format($amount / 100, 2).'+'.number_format($threshold / 100, 2); - unset($this->fltr[$filterkey]); - } - break; - - case 'bord': - if ($this->ImageMagickSwitchAvailable(array('border', 'bordercolor', 'thumbnail', 'crop'))) { - if (!$this->zc) { - @list($width, $rX, $rY, $color) = explode('|', $parameter); - if ($width && !$rX && !$rY) { - if (!phpthumb_functions::IsHexColor($color)) { - $color = ($this->bc ? $this->bc : '000000'); - } - $commandline .= ' -border '.$width.' -bordercolor "#'.$color.'"'; - if (preg_match('# \-crop ([0-9]+)x([0-9]+)\+0\+0 #', $commandline, $matches)) { - $commandline = str_replace(' -crop '.$matches[1].'x'.$matches[2].'+0+0 ', ' -crop '.($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width)).'+0+0 ', $commandline); - } elseif (preg_match('# \-'.$IMresizeParameter.' ([0-9]+)x([0-9]+) #', $commandline, $matches)) { - $commandline = str_replace(' -'.$IMresizeParameter.' '.$matches[1].'x'.$matches[2].' ', ' -'.$IMresizeParameter.' '.($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width)).' ', $commandline); - } - unset($this->fltr[$filterkey]); - } - } - } - break; - - case 'crop': - break; - - case 'sblr': - break; - - case 'mean': - break; - - case 'smth': - break; - - case 'bvl': - break; - - case 'wmi': - break; - - case 'wmt': - break; - - case 'over': - break; - - case 'hist': - break; - - case 'fram': - break; - - case 'drop': - break; - - case 'mask': - break; - - case 'elip': - break; - - case 'ric': - break; - - case 'stc': - break; - - case 'size': - break; - - default: - $this->DebugMessage('Unknown $this->fltr['.$filterkey.'] ('.$filtercommand.') -- deleting filter command', __FILE__, __LINE__); - unset($this->fltr[$filterkey]); - break; - } - if (!isset($this->fltr[$filterkey])) { - $this->DebugMessage('Processed $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__); - } else { - $this->DebugMessage('Skipping $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__); - } - } - $this->DebugMessage('Remaining $this->fltr after ImageMagick: ('.$this->phpThumbDebugVarDump($this->fltr).')', __FILE__, __LINE__); - if (count($this->fltr) > 0) { - $this->useRawIMoutput = false; - } - - if (preg_match('/jpe?g/i', $outputFormat) && $this->q) { - if ($this->ImageMagickSwitchAvailable(array('quality', 'interlace'))) { - $commandline .= ' -quality '.$this->thumbnailQuality; - if ($this->config_output_interlace) { - // causes weird things with animated GIF... leave for JPEG only - $commandline .= ' -interlace line '; // Use Line or Plane to create an interlaced PNG or GIF or progressive JPEG image - } - } - } - $commandline .= ' "'.str_replace('/', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['.intval($this->sfn).']').'"'; // [0] means first frame of (GIF) animation, can be ignored - $commandline .= ' '.$outputFormat.':"'.$IMtempfilename.'"'; - if (!$this->iswindows) { - $commandline .= ' 2>&1'; - } - $this->DebugMessage('ImageMagick called as ('.$commandline.')', __FILE__, __LINE__); - $IMresult = phpthumb_functions::SafeExec($commandline); - clearstatcache(); - if (@$IMtempSourceFilename && file_exists($IMtempSourceFilename)) { - @unlink($IMtempSourceFilename); - } - if (!@file_exists($IMtempfilename) || !@filesize($IMtempfilename)) { - $this->FatalError('ImageMagick failed with message ('.trim($IMresult).')'); - $this->DebugMessage('ImageMagick failed with message ('.trim($IMresult).')', __FILE__, __LINE__); - if ($this->iswindows && !$IMresult) { - $this->DebugMessage('Check to make sure that PHP has read+write permissions to "'.dirname($IMtempfilename).'"', __FILE__, __LINE__); - } - - } else { - - $this->IMresizedData = file_get_contents($IMtempfilename); - $getimagesize_imresized = @GetImageSize($IMtempfilename); - $this->DebugMessage('GetImageSize('.$IMtempfilename.') returned [w='.$getimagesize_imresized[0].';h='.$getimagesize_imresized[1].';f='.$getimagesize_imresized[2].']', __FILE__, __LINE__); - if (($this->config_max_source_pixels > 0) && (($getimagesize_imresized[0] * $getimagesize_imresized[1]) > $this->config_max_source_pixels)) { - $this->DebugMessage('skipping ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() because IM output is too large ('.$getimagesize_imresized[0].'x'.$getimagesize_imresized[0].' = '.($getimagesize_imresized[0] * $getimagesize_imresized[1]).' > '.$this->config_max_source_pixels.')', __FILE__, __LINE__); - } elseif (function_exists(@$ImageCreateFunction) && ($this->gdimg_source = @$ImageCreateFunction($IMtempfilename))) { - $this->source_width = ImageSX($this->gdimg_source); - $this->source_height = ImageSY($this->gdimg_source); - $this->DebugMessage('ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() succeeded, $this->gdimg_source is now ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__); - $this->DebugMessage('ImageMagickThumbnailToGD() returning $this->IMresizedData ('.strlen($this->IMresizedData).' bytes)', __FILE__, __LINE__); - } else { - $this->useRawIMoutput = true; - $this->DebugMessage('$this->useRawIMoutput set to TRUE because '.@$ImageCreateFunction.'('.$IMtempfilename.') failed', __FILE__, __LINE__); - } - @unlink($IMtempfilename); - return true; - - } - unlink($IMtempfilename); - - } else { - $this->DebugMessage('ImageMagickThumbnailToGD() aborting, phpThumb_tempnam() failed', __FILE__, __LINE__); - } - } else { - $this->DebugMessage('ImageMagickThumbnailToGD() aborting because ImageMagickCommandlineBase() failed', __FILE__, __LINE__); - } - $this->useRawIMoutput = false; - return false; - } - - - function Rotate() { - if ($this->ra || $this->ar) { - if (!function_exists('ImageRotate')) { - $this->DebugMessage('!function_exists(ImageRotate)', __FILE__, __LINE__); - return false; - } - if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) { - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__); - return false; - } - - $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor); - if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) { - return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"'); - } - - $rotate_angle = 0; - if ($this->ra) { - - $rotate_angle = floatval($this->ra); - - } else { - - if ($this->ar == 'x') { - if (phpthumb_functions::version_compare_replacement(phpversion(), '4.2.0', '>=')) { - if ($this->sourceFilename) { - if (function_exists('exif_read_data')) { - if ($exif_data = @exif_read_data($this->sourceFilename, 'IFD0')) { - // http://sylvana.net/jpegcrop/exif_orientation.html - switch (@$exif_data['Orientation']) { - case 1: - $rotate_angle = 0; - break; - case 3: - $rotate_angle = 180; - break; - case 6: - $rotate_angle = 270; - break; - case 8: - $rotate_angle = 90; - break; - - default: - $this->DebugMessage('EXIF auto-rotate failed because unknown $exif_data[Orientation] "'.@$exif_data['Orientation'].'"', __FILE__, __LINE__); - return false; - break; - } - $this->DebugMessage('EXIF auto-rotate set to '.$rotate_angle.' degrees ($exif_data[Orientation] = "'.@$exif_data['Orientation'].'")', __FILE__, __LINE__); - } else { - $this->DebugMessage('failed: exif_read_data('.$this->sourceFilename.')', __FILE__, __LINE__); - return false; - } - } else { - $this->DebugMessage('!function_exists(exif_read_data)', __FILE__, __LINE__); - return false; - } - } else { - $this->DebugMessage('Cannot auto-rotate from EXIF data because $this->sourceFilename is empty', __FILE__, __LINE__); - return false; - } - } else { - $this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('.phpversion().')', __FILE__, __LINE__); - return false; - } - } elseif (($this->ar == 'l') && ($this->source_height > $this->source_width)) { - $rotate_angle = 270; - } elseif (($this->ar == 'L') && ($this->source_height > $this->source_width)) { - $rotate_angle = 90; - } elseif (($this->ar == 'p') && ($this->source_width > $this->source_height)) { - $rotate_angle = 90; - } elseif (($this->ar == 'P') && ($this->source_width > $this->source_height)) { - $rotate_angle = 270; - } - - } - if ($rotate_angle % 90) { - $this->is_alpha = true; - } - phpthumb_filters::ImprovedImageRotate($this->gdimg_source, $rotate_angle, $this->config_background_hexcolor, $this->bg); - $this->source_width = ImageSX($this->gdimg_source); - $this->source_height = ImageSY($this->gdimg_source); - } - return true; - } - - - function FixedAspectRatio() { - // optional fixed-dimension images (regardless of aspect ratio) - - if (!$this->far) { - // do nothing - return true; - } - - if (!$this->w || !$this->h) { - return false; - } - $this->thumbnail_width = $this->w; - $this->thumbnail_height = $this->h; - $this->is_alpha = true; - if ($this->thumbnail_image_width >= $this->thumbnail_width) { - - if ($this->w) { - $aspectratio = $this->thumbnail_image_height / $this->thumbnail_image_width; - $this->thumbnail_image_height = round($this->thumbnail_image_width * $aspectratio); - $this->thumbnail_height = ($this->h ? $this->h : $this->thumbnail_image_height); - } elseif ($this->thumbnail_image_height < $this->thumbnail_height) { - $this->thumbnail_image_height = $this->thumbnail_height; - $this->thumbnail_image_width = round($this->thumbnail_image_height / $aspectratio); - } - - } else { - if ($this->h) { - $aspectratio = $this->thumbnail_image_width / $this->thumbnail_image_height; - $this->thumbnail_image_width = round($this->thumbnail_image_height * $aspectratio); - } elseif ($this->thumbnail_image_width < $this->thumbnail_width) { - $this->thumbnail_image_width = $this->thumbnail_width; - $this->thumbnail_image_height = round($this->thumbnail_image_width / $aspectratio); - } - - } - return true; - } - - - function OffsiteDomainIsAllowed($hostname, $allowed_domains) { - static $domain_is_allowed = array(); - $hostname = strtolower($hostname); - if (!isset($domain_is_allowed[$hostname])) { - $domain_is_allowed[$hostname] = false; - foreach ($allowed_domains as $valid_domain) { - $starpos = strpos($valid_domain, '*'); - if ($starpos !== false) { - $valid_domain = substr($valid_domain, $starpos + 1); - if (preg_match('/'.$valid_domain.'$/i', $hostname)) { - $domain_is_allowed[$hostname] = true; - break; - } - } else { - if (strtolower($valid_domain) === $hostname) { - $domain_is_allowed[$hostname] = true; - break; - } - } - } - } - return $domain_is_allowed[$hostname]; - } - - - function AntiOffsiteLinking() { - // Optional anti-offsite hijacking of the thumbnail script - $allow = true; - if ($allow && $this->config_nooffsitelink_enabled && (@$_SERVER['HTTP_REFERER'] || $this->config_nooffsitelink_require_refer)) { - $this->DebugMessage('AntiOffsiteLinking() checking $_SERVER[HTTP_REFERER] "'.@$_SERVER['HTTP_REFERER'].'"', __FILE__, __LINE__); - foreach ($this->config_nooffsitelink_valid_domains as $key => $valid_domain) { - // $_SERVER['HTTP_HOST'] contains the port number, so strip it out here to make default configuration work - list($clean_domain) = explode(':', $valid_domain); - $this->config_nooffsitelink_valid_domains[$key] = $clean_domain; - } - $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']); - if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nooffsitelink_valid_domains)) { - $allow = false; - $erase = $this->config_nooffsitelink_erase_image; - $message = $this->config_nooffsitelink_text_message; -$this->ErrorImage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')'); -exit; - $this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__); - } else { - $this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__); - } - } - - if ($allow && $this->config_nohotlink_enabled && preg_match('/^(f|ht)tps?\:\/\//i', $this->src)) { - $parsed_url = phpthumb_functions::ParseURLbetter($this->src); - //if (!phpthumb_functions::CaseInsensitiveInArray(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) { - if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) { - // This domain is not allowed - $allow = false; - $erase = $this->config_nohotlink_erase_image; - $message = $this->config_nohotlink_text_message; - $this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is NOT in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__); - } else { - $this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__); - } - } - - if ($allow) { - $this->DebugMessage('AntiOffsiteLinking() says this is allowed', __FILE__, __LINE__); - return true; - } - - if (!phpthumb_functions::IsHexColor($this->config_error_bgcolor)) { - return $this->ErrorImage('Invalid hex color string "'.$this->config_error_bgcolor.'" for $this->config_error_bgcolor'); - } - if (!phpthumb_functions::IsHexColor($this->config_error_textcolor)) { - return $this->ErrorImage('Invalid hex color string "'.$this->config_error_textcolor.'" for $this->config_error_textcolor'); - } - if ($erase) { - - return $this->ErrorImage($message, $this->thumbnail_width, $this->thumbnail_height, $this->config_error_bgcolor, $this->config_error_textcolor, $this->config_error_fontsize); - - } else { - - $this->config_nooffsitelink_watermark_src = $this->ResolveFilenameToAbsolute($this->config_nooffsitelink_watermark_src); - if (is_file($this->config_nooffsitelink_watermark_src)) { - - if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) { - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__); - return false; - } - $watermark_img = $this->ImageCreateFromStringReplacement(file_get_contents($this->config_nooffsitelink_watermark_src)); - $phpthumbFilters = new phpthumb_filters(); - $phpthumbFilters->phpThumbObject = &$this; - $opacity = 50; - $margin = 5; - $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $watermark_img, '*', $opacity, $margin); - ImageDestroy($watermark_img); - unset($phpthumbFilters); - - } else { - - $nohotlink_text_array = explode("\n", wordwrap($message, floor($this->thumbnail_width / ImageFontWidth($this->config_error_fontsize)), "\n")); - $nohotlink_text_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_error_textcolor); - - $topoffset = round(($this->thumbnail_height - (count($nohotlink_text_array) * ImageFontHeight($this->config_error_fontsize))) / 2); - - $rowcounter = 0; - $this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__); - foreach ($nohotlink_text_array as $textline) { - $leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * ImageFontWidth($this->config_error_fontsize))) / 2)); - ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color); - } - - } - - } - return true; - } - - - function AlphaChannelFlatten() { - if (!$this->is_alpha) { - // image doesn't have alpha transparency, no need to flatten - $this->DebugMessage('skipping AlphaChannelFlatten() because !$this->is_alpha', __FILE__, __LINE__); - return false; - } - switch ($this->thumbnailFormat) { - case 'png': - case 'ico': - // image has alpha transparency, but output as PNG or ICO which can handle it - $this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'")', __FILE__, __LINE__); - return false; - break; - - case 'gif': - // image has alpha transparency, but output as GIF which can handle only single-color transparency - $CurrentImageColorTransparent = ImageColorTransparent($this->gdimg_output); - if ($CurrentImageColorTransparent == -1) { - // no transparent color defined - - if (phpthumb_functions::gd_version() < 2.0) { - $this->DebugMessage('AlphaChannelFlatten() failed because GD version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - - if ($img_alpha_mixdown_dither = @ImageCreateTrueColor(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) { - - for ($i = 0; $i <= 255; $i++) { - $dither_color[$i] = ImageColorAllocate($img_alpha_mixdown_dither, $i, $i, $i); - } - - // scan through current truecolor image copy alpha channel to temp image as grayscale - for ($x = 0; $x < $this->thumbnail_width; $x++) { - for ($y = 0; $y < $this->thumbnail_height; $y++) { - $PixelColor = phpthumb_functions::GetPixelColor($this->gdimg_output, $x, $y); - ImageSetPixel($img_alpha_mixdown_dither, $x, $y, $dither_color[($PixelColor['alpha'] * 2)]); - } - } - - // dither alpha channel grayscale version down to 2 colors - ImageTrueColorToPalette($img_alpha_mixdown_dither, true, 2); - - // reduce color palette to 256-1 colors (leave one palette position for transparent color) - ImageTrueColorToPalette($this->gdimg_output, true, 255); - - // allocate a new color for transparent color index - $TransparentColor = ImageColorAllocate($this->gdimg_output, 1, 254, 253); - ImageColorTransparent($this->gdimg_output, $TransparentColor); - - // scan through alpha channel image and note pixels with >50% transparency - $TransparentPixels = array(); - for ($x = 0; $x < $this->thumbnail_width; $x++) { - for ($y = 0; $y < $this->thumbnail_height; $y++) { - $AlphaChannelPixel = phpthumb_functions::GetPixelColor($img_alpha_mixdown_dither, $x, $y); - if ($AlphaChannelPixel['red'] > 127) { - ImageSetPixel($this->gdimg_output, $x, $y, $TransparentColor); - } - } - } - ImageDestroy($img_alpha_mixdown_dither); - - $this->DebugMessage('AlphaChannelFlatten() set image to 255+1 colors with transparency for GIF output', __FILE__, __LINE__); - return true; - - } else { - $this->DebugMessage('AlphaChannelFlatten() failed ImageCreate('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).')', __FILE__, __LINE__); - return false; - } - - } else { - // a single transparent color already defined, leave as-is - $this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'") and ImageColorTransparent returned "'.$CurrentImageColorTransparent.'"', __FILE__, __LINE__); - return true; - } - break; - } - $this->DebugMessage('continuing AlphaChannelFlatten() for output format "'.$this->thumbnailFormat.'"', __FILE__, __LINE__); - // image has alpha transparency, and is being output in a format that doesn't support it -- flatten - if ($gdimg_flatten_temp = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height)) { - - $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor); - if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) { - return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"'); - } - $background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor); - ImageFilledRectangle($gdimg_flatten_temp, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color); - ImageCopy($gdimg_flatten_temp, $this->gdimg_output, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height); - - ImageAlphaBlending($this->gdimg_output, true); - ImageSaveAlpha($this->gdimg_output, false); - ImageColorTransparent($this->gdimg_output, -1); - ImageCopy($this->gdimg_output, $gdimg_flatten_temp, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height); - - ImageDestroy($gdimg_flatten_temp); - return true; - - } else { - $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__); - } - return false; - } - - - function ApplyFilters() { - if ($this->fltr && is_array($this->fltr)) { - if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) { - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__); - return false; - } - $phpthumbFilters = new phpthumb_filters(); - $phpthumbFilters->phpThumbObject = &$this; - foreach ($this->fltr as $filtercommand) { - @list($command, $parameter) = explode('|', $filtercommand, 2); - $this->DebugMessage('Attempting to process filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__); - switch ($command) { - case 'brit': // Brightness - $phpthumbFilters->Brightness($this->gdimg_output, $parameter); - break; - - case 'cont': // Contrast - $phpthumbFilters->Contrast($this->gdimg_output, $parameter); - break; - - case 'ds': // Desaturation - $phpthumbFilters->Desaturate($this->gdimg_output, $parameter, ''); - break; - - case 'sat': // Saturation - $phpthumbFilters->Saturation($this->gdimg_output, $parameter, ''); - break; - - case 'gray': // Grayscale - $phpthumbFilters->Grayscale($this->gdimg_output); - break; - - case 'clr': // Colorize - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping Colorize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - break; - } - @list($amount, $color) = explode('|', $parameter); - $phpthumbFilters->Colorize($this->gdimg_output, $amount, $color); - break; - - case 'sep': // Sepia - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping Sepia() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - break; - } - @list($amount, $color) = explode('|', $parameter); - $phpthumbFilters->Sepia($this->gdimg_output, $amount, $color); - break; - - case 'gam': // Gamma correction - $phpthumbFilters->Gamma($this->gdimg_output, $parameter); - break; - - case 'neg': // Negative colors - $phpthumbFilters->Negative($this->gdimg_output); - break; - - case 'th': // Threshold - $phpthumbFilters->Threshold($this->gdimg_output, $parameter); - break; - - case 'rcd': // ReduceColorDepth - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping ReduceColorDepth() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - break; - } - @list($colors, $dither) = explode('|', $parameter); - $colors = ($colors ? (int) $colors : 256); - $dither = ((strlen($dither) > 0) ? (bool) $dither : true); - $phpthumbFilters->ReduceColorDepth($this->gdimg_output, $colors, $dither); - break; - - case 'flip': // Flip - $phpthumbFilters->Flip($this->gdimg_output, (strpos(strtolower($parameter), 'x') !== false), (strpos(strtolower($parameter), 'y') !== false)); - break; - - case 'edge': // EdgeDetect - $phpthumbFilters->EdgeDetect($this->gdimg_output); - break; - - case 'emb': // Emboss - $phpthumbFilters->Emboss($this->gdimg_output); - break; - - case 'bvl': // Bevel - @list($width, $color1, $color2) = explode('|', $parameter); - $phpthumbFilters->Bevel($this->gdimg_output, $width, $color1, $color2); - break; - - case 'lvl': // autoLevels - @list($band, $method, $threshold) = explode('|', $parameter); - $band = ($band ? preg_replace('/[^RGBA\\*]/', '', strtoupper($band)) : '*'); - $method = ((strlen($method) > 0) ? intval($method) : 2); - $threshold = ((strlen($threshold) > 0) ? floatval($threshold) : 0.1); - - $phpthumbFilters->HistogramStretch($this->gdimg_output, $band, $method, $threshold); - break; - - case 'wb': // WhiteBalance - $phpthumbFilters->WhiteBalance($this->gdimg_output, $parameter); - break; - - case 'hist': // Histogram overlay - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping HistogramOverlay() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - break; - } - @list($bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y) = explode('|', $parameter); - $bands = ($bands ? $bands : '*'); - $colors = ($colors ? $colors : ''); - $width = ($width ? $width : 0.25); - $height = ($height ? $height : 0.25); - $alignment = ($alignment ? $alignment : 'BR'); - $opacity = ($opacity ? $opacity : 50); - $margin_x = ($margin_x ? $margin_x : 5); - $margin_y = $margin_y; // just to note it wasn't forgotten, but let the value always pass unchanged - $phpthumbFilters->HistogramOverlay($this->gdimg_output, $bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y); - break; - - case 'fram': // Frame - @list($frame_width, $edge_width, $color_frame, $color1, $color2) = explode('|', $parameter); - $phpthumbFilters->Frame($this->gdimg_output, $frame_width, $edge_width, $color_frame, $color1, $color2); - break; - - case 'drop': // DropShadow - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping DropShadow() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - $this->is_alpha = true; - @list($distance, $width, $color, $angle, $fade) = explode('|', $parameter); - $phpthumbFilters->DropShadow($this->gdimg_output, $distance, $width, $color, $angle, $fade); - break; - - case 'mask': // Mask cropping - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping Mask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - $mask_filename = $this->ResolveFilenameToAbsolute($parameter); - if (@is_readable($mask_filename) && ($fp_mask = @fopen($mask_filename, 'rb'))) { - $MaskImageData = ''; - do { - $buffer = fread($fp_mask, 8192); - $MaskImageData .= $buffer; - } while (strlen($buffer) > 0); - fclose($fp_mask); - if ($gdimg_mask = $this->ImageCreateFromStringReplacement($MaskImageData)) { - $this->is_alpha = true; - $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output); - ImageDestroy($gdimg_mask); - } else { - $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$mask_filename.'"', __FILE__, __LINE__); - } - } else { - $this->DebugMessage('Cannot open mask file "'.$mask_filename.'"', __FILE__, __LINE__); - } - break; - - case 'elip': // Elipse cropping - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping Elipse() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - $this->is_alpha = true; - $phpthumbFilters->Elipse($this->gdimg_output); - break; - - case 'ric': // RoundedImageCorners - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping RoundedImageCorners() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - @list($radius_x, $radius_y) = explode('|', $parameter); - if (($radius_x < 1) || ($radius_y < 1)) { - $this->DebugMessage('Skipping RoundedImageCorners('.$radius_x.', '.$radius_y.') because x/y radius is less than 1', __FILE__, __LINE__); - break; - } - $this->is_alpha = true; - $phpthumbFilters->RoundedImageCorners($this->gdimg_output, $radius_x, $radius_y); - break; - - case 'crop': // Crop - @list($left, $right, $top, $bottom) = explode('|', $parameter); - $phpthumbFilters->Crop($this->gdimg_output, $left, $right, $top, $bottom); - break; - - case 'bord': // Border - @list($border_width, $radius_x, $radius_y, $hexcolor_border) = explode('|', $parameter); - $this->is_alpha = true; - $phpthumbFilters->ImageBorder($this->gdimg_output, $border_width, $radius_x, $radius_y, $hexcolor_border); - break; - - case 'over': // Overlay - @list($filename, $underlay, $margin, $opacity) = explode('|', $parameter); - $underlay = (bool) ($underlay ? $underlay : false); - $margin = ((strlen($margin) > 0) ? $margin : ($underlay ? 0.1 : 0.0)); - $opacity = ((strlen($opacity) > 0) ? $opacity : 100); - if (($margin > 0) && ($margin < 1)) { - $margin = min(0.499, $margin); - } elseif (($margin > -1) && ($margin < 0)) { - $margin = max(-0.499, $margin); - } - - $filename = $this->ResolveFilenameToAbsolute($filename); - if (@is_readable($filename) && ($fp_watermark = @fopen($filename, 'rb'))) { - $WatermarkImageData = ''; - do { - $buffer = fread($fp_watermark, 8192); - $WatermarkImageData .= $buffer; - } while (strlen($buffer) > 0); - fclose($fp_watermark); - if ($img_watermark = $this->ImageCreateFromStringReplacement($WatermarkImageData)) { - if ($margin < 1) { - $resized_x = max(1, ImageSX($this->gdimg_output) - round(2 * (ImageSX($this->gdimg_output) * $margin))); - $resized_y = max(1, ImageSY($this->gdimg_output) - round(2 * (ImageSY($this->gdimg_output) * $margin))); - } else { - $resized_x = max(1, ImageSX($this->gdimg_output) - round(2 * $margin)); - $resized_y = max(1, ImageSY($this->gdimg_output) - round(2 * $margin)); - } - - if ($underlay) { - - if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) { - ImageAlphaBlending($img_watermark_resized, false); - ImageSaveAlpha($img_watermark_resized, true); - $this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark_resized), ImageSY($img_watermark_resized), ImageSX($img_watermark), ImageSY($img_watermark)); - if ($img_source_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) { - ImageAlphaBlending($img_source_resized, false); - ImageSaveAlpha($img_source_resized, true); - $this->ImageResizeFunction($img_source_resized, $this->gdimg_output, 0, 0, 0, 0, ImageSX($img_source_resized), ImageSY($img_source_resized), ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); - $phpthumbFilters->WatermarkOverlay($img_watermark_resized, $img_source_resized, 'C', $opacity, $margin); - ImageCopy($this->gdimg_output, $img_watermark_resized, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); - } else { - $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__); - } - ImageDestroy($img_watermark_resized); - } else { - $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).')', __FILE__, __LINE__); - } - - } else { // overlay - - if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) { - ImageAlphaBlending($img_watermark_resized, false); - ImageSaveAlpha($img_watermark_resized, true); - $this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark_resized), ImageSY($img_watermark_resized), ImageSX($img_watermark), ImageSY($img_watermark)); - $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark_resized, 'C', $opacity, $margin); - ImageDestroy($img_watermark_resized); - } else { - $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__); - } - - } - ImageDestroy($img_watermark); - - } else { - $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$filename.'"', __FILE__, __LINE__); - } - } else { - $this->DebugMessage('Cannot open overlay file "'.$filename.'"', __FILE__, __LINE__); - } - break; - - case 'wmi': // WaterMarkImage - @list($filename, $alignment, $opacity, $margin['x'], $margin['y'], $rotate_angle) = explode('|', $parameter); - // $margin can be pixel margin or percent margin if $alignment is text, or max width/height if $alignment is position like "50x75" - $alignment = ($alignment ? $alignment : 'BR'); - $opacity = (strlen($opacity) ? intval($opacity) : 50); - $rotate_angle = (strlen($rotate_angle) ? intval($rotate_angle) : 0); - if (!preg_match('/^([0-9\\.\\-]*)x([0-9\\.\\-]*)$/i', $alignment, $matches)) { - $margins = array('x', 'y'); - foreach ($margins as $xy) { - $margin[$xy] = (strlen($margin[$xy]) ? $margin[$xy] : 5); - if (($margin[$xy] > 0) && ($margin[$xy] < 1)) { - $margin[$xy] = min(0.499, $margin[$xy]); - } elseif (($margin[$xy] > -1) && ($margin[$xy] < 0)) { - $margin[$xy] = max(-0.499, $margin[$xy]); - } - } - } - - $filename = $this->ResolveFilenameToAbsolute($filename); - if (@is_readable($filename)) { - if ($img_watermark = $this->ImageCreateFromFilename($filename)) { - if ($rotate_angle !== 0) { - $phpthumbFilters->ImprovedImageRotate($img_watermark, $rotate_angle); - } - if (preg_match('/^([0-9\\.\\-]*)x([0-9\\.\\-]*)$/i', $alignment, $matches)) { - $watermark_max_width = intval($margin['x'] ? $margin['x'] : ImageSX($img_watermark)); - $watermark_max_height = intval($margin['y'] ? $margin['y'] : ImageSY($img_watermark)); - $scale = phpthumb_functions::ScaleToFitInBox(ImageSX($img_watermark), ImageSY($img_watermark), $watermark_max_width, $watermark_max_height, true, true); - $this->DebugMessage('Scaling watermark by a factor of '.number_format($scale, 4), __FILE__, __LINE__); - if (($scale > 1) || ($scale < 1)) { - if ($img_watermark2 = phpthumb_functions::ImageCreateFunction($scale * ImageSX($img_watermark), $scale * ImageSY($img_watermark))) { - ImageAlphaBlending($img_watermark2, false); - ImageSaveAlpha($img_watermark2, true); - $this->ImageResizeFunction($img_watermark2, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark2), ImageSY($img_watermark2), ImageSX($img_watermark), ImageSY($img_watermark)); - $img_watermark = $img_watermark2; - } else { - $this->DebugMessage('ImageCreateFunction('.($scale * ImageSX($img_watermark)).', '.($scale * ImageSX($img_watermark)).') failed', __FILE__, __LINE__); - } - } - $watermark_dest_x = round($matches[1] - (ImageSX($img_watermark) / 2)); - $watermark_dest_y = round($matches[2] - (ImageSY($img_watermark) / 2)); - $alignment = $watermark_dest_x.'x'.$watermark_dest_y; - } - $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark, $alignment, $opacity, $margin['x'], $margin['y']); - ImageDestroy($img_watermark); - if (isset($img_watermark2) && is_resource($img_watermark2)) { - ImageDestroy($img_watermark2); - } - } else { - $this->DebugMessage('ImageCreateFromFilename() failed for "'.$filename.'"', __FILE__, __LINE__); - } - } else { - $this->DebugMessage('!is_readable('.$filename.')', __FILE__, __LINE__); - } - break; - - case 'wmt': // WaterMarkText - @list($text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend) = explode('|', $parameter); - $text = ($text ? $text : ''); - $size = ($size ? $size : 3); - $alignment = ($alignment ? $alignment : 'BR'); - $hex_color = ($hex_color ? $hex_color : '000000'); - $ttffont = ($ttffont ? $ttffont : ''); - $opacity = (strlen($opacity) ? $opacity : 50); - $margin = (strlen($margin) ? $margin : 5); - $angle = (strlen($angle) ? $angle : 0); - $bg_color = ($bg_color ? $bg_color : false); - $bg_opacity = ($bg_opacity ? $bg_opacity : 0); - $fillextend = ($fillextend ? $fillextend : ''); - - if (basename($ttffont) == $ttffont) { - $ttffont = realpath($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont); - } else { - $ttffont = $this->ResolveFilenameToAbsolute($ttffont); - } - $phpthumbFilters->WatermarkText($this->gdimg_output, $text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend); - break; - - case 'blur': // Blur - @list($radius) = explode('|', $parameter); - $radius = ($radius ? $radius : 1); - if (phpthumb_functions::gd_version() >= 2) { - $phpthumbFilters->Blur($this->gdimg_output, $radius); - } else { - $this->DebugMessage('Skipping Blur() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - //return false; - } - break; - - case 'size': // Resize - @list($newwidth, $newheight, $stretch) = explode('|', $parameter); - $newwidth = (!$newwidth ? ImageSX($this->gdimg_output) : ((($newwidth > 0) && ($newwidth < 1)) ? round($newwidth * ImageSX($this->gdimg_output)) : round($newwidth))); - $newheight = (!$newheight ? ImageSY($this->gdimg_output) : ((($newheight > 0) && ($newheight < 1)) ? round($newheight * ImageSY($this->gdimg_output)) : round($newheight))); - $stretch = ($stretch ? true : false); - if ($stretch) { - $scale_x = phpthumb_functions::ScaleToFitInBox(ImageSX($this->gdimg_output), ImageSX($this->gdimg_output), $newwidth, $newwidth, true, true); - $scale_y = phpthumb_functions::ScaleToFitInBox(ImageSY($this->gdimg_output), ImageSY($this->gdimg_output), $newheight, $newheight, true, true); - } else { - $scale_x = phpthumb_functions::ScaleToFitInBox(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output), $newwidth, $newheight, true, true); - $scale_y = $scale_x; - } - $this->DebugMessage('Scaling watermark ('.($stretch ? 'with' : 'without').' stretch) by a factor of "'.number_format($scale_x, 4).' x '.number_format($scale_y, 4).'"', __FILE__, __LINE__); - if (($scale_x > 1) || ($scale_x < 1) || ($scale_y > 1) || ($scale_y < 1)) { - if ($img_temp = phpthumb_functions::ImageCreateFunction(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) { - ImageCopy($img_temp, $this->gdimg_output, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); - //ImageDestroy($this->gdimg_output); - if ($this->gdimg_output = phpthumb_functions::ImageCreateFunction($scale_x * ImageSX($img_temp), $scale_y * ImageSY($img_temp))) { - ImageAlphaBlending($this->gdimg_output, false); - ImageSaveAlpha($this->gdimg_output, true); - $this->ImageResizeFunction($this->gdimg_output, $img_temp, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output), ImageSX($img_temp), ImageSY($img_temp)); - } else { - $this->DebugMessage('ImageCreateFunction('.($scale_x * ImageSX($img_temp)).', '.($scale_y * ImageSY($img_temp)).') failed', __FILE__, __LINE__); - } - ImageDestroy($img_temp); - } else { - $this->DebugMessage('ImageCreateFunction('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).') failed', __FILE__, __LINE__); - } - } - break; - - case 'gblr': // Gaussian Blur - $phpthumbFilters->BlurGaussian($this->gdimg_output); - break; - - case 'sblr': // Selective Blur - $phpthumbFilters->BlurSelective($this->gdimg_output); - break; - - case 'mean': // MeanRemoval blur - $phpthumbFilters->MeanRemoval($this->gdimg_output); - break; - - case 'smth': // Smooth blur - $phpthumbFilters->Smooth($this->gdimg_output, $parameter); - break; - - case 'usm': // UnSharpMask sharpening - @list($amount, $radius, $threshold) = explode('|', $parameter); - $amount = ($amount ? $amount : 80); - $radius = ($radius ? $radius : 0.5); - $threshold = (strlen($threshold) ? $threshold : 3); - if (phpthumb_functions::gd_version() >= 2.0) { - ob_start(); - if (!@include_once(dirname(__FILE__).'/phpthumb.unsharp.php')) { - $include_error = ob_get_contents(); - if ($include_error) { - $this->DebugMessage('include_once("'.dirname(__FILE__).'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__); - } - $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__); - ob_end_clean(); - return false; - } - ob_end_clean(); - phpUnsharpMask::applyUnsharpMask($this->gdimg_output, $amount, $radius, $threshold); - } else { - $this->DebugMessage('Skipping unsharp mask because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - break; - - case 'rot': // ROTate - @list($angle, $bgcolor) = explode('|', $parameter); - $phpthumbFilters->ImprovedImageRotate($this->gdimg_output, $angle, $bgcolor); - break; - - case 'stc': // Source Transparent Color - @list($hexcolor, $min_limit, $max_limit) = explode('|', $parameter); - if (!phpthumb_functions::IsHexColor($hexcolor)) { - $this->DebugMessage('Skipping SourceTransparentColor hex color is invalid ('.$hexcolor.')', __FILE__, __LINE__); - return false; - } - $min_limit = (strlen($min_limit) ? $min_limit : 5); - $max_limit = (strlen($max_limit) ? $max_limit : 10); - if ($gdimg_mask = $phpthumbFilters->SourceTransparentColorMask($this->gdimg_output, $hexcolor, $min_limit, $max_limit)) { - $this->is_alpha = true; - $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output); - ImageDestroy($gdimg_mask); - } else { - $this->DebugMessage('SourceTransparentColorMask() failed for "'.$mask_filename.'"', __FILE__, __LINE__); - } - break; - } - $this->DebugMessage('Finished processing filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__); - } - } - return true; - } - - - function MaxFileSize() { - if (phpthumb_functions::gd_version() < 2) { - $this->DebugMessage('Skipping MaxFileSize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - if ($this->maxb > 0) { - switch ($this->thumbnailFormat) { - case 'png': - case 'gif': - $imgRenderFunction = 'image'.$this->thumbnailFormat; - - ob_start(); - $imgRenderFunction($this->gdimg_output); - $imgdata = ob_get_contents(); - ob_end_clean(); - - if (strlen($imgdata) > $this->maxb) { - for ($i = 8; $i >= 1; $i--) { - $tempIMG = ImageCreateTrueColor(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); - ImageCopy($tempIMG, $this->gdimg_output, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); - ImageTrueColorToPalette($tempIMG, true, pow(2, $i)); - ob_start(); - $imgRenderFunction($tempIMG); - $imgdata = ob_get_contents(); - ob_end_clean(); - - if (strlen($imgdata) <= $this->maxb) { - ImageTrueColorToPalette($this->gdimg_output, true, pow(2, $i)); - break; - } - } - } - if (strlen($imgdata) > $this->maxb) { - ImageTrueColorToPalette($this->gdimg_output, true, pow(2, $i)); - return false; - } - break; - - case 'jpeg': - ob_start(); - ImageJPEG($this->gdimg_output); - $imgdata = ob_get_contents(); - ob_end_clean(); - - $OriginalJPEGquality = $this->thumbnailQuality; - if (strlen($imgdata) > $this->maxb) { - for ($i = 3; $i < 20; $i++) { - $q = round(100 * (1 - log10($i / 2))); - ob_start(); - ImageJPEG($this->gdimg_output, '', $q); - $imgdata = ob_get_contents(); - ob_end_clean(); - - $this->thumbnailQuality = $q; - if (strlen($imgdata) <= $this->maxb) { - break; - } - } - } - if (strlen($imgdata) > $this->maxb) { - return false; - } - break; - - default: - return false; - break; - } - } - return true; - } - - - function CalculateThumbnailDimensions() { + $this->ImageResizeFunction( + $this->gdimg_output, + $this->gdimg_source, + $destination_offset_x, + $destination_offset_y, + $this->thumbnailCropX, + $this->thumbnailCropY, + $this->thumbnail_image_width, + $this->thumbnail_image_height, + $this->thumbnailCropW, + $this->thumbnailCropH + ); + + $this->DebugMessage('memory_get_usage() after copy-resize = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__); + ImageDestroy($this->gdimg_source); + $this->DebugMessage('memory_get_usage() after ImageDestroy = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__); + + $this->phpThumbDebug('8i'); + $this->AntiOffsiteLinking(); + $this->phpThumbDebug('8j'); + $this->ApplyFilters(); + $this->phpThumbDebug('8k'); + $this->AlphaChannelFlatten(); + $this->phpThumbDebug('8l'); + $this->MaxFileSize(); + $this->phpThumbDebug('8m'); + + $this->DebugMessage('GenerateThumbnail() completed successfully', __FILE__, __LINE__); + return true; + } + + + // public: + function RenderOutput() { + if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) { + $this->DebugMessage('RenderOutput() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__); + return false; + } + if (!$this->thumbnailFormat) { + $this->DebugMessage('RenderOutput() failed because $this->thumbnailFormat is empty', __FILE__, __LINE__); + return false; + } + if ($this->useRawIMoutput) { + $this->DebugMessage('RenderOutput copying $this->IMresizedData ('.strlen($this->IMresizedData).' bytes) to $this->outputImage', __FILE__, __LINE__); + $this->outputImageData = $this->IMresizedData; + return true; + } + + $builtin_formats = array(); + if (function_exists('ImageTypes')) { + $imagetypes = ImageTypes(); + $builtin_formats['wbmp'] = (bool) ($imagetypes & IMG_WBMP); + $builtin_formats['jpg'] = (bool) ($imagetypes & IMG_JPG); + $builtin_formats['gif'] = (bool) ($imagetypes & IMG_GIF); + $builtin_formats['png'] = (bool) ($imagetypes & IMG_PNG); + } + $this->DebugMessage('RenderOutput() attempting Image'.strtoupper(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__); + ob_start(); + switch ($this->thumbnailFormat) { + case 'wbmp': + if (!@$builtin_formats['wbmp']) { + $this->DebugMessage('GD does not have required built-in support for WBMP output', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + ImageJPEG($this->gdimg_output, null, $this->thumbnailQuality); + $this->outputImageData = ob_get_contents(); + break; + + case 'jpeg': + case 'jpg': // should be "jpeg" not "jpg" but just in case... + if (!@$builtin_formats['jpg']) { + $this->DebugMessage('GD does not have required built-in support for JPEG output', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + ImageJPEG($this->gdimg_output, null, $this->thumbnailQuality); + $this->outputImageData = ob_get_contents(); + break; + + case 'png': + if (!@$builtin_formats['png']) { + $this->DebugMessage('GD does not have required built-in support for PNG output', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + ImagePNG($this->gdimg_output); + $this->outputImageData = ob_get_contents(); + break; + + case 'gif': + if (!@$builtin_formats['gif']) { + $this->DebugMessage('GD does not have required built-in support for GIF output', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + ImageGIF($this->gdimg_output); + $this->outputImageData = ob_get_contents(); + break; + + case 'bmp': + $ImageOutFunction = '"builtin BMP output"'; + if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) { + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + $phpthumb_bmp = new phpthumb_bmp(); + $this->outputImageData = $phpthumb_bmp->GD2BMPstring($this->gdimg_output); + unset($phpthumb_bmp); + break; + + case 'ico': + $ImageOutFunction = '"builtin ICO output"'; + if (!@include_once(dirname(__FILE__).'/phpthumb.ico.php')) { + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + $phpthumb_ico = new phpthumb_ico(); + $arrayOfOutputImages = array($this->gdimg_output); + $this->outputImageData = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages); + unset($phpthumb_ico); + break; + + default: + $this->DebugMessage('RenderOutput failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + ob_end_clean(); + if (!$this->outputImageData) { + $this->DebugMessage('RenderOutput() for "'.$this->thumbnailFormat.'" failed', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + $this->DebugMessage('RenderOutput() completing with $this->outputImageData = '.strlen($this->outputImageData).' bytes', __FILE__, __LINE__); + return true; + } + + + // public: + function RenderToFile($filename) { + if (preg_match('#^(f|ht)tps?\://#i', $filename)) { + $this->DebugMessage('RenderToFile() failed because $filename ('.$filename.') is a URL', __FILE__, __LINE__); + return false; + } + // render thumbnail to this file only, do not cache, do not output to browser + //$renderfilename = $this->ResolveFilenameToAbsolute(dirname($filename)).DIRECTORY_SEPARATOR.basename($filename); + $renderfilename = $filename; + if (($filename{0} != '/') && ($filename{0} != '\\') && ($filename{1} != ':')) { + $renderfilename = $this->ResolveFilenameToAbsolute($renderfilename); + } + if (!@is_writable(dirname($renderfilename))) { + $this->DebugMessage('RenderToFile() failed because "'.dirname($renderfilename).'/" is not writable', __FILE__, __LINE__); + return false; + } + if (@is_file($renderfilename) && !@is_writable($renderfilename)) { + $this->DebugMessage('RenderToFile() failed because "'.$renderfilename.'" is not writable', __FILE__, __LINE__); + return false; + } + + if ($this->RenderOutput()) { + if (file_put_contents($renderfilename, $this->outputImageData)) { + $this->DebugMessage('RenderToFile('.$renderfilename.') succeeded', __FILE__, __LINE__); + /*if trouble with chmod (infobox hoster)*/ + //chmod($renderfilename, 0644); + return true; + } + if (!@file_exists($renderfilename)) { + $this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] did not appear to fail, but the output image does not exist either...', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('RenderOutput ['.$this->thumbnailFormat.'('.$renderfilename.')] failed', __FILE__, __LINE__); + } + return false; + } + + + // public: + function OutputThumbnail() { + $this->purgeTempFiles(); + + if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) { + $this->DebugMessage('OutputThumbnail() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__); + return false; + } + if (headers_sent()) { + return $this->ErrorImage('OutputThumbnail() failed - headers already sent'); + exit; + } + + $downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($this->down ? $this->down : 'phpThumb_generated_thumbnail'.'.'.$this->thumbnailFormat)); + $this->DebugMessage('Content-Disposition header filename set to "'.$downloadfilename.'"', __FILE__, __LINE__); + if ($downloadfilename) { + header('Content-Disposition: '.($this->down ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"'); + } else { + $this->DebugMessage('failed to send Content-Disposition header because $downloadfilename is empty', __FILE__, __LINE__); + } + + if ($this->useRawIMoutput) { + + header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); + echo $this->IMresizedData; + + } else { + + $this->DebugMessage('ImageInterlace($this->gdimg_output, '.intval($this->config_output_interlace).')', __FILE__, __LINE__); + ImageInterlace($this->gdimg_output, intval($this->config_output_interlace)); + switch ($this->thumbnailFormat) { + case 'jpeg': + header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); + $ImageOutFunction = 'image'.$this->thumbnailFormat; + @$ImageOutFunction($this->gdimg_output, '', $this->thumbnailQuality); + break; + + case 'png': + case 'gif': + header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); + $ImageOutFunction = 'image'.$this->thumbnailFormat; + @$ImageOutFunction($this->gdimg_output); + break; + + case 'bmp': + if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) { + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__); + return false; + } + $phpthumb_bmp = new phpthumb_bmp(); + if (is_object($phpthumb_bmp)) { + $bmp_data = $phpthumb_bmp->GD2BMPstring($this->gdimg_output); + unset($phpthumb_bmp); + if (!$bmp_data) { + $this->DebugMessage('$phpthumb_bmp->GD2BMPstring() failed', __FILE__, __LINE__); + return false; + } + header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); + echo $bmp_data; + } else { + $this->DebugMessage('new phpthumb_bmp() failed', __FILE__, __LINE__); + return false; + } + break; + + case 'ico': + if (!@include_once(dirname(__FILE__).'/phpthumb.ico.php')) { + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__); + return false; + } + $phpthumb_ico = new phpthumb_ico(); + if (is_object($phpthumb_ico)) { + $arrayOfOutputImages = array($this->gdimg_output); + $ico_data = $phpthumb_ico->GD2ICOstring($arrayOfOutputImages); + unset($phpthumb_ico); + if (!$ico_data) { + $this->DebugMessage('$phpthumb_ico->GD2ICOstring() failed', __FILE__, __LINE__); + return false; + } + header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat)); + echo $ico_data; + } else { + $this->DebugMessage('new phpthumb_ico() failed', __FILE__, __LINE__); + return false; + } + break; + + default: + $this->DebugMessage('OutputThumbnail failed because $this->thumbnailFormat "'.$this->thumbnailFormat.'" is not valid', __FILE__, __LINE__); + return false; + break; + } + + } + return true; + } + + + // public: + function CleanUpCacheDirectory() { + $this->DebugMessage('CleanUpCacheDirectory() set to purge ('.(is_null($this->config_cache_maxage) ? 'NULL' : number_format($this->config_cache_maxage / 86400, 1)).' days; '.(is_null($this->config_cache_maxsize) ? 'NULL' : number_format($this->config_cache_maxsize / 1048576, 2)).' MB; '.(is_null($this->config_cache_maxfiles) ? 'NULL' : number_format($this->config_cache_maxfiles)).' files)', __FILE__, __LINE__); + + if (!is_writable($this->config_cache_directory)) { + $this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$this->config_cache_directory.'" is not writable', __FILE__, __LINE__); + return true; + } + + // cache status of cache directory for 1 hour to avoid hammering the filesystem functions + $phpThumbCacheStats_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheStats.txt'; + if (file_exists($phpThumbCacheStats_filename) && is_readable($phpThumbCacheStats_filename) && (filemtime($phpThumbCacheStats_filename) >= (time() - 3600))) { + $this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$phpThumbCacheStats_filename.'" is recently modified', __FILE__, __LINE__); + return true; + } + touch($phpThumbCacheStats_filename); + + $DeletedKeys = array(); + $AllFilesInCacheDirectory = array(); + if (($this->config_cache_maxage > 0) || ($this->config_cache_maxsize > 0) || ($this->config_cache_maxfiles > 0)) { + $CacheDirOldFilesAge = array(); + $CacheDirOldFilesSize = array(); + $AllFilesInCacheDirectory = phpthumb_functions::GetAllFilesInSubfolders($this->config_cache_directory); + foreach ($AllFilesInCacheDirectory as $fullfilename) { + if (preg_match('#^'.preg_quote($this->config_cache_prefix).'#i', $fullfilename) && file_exists($fullfilename)) { + $CacheDirOldFilesAge[$fullfilename] = @fileatime($fullfilename); + if ($CacheDirOldFilesAge[$fullfilename] == 0) { + $CacheDirOldFilesAge[$fullfilename] = @filemtime($fullfilename); + } + $CacheDirOldFilesSize[$fullfilename] = @filesize($fullfilename); + } + } + if (empty($CacheDirOldFilesSize)) { + return true; + } + $DeletedKeys['zerobyte'] = array(); + foreach ($CacheDirOldFilesSize as $fullfilename => $filesize) { + // purge all zero-size files more than an hour old (to prevent trying to delete just-created and/or in-use files) + $cutofftime = time() - 3600; + if (($filesize == 0) && ($CacheDirOldFilesAge[$fullfilename] < $cutofftime)) { + $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__); + if (@unlink($fullfilename)) { + $DeletedKeys['zerobyte'][] = $fullfilename; + unset($CacheDirOldFilesSize[$fullfilename]); + unset($CacheDirOldFilesAge[$fullfilename]); + } + } + } + $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['zerobyte']).' zero-byte files', __FILE__, __LINE__); + asort($CacheDirOldFilesAge); + + if ($this->config_cache_maxfiles > 0) { + $TotalCachedFiles = count($CacheDirOldFilesAge); + $DeletedKeys['maxfiles'] = array(); + foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) { + if ($TotalCachedFiles > $this->config_cache_maxfiles) { + $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__); + if (@unlink($fullfilename)) { + $TotalCachedFiles--; + $DeletedKeys['maxfiles'][] = $fullfilename; + } + } else { + // there are few enough files to keep the rest + break; + } + } + $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxfiles']).' files based on (config_cache_maxfiles='.$this->config_cache_maxfiles.')', __FILE__, __LINE__); + foreach ($DeletedKeys['maxfiles'] as $fullfilename) { + unset($CacheDirOldFilesAge[$fullfilename]); + unset($CacheDirOldFilesSize[$fullfilename]); + } + } + + if ($this->config_cache_maxage > 0) { + $mindate = time() - $this->config_cache_maxage; + $DeletedKeys['maxage'] = array(); + foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) { + if ($filedate > 0) { + if ($filedate < $mindate) { + $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__); + if (@unlink($fullfilename)) { + $DeletedKeys['maxage'][] = $fullfilename; + } + } else { + // the rest of the files are new enough to keep + break; + } + } + } + $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxage']).' files based on (config_cache_maxage='.$this->config_cache_maxage.')', __FILE__, __LINE__); + foreach ($DeletedKeys['maxage'] as $fullfilename) { + unset($CacheDirOldFilesAge[$fullfilename]); + unset($CacheDirOldFilesSize[$fullfilename]); + } + } + + if ($this->config_cache_maxsize > 0) { + $TotalCachedFileSize = array_sum($CacheDirOldFilesSize); + $DeletedKeys['maxsize'] = array(); + foreach ($CacheDirOldFilesAge as $fullfilename => $filedate) { + if ($TotalCachedFileSize > $this->config_cache_maxsize) { + $this->DebugMessage('deleting "'.$fullfilename.'"', __FILE__, __LINE__); + if (@unlink($fullfilename)) { + $TotalCachedFileSize -= $CacheDirOldFilesSize[$fullfilename]; + $DeletedKeys['maxsize'][] = $fullfilename; + } + } else { + // the total filesizes are small enough to keep the rest of the files + break; + } + } + $this->DebugMessage('CleanUpCacheDirectory() purged '.count($DeletedKeys['maxsize']).' files based on (config_cache_maxsize='.$this->config_cache_maxsize.')', __FILE__, __LINE__); + foreach ($DeletedKeys['maxsize'] as $fullfilename) { + unset($CacheDirOldFilesAge[$fullfilename]); + unset($CacheDirOldFilesSize[$fullfilename]); + } + } + + } else { + $this->DebugMessage('skipping CleanUpCacheDirectory() because config set to not use it', __FILE__, __LINE__); + } + $totalpurged = 0; + foreach ($DeletedKeys as $key => $value) { + $totalpurged += count($value); + } + $this->DebugMessage('CleanUpCacheDirectory() purged '.$totalpurged.' files (from '.count($AllFilesInCacheDirectory).') based on config settings', __FILE__, __LINE__); + if ($totalpurged > 0) { + $empty_dirs = array(); + foreach ($AllFilesInCacheDirectory as $fullfilename) { + if (is_dir($fullfilename)) { + $empty_dirs[realpath($fullfilename)] = 1; + } else { + unset($empty_dirs[realpath(dirname($fullfilename))]); + } + } + krsort($empty_dirs); + $totalpurgeddirs = 0; + foreach ($empty_dirs as $empty_dir => $dummy) { + if ($empty_dir == $this->config_cache_directory) { + // shouldn't happen, but just in case, don't let it delete actual cache directory + continue; + } elseif (@rmdir($empty_dir)) { + $totalpurgeddirs++; + } else { + $this->DebugMessage('failed to rmdir('.$empty_dir.')', __FILE__, __LINE__); + } + } + $this->DebugMessage('purged '.$totalpurgeddirs.' empty directories', __FILE__, __LINE__); + } + return true; + } + + ////////////////////////////////////////////////////////////////////// + + // private: re-initializator (call between rendering multiple images with one object) + function resetObject() { + $class_vars = get_class_vars(get_class($this)); + foreach ($class_vars as $key => $value) { + // do not clobber debug or config info + if (!preg_match('#^(config_|debug|fatalerror)#i', $key)) { + $this->$key = $value; + } + } + $this->phpThumb(); // re-initialize some class variables + return true; + } + + ////////////////////////////////////////////////////////////////////// + + function ResolveSource() { + if (is_resource($this->gdimg_source)) { + $this->DebugMessage('ResolveSource() exiting because is_resource($this->gdimg_source)', __FILE__, __LINE__); + return true; + } + if ($this->rawImageData) { + $this->sourceFilename = null; + $this->DebugMessage('ResolveSource() exiting because $this->rawImageData is set ('.number_format(strlen($this->rawImageData)).' bytes)', __FILE__, __LINE__); + return true; + } + if ($this->sourceFilename) { + $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->sourceFilename); + $this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'"', __FILE__, __LINE__); + } elseif ($this->src) { + $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src); + $this->DebugMessage('$this->sourceFilename set to "'.$this->sourceFilename.'" from $this->src ('.$this->src.')', __FILE__, __LINE__); + } else { + return $this->ErrorImage('$this->sourceFilename and $this->src are both empty'); + } + if ($this->iswindows && ((substr($this->sourceFilename, 0, 2) == '//') || (substr($this->sourceFilename, 0, 2) == '\\\\'))) { + // Windows \\share\filename.ext + } elseif (preg_match('#^(f|ht)tps?\://#i', $this->sourceFilename)) { + // URL + if ($this->config_http_user_agent) { + ini_set('user_agent', $this->config_http_user_agent); + } + } elseif (!@file_exists($this->sourceFilename)) { + return $this->ErrorImage('"'.$this->sourceFilename.'" does not exist'); + } elseif (!@is_file($this->sourceFilename)) { + return $this->ErrorImage('"'.$this->sourceFilename.'" is not a file'); + } + return true; + } + + function setOutputFormat() { + static $alreadyCalled = false; + if ($this->thumbnailFormat && $alreadyCalled) { + return true; + } + $alreadyCalled = true; + + $AvailableImageOutputFormats = array(); + $AvailableImageOutputFormats[] = 'text'; + if (@is_readable(dirname(__FILE__).'/phpthumb.ico.php')) { + $AvailableImageOutputFormats[] = 'ico'; + } + if (@is_readable(dirname(__FILE__).'/phpthumb.bmp.php')) { + $AvailableImageOutputFormats[] = 'bmp'; + } + + $this->thumbnailFormat = 'ico'; + + // Set default output format based on what image types are available + if (function_exists('ImageTypes')) { + $imagetypes = ImageTypes(); + if ($imagetypes & IMG_WBMP) { + $this->thumbnailFormat = 'wbmp'; + $AvailableImageOutputFormats[] = 'wbmp'; + } + if ($imagetypes & IMG_GIF) { + $this->thumbnailFormat = 'gif'; + $AvailableImageOutputFormats[] = 'gif'; + } + if ($imagetypes & IMG_PNG) { + $this->thumbnailFormat = 'png'; + $AvailableImageOutputFormats[] = 'png'; + } + if ($imagetypes & IMG_JPG) { + $this->thumbnailFormat = 'jpeg'; + $AvailableImageOutputFormats[] = 'jpeg'; + } + } else { + //return $this->ErrorImage('ImageTypes() does not exist - GD support might not be enabled?'); + $this->DebugMessage('ImageTypes() does not exist - GD support might not be enabled?', __FILE__, __LINE__); + } + if ($this->ImageMagickVersion()) { + $IMformats = array('jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp'); + $this->DebugMessage('Addding ImageMagick formats to $AvailableImageOutputFormats ('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__); + foreach ($IMformats as $key => $format) { + $AvailableImageOutputFormats[] = $format; + } + } + $AvailableImageOutputFormats = array_unique($AvailableImageOutputFormats); + $this->DebugMessage('$AvailableImageOutputFormats = array('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__); + + $this->f = preg_replace('#[^a-z]#', '', strtolower($this->f)); + if (strtolower($this->config_output_format) == 'jpg') { + $this->config_output_format = 'jpeg'; + } + if (strtolower($this->f) == 'jpg') { + $this->f = 'jpeg'; + } + if (phpthumb_functions::CaseInsensitiveInArray($this->config_output_format, $AvailableImageOutputFormats)) { + // set output format to config default if that format is available + $this->DebugMessage('$this->thumbnailFormat set to $this->config_output_format "'.strtolower($this->config_output_format).'"', __FILE__, __LINE__); + $this->thumbnailFormat = strtolower($this->config_output_format); + } elseif ($this->config_output_format) { + $this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->config_output_format ('.strtolower($this->config_output_format).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__); + } + if ($this->f && (phpthumb_functions::CaseInsensitiveInArray($this->f, $AvailableImageOutputFormats))) { + // override output format if $this->f is set and that format is available + $this->DebugMessage('$this->thumbnailFormat set to $this->f "'.strtolower($this->f).'"', __FILE__, __LINE__); + $this->thumbnailFormat = strtolower($this->f); + } elseif ($this->f) { + $this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->f ('.strtolower($this->f).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__); + } + + // for JPEG images, quality 1 (worst) to 99 (best) + // quality < 25 is nasty, with not much size savings - not recommended + // problems with 100 - invalid JPEG? + $this->thumbnailQuality = max(1, min(99, ($this->q ? intval($this->q) : 75))); + $this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__); + + return true; + } + + function setCacheDirectory() { + // resolve cache directory to absolute pathname + $this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__); + if (substr($this->config_cache_directory, 0, 1) == '.') { + if (preg_match('#^(f|ht)tps?\://#i', $this->src)) { + if (!$this->config_cache_disable_warning) { + $this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') cannot be used for remote images. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php'); + } + } elseif ($this->src) { + // resolve relative cache directory to source image + $this->config_cache_directory = dirname($this->ResolveFilenameToAbsolute($this->src)).DIRECTORY_SEPARATOR.$this->config_cache_directory; + } else { + // $this->new is probably set + } + } + if (substr($this->config_cache_directory, -1) == '/') { + $this->config_cache_directory = substr($this->config_cache_directory, 0, -1); + } + if ($this->iswindows) { + $this->config_cache_directory = str_replace('/', DIRECTORY_SEPARATOR, $this->config_cache_directory); + } + if ($this->config_cache_directory) { + $real_cache_path = realpath($this->config_cache_directory); + if (!$real_cache_path) { + $this->DebugMessage('realpath($this->config_cache_directory) failed for "'.$this->config_cache_directory.'"', __FILE__, __LINE__); + if (!is_dir($this->config_cache_directory)) { + $this->DebugMessage('!is_dir('.$this->config_cache_directory.')', __FILE__, __LINE__); + } + } + if ($real_cache_path) { + $this->DebugMessage('setting config_cache_directory to realpath('.$this->config_cache_directory.') = "'.$real_cache_path.'"', __FILE__, __LINE__); + $this->config_cache_directory = $real_cache_path; + } + } + if (!is_dir($this->config_cache_directory)) { + if (!$this->config_cache_disable_warning) { + $this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') does not exist. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php'); + } + $this->DebugMessage('$this->config_cache_directory ('.$this->config_cache_directory.') is not a directory', __FILE__, __LINE__); + $this->config_cache_directory = null; + } elseif (!@is_writable($this->config_cache_directory)) { + $this->DebugMessage('$this->config_cache_directory is not writable ('.$this->config_cache_directory.')', __FILE__, __LINE__); + } + + $this->InitializeTempDirSetting(); + if (!@is_dir($this->config_temp_directory) && !@is_writable($this->config_temp_directory) && @is_dir($this->config_cache_directory) && @is_writable($this->config_cache_directory)) { + $this->DebugMessage('setting $this->config_temp_directory = $this->config_cache_directory ('.$this->config_cache_directory.')', __FILE__, __LINE__); + $this->config_temp_directory = $this->config_cache_directory; + } + return true; + } + + + function ResolveFilenameToAbsolute($filename) { + if (empty($filename)) { + return false; + } + + if (preg_match('#^[a-z0-9]+\:/{1,2}#i', $filename)) { + // eg: http://host/path/file.jpg (HTTP URL) + // eg: ftp://host/path/file.jpg (FTP URL) + // eg: data1:/path/file.jpg (Netware path) + + //$AbsoluteFilename = $filename; + return $filename; + + } elseif ($this->iswindows && isset($filename{1}) && ($filename{1} == ':')) { + + // absolute pathname (Windows) + $AbsoluteFilename = $filename; + + } elseif ($this->iswindows && ((substr($filename, 0, 2) == '//') || (substr($filename, 0, 2) == '\\\\'))) { + + // absolute pathname (Windows) + $AbsoluteFilename = $filename; + + } elseif ($filename{0} == '/') { + + if (@is_readable($filename) && !@is_readable($this->config_document_root.$filename)) { + + // absolute filename (*nix) + $AbsoluteFilename = $filename; + + } elseif (isset($filename{1}) && ($filename{1} == '~')) { + + // /~user/path + if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray($filename)) { + $AbsoluteFilename = $ApacheLookupURIarray['filename']; + } else { + $AbsoluteFilename = realpath($filename); + if (@is_readable($AbsoluteFilename)) { + $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with realpath($filename)', __FILE__, __LINE__); + } elseif (is_dir(dirname($AbsoluteFilename))) { + $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname($filename).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with realpath(.)', __FILE__, __LINE__); + } else { + return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'". This has been known to fail on Apache2 - try using the absolute filename for the source image (ex: "/home/user/httpdocs/image.jpg" instead of "/~user/image.jpg")'); + } + } + + } else { + + // relative filename (any OS) + if (preg_match('#^'.preg_quote($this->config_document_root).'#', $filename)) { + $AbsoluteFilename = $filename; + $this->DebugMessage('ResolveFilenameToAbsolute() NOT prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__); + } else { + $AbsoluteFilename = $this->config_document_root.$filename; + $this->DebugMessage('ResolveFilenameToAbsolute() prepending $this->config_document_root ('.$this->config_document_root.') to $filename ('.$filename.') resulting in ($AbsoluteFilename = "'.$AbsoluteFilename.'")', __FILE__, __LINE__); + } + + } + + } else { + + // relative to current directory (any OS) + $AbsoluteFilename = $this->config_document_root.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, dirname(@$_SERVER['PHP_SELF'])).DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename); + //$AbsoluteFilename = dirname(__FILE__).DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename); + + //if (!@file_exists($AbsoluteFilename) && @file_exists(realpath($this->DotPadRelativeDirectoryPath($filename)))) { + // $AbsoluteFilename = realpath($this->DotPadRelativeDirectoryPath($filename)); + //} + + if (substr(dirname(@$_SERVER['PHP_SELF']), 0, 2) == '/~') { + if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) { + $AbsoluteFilename = $ApacheLookupURIarray['filename'].DIRECTORY_SEPARATOR.$filename; + } else { + $AbsoluteFilename = realpath('.').DIRECTORY_SEPARATOR.$filename; + if (@is_readable($AbsoluteFilename)) { + $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with realpath(.)/$filename', __FILE__, __LINE__); + } elseif (is_dir(dirname($AbsoluteFilename))) { + $this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with realpath(.)', __FILE__, __LINE__); + } else { + return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'". This has been known to fail on Apache2 - try using the absolute filename for the source image'); + } + } + } + + } + if (is_link($AbsoluteFilename)) { + $this->DebugMessage('is_link()==true, changing "'.$AbsoluteFilename.'" to "'.readlink($AbsoluteFilename).'"', __FILE__, __LINE__); + $AbsoluteFilename = readlink($AbsoluteFilename); + } + if (realpath($AbsoluteFilename)) { + $AbsoluteFilename = realpath($AbsoluteFilename); + } + if ($this->iswindows) { + $AbsoluteFilename = preg_replace('#^'.preg_quote(realpath($this->config_document_root)).'#i', realpath($this->config_document_root), $AbsoluteFilename); + $AbsoluteFilename = str_replace(DIRECTORY_SEPARATOR, '/', $AbsoluteFilename); + } + if (!$this->config_allow_src_above_docroot && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', realpath($this->config_document_root))).'#', $AbsoluteFilename)) { + $this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.realpath($this->config_document_root).'") to null', __FILE__, __LINE__); + return false; + } + if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))).'#', $AbsoluteFilename)) { + $this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'.dirname(__FILE__).'") to null', __FILE__, __LINE__); + return false; + } + return $AbsoluteFilename; + } + + function file_exists_ignoreopenbasedir($filename, $cached=true) { + static $open_basedirs = null; + static $file_exists_cache = array(); + if (!$cached || !isset($file_exists_cache[$filename])) { + if (is_null($open_basedirs)) { + $open_basedirs = explode(';', ini_get('open_basedir')); + } + if (empty($open_basedirs) || in_array(dirname($filename), $open_basedirs)) { + $file_exists_cache[$filename] = file_exists($filename); + } elseif ($this->iswindows) { + $ls_filename = trim(phpthumb_functions::SafeExec('dir '.escapeshellarg($filename))); + $file_exists_cache[$filename] = !preg_match('#File Not Found#i', $ls_filename); + } else { + $ls_filename = trim(phpthumb_functions::SafeExec('ls '.escapeshellarg($filename))); + $file_exists_cache[$filename] = ($ls_filename == $filename); + } + } + return $file_exists_cache[$filename]; + } + + function ImageMagickWhichConvert() { + static $WhichConvert = null; + if (is_null($WhichConvert)) { + if ($this->iswindows) { + $WhichConvert = false; + } else { + $WhichConvert = trim(phpthumb_functions::SafeExec('which convert')); + } + } + return $WhichConvert; + } + + function ImageMagickCommandlineBase() { + static $commandline = null; + if (is_null($commandline)) { + if ($this->issafemode) { + $commandline = ''; + return $commandline; + } + $commandline = (!is_null($this->config_imagemagick_path) ? $this->config_imagemagick_path : ''); + + if ($this->config_imagemagick_path && ($this->config_imagemagick_path != realpath($this->config_imagemagick_path))) { + if (@is_executable(realpath($this->config_imagemagick_path))) { + $this->DebugMessage('Changing $this->config_imagemagick_path ('.$this->config_imagemagick_path.') to realpath($this->config_imagemagick_path) ('.realpath($this->config_imagemagick_path).')', __FILE__, __LINE__); + $this->config_imagemagick_path = realpath($this->config_imagemagick_path); + } else { + $this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable(realpath($this->config_imagemagick_path)) ('.realpath($this->config_imagemagick_path).')', __FILE__, __LINE__); + } + } + $this->DebugMessage(' file_exists('.$this->config_imagemagick_path.') = '.intval( @file_exists($this->config_imagemagick_path)), __FILE__, __LINE__); + $this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '.intval($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)), __FILE__, __LINE__); + $this->DebugMessage(' is_file('.$this->config_imagemagick_path.') = '.intval( @is_file($this->config_imagemagick_path)), __FILE__, __LINE__); + $this->DebugMessage('is_executable('.$this->config_imagemagick_path.') = '.intval(@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__); + + if ($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)) { + $this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path ('.$this->config_imagemagick_path.')', __FILE__, __LINE__); + if ($this->iswindows) { + $commandline = substr($this->config_imagemagick_path, 0, 2).' && cd '.escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2))).' && '.escapeshellarg(basename($this->config_imagemagick_path)); + } else { + $commandline = escapeshellarg($this->config_imagemagick_path); + } + return $commandline; + } + + $which_convert = $this->ImageMagickWhichConvert(); + $IMversion = $this->ImageMagickVersion(); + + if ($which_convert && ($which_convert{0} == '/') && $this->file_exists_ignoreopenbasedir($which_convert)) { + + // `which convert` *should* return the path if "convert" exist, or nothing if it doesn't + // other things *may* get returned, like "sh: convert: not found" or "no convert in /usr/local/bin /usr/sbin /usr/bin /usr/ccs/bin" + // so only do this if the value returned exists as a file + $this->DebugMessage('using ImageMagick path from `which convert` ('.$which_convert.')', __FILE__, __LINE__); + $commandline = 'convert'; + + } elseif ($IMversion) { + + $this->DebugMessage('setting ImageMagick path to $this->config_imagemagick_path ('.$this->config_imagemagick_path.') ['.$IMversion.']', __FILE__, __LINE__); + $commandline = $this->config_imagemagick_path; + + } else { + + $this->DebugMessage('ImageMagickThumbnailToGD() aborting because cannot find convert in $this->config_imagemagick_path ('.$this->config_imagemagick_path.'), and `which convert` returned ('.$which_convert.')', __FILE__, __LINE__); + $commandline = ''; + + } + } + return $commandline; + } + + function ImageMagickVersion($returnRAW=false) { + static $versionstring = null; + if (is_null($versionstring)) { + $versionstring = array(0=>false, 1=>false); + $commandline = $this->ImageMagickCommandlineBase(); + $commandline = (!is_null($commandline) ? $commandline : ''); + + if ($commandline) { + $commandline .= ' --version'; + $this->DebugMessage('ImageMagick version checked with "'.$commandline.'"', __FILE__, __LINE__); + $versionstring[1] = trim(phpthumb_functions::SafeExec($commandline)); + if (preg_match('#^Version: [^0-9]*([ 0-9\\.\\:Q/\\-]+) (http|file)\:#i', $versionstring[1], $matches)) { + $versionstring[0] = $matches[1]; + } else { + $versionstring[0] = false; + $this->DebugMessage('ImageMagick did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__); + } + $this->DebugMessage('ImageMagick convert --version says "'.@$matches[0].'"', __FILE__, __LINE__); + } + } + return $versionstring[intval($returnRAW)]; + } + + function ImageMagickSwitchAvailable($switchname) { + static $IMoptions = null; + if (is_null($IMoptions)) { + $IMoptions = array(); + $commandline = $this->ImageMagickCommandlineBase(); + if (!is_null($commandline)) { + $commandline .= ' -help'; + $IMhelp_lines = explode("\n", phpthumb_functions::SafeExec($commandline)); + foreach ($IMhelp_lines as $line) { + if (preg_match('#^[\\+\\-]([a-z\\-]+) #', trim($line), $matches)) { + $IMoptions[$matches[1]] = true; + } + } + } + } + if (is_array($switchname)) { + $allOK = true; + foreach ($switchname as $key => $value) { + if (!isset($IMoptions[$value])) { + $allOK = false; + break; + } + } + $this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '.intval($allOK).'', __FILE__, __LINE__); + } else { + $allOK = isset($IMoptions[$switchname]); + $this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '.intval($allOK).'', __FILE__, __LINE__); + } + return $allOK; + } + + function ImageMagickFormatsList() { + static $IMformatsList = null; + if (is_null($IMformatsList)) { + $IMformatsList = ''; + $commandline = $this->ImageMagickCommandlineBase(); + if (!is_null($commandline)) { + $commandline = dirname($commandline).DIRECTORY_SEPARATOR.str_replace('convert', 'identify', basename($commandline)); + $commandline .= ' -list format'; + $IMformatsList = phpthumb_functions::SafeExec($commandline); + } + } + return $IMformatsList; + } + + function SourceDataToTempFile() { + if ($IMtempSourceFilename = $this->phpThumb_tempnam()) { + $IMtempSourceFilename = realpath($IMtempSourceFilename); + ob_start(); + $fp_tempfile = fopen($IMtempSourceFilename, 'wb'); + $tempfile_open_error = ob_get_contents(); + ob_end_clean(); + if ($fp_tempfile) { + fwrite($fp_tempfile, $this->rawImageData); + fclose($fp_tempfile); + $this->sourceFilename = $IMtempSourceFilename; + $this->DebugMessage('ImageMagickThumbnailToGD() setting $this->sourceFilename to "'.$IMtempSourceFilename.'" from $this->rawImageData ('.strlen($this->rawImageData).' bytes)', __FILE__, __LINE__); + } else { + $this->DebugMessage('ImageMagickThumbnailToGD() FAILED setting $this->sourceFilename to "'.$IMtempSourceFilename.'" (failed to open for writing: "'.$tempfile_open_error.'")', __FILE__, __LINE__); + } + unset($tempfile_open_error, $IMtempSourceFilename); + return true; + } + $this->DebugMessage('SourceDataToTempFile() FAILED because $this->phpThumb_tempnam() failed', __FILE__, __LINE__); + return false; + } + + function ImageMagickThumbnailToGD() { + // http://www.imagemagick.org/script/command-line-options.php + + $this->useRawIMoutput = true; + if (phpthumb_functions::gd_version()) { + // if GD is not available, must use whatever ImageMagick can output + + // $UnAllowedParameters contains options that can only be processed in GD, not ImageMagick + // note: 'fltr' *may* need to be processed by GD, but we'll check that in more detail below + $UnAllowedParameters = array('xto', 'ar', 'bg', 'bc'); + // 'ra' may be part of this list, if not a multiple of 90ﾰ + foreach ($UnAllowedParameters as $parameter) { + if (isset($this->$parameter)) { + $this->DebugMessage('$this->useRawIMoutput=false because "'.$parameter.'" is set', __FILE__, __LINE__); + $this->useRawIMoutput = false; + break; + } + } + } + $this->DebugMessage('$this->useRawIMoutput='.($this->useRawIMoutput ? 'true' : 'false').' after checking $UnAllowedParameters', __FILE__, __LINE__); + $outputFormat = $this->thumbnailFormat; + if (phpthumb_functions::gd_version()) { + if ($this->useRawIMoutput) { + switch ($this->thumbnailFormat) { + case 'gif': + $ImageCreateFunction = 'ImageCreateFromGIF'; + $this->is_alpha = true; + break; + case 'png': + $ImageCreateFunction = 'ImageCreateFromPNG'; + $this->is_alpha = true; + break; + case 'jpg': + case 'jpeg': + $ImageCreateFunction = 'ImageCreateFromJPEG'; + break; + default: + $this->DebugMessage('Forcing output to PNG because $this->thumbnailFormat ('.$this->thumbnailFormat.' is not a GD-supported format)', __FILE__, __LINE__); + $outputFormat = 'png'; + $ImageCreateFunction = 'ImageCreateFromPNG'; + $this->is_alpha = true; + $this->useRawIMoutput = false; + break; + } + if (!function_exists(@$ImageCreateFunction)) { + // ImageMagickThumbnailToGD() depends on ImageCreateFromPNG/ImageCreateFromGIF + //$this->DebugMessage('ImageMagickThumbnailToGD() aborting because '.@$ImageCreateFunction.'() is not available', __FILE__, __LINE__); + $this->useRawIMoutput = true; + //return false; + } + } else { + $outputFormat = 'png'; + $ImageCreateFunction = 'ImageCreateFromPNG'; + $this->is_alpha = true; + $this->useRawIMoutput = false; + } + } + + // http://freealter.org/doc_distrib/ImageMagick-5.1.1/www/convert.html + if (!$this->sourceFilename && $this->rawImageData) { + $this->SourceDataToTempFile(); + } + if (!$this->sourceFilename) { + $this->DebugMessage('ImageMagickThumbnailToGD() aborting because $this->sourceFilename is empty', __FILE__, __LINE__); + $this->useRawIMoutput = false; + return false; + } + if ($this->issafemode) { + $this->DebugMessage('ImageMagickThumbnailToGD() aborting because safe_mode is enabled', __FILE__, __LINE__); + $this->useRawIMoutput = false; + return false; + } +// TO BE FIXED +//if (true) { +// $this->DebugMessage('ImageMagickThumbnailToGD() aborting it is broken right now', __FILE__, __LINE__); +// $this->useRawIMoutput = false; +// return false; +//} + + $commandline = $this->ImageMagickCommandlineBase(); + if ($commandline) { + if ($IMtempfilename = $this->phpThumb_tempnam()) { + $IMtempfilename = realpath($IMtempfilename); + + $IMuseExplicitImageOutputDimensions = false; + if ($this->ImageMagickSwitchAvailable('thumbnail') && $this->config_imagemagick_use_thumbnail) { + $IMresizeParameter = 'thumbnail'; + } else { + $IMresizeParameter = 'resize'; + + // some (older? around 2002) versions of IM won't accept "-resize 100x" but require "-resize 100x100" + $commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x '.escapeshellarg($IMtempfilename).' 2>&1'; + $IMresult_test = phpthumb_functions::SafeExec($commandline_test); + $IMuseExplicitImageOutputDimensions = preg_match('#image dimensions are zero#i', $IMresult_test); + $this->DebugMessage('IMuseExplicitImageOutputDimensions = '.intval($IMuseExplicitImageOutputDimensions), __FILE__, __LINE__); + if ($fp_im_temp = @fopen($IMtempfilename, 'wb')) { + // erase temp image so ImageMagick logo doesn't get output if other processing fails + fclose($fp_im_temp); + } + } + + + if (!is_null($this->dpi) && $this->ImageMagickSwitchAvailable('density')) { + // for raster source formats only (WMF, PDF, etc) + $commandline .= ' -density '.escapeshellarg($this->dpi); + } + ob_start(); + $getimagesize = GetImageSize($this->sourceFilename); + $GetImageSizeError = ob_get_contents(); + ob_end_clean(); + if (is_array($getimagesize)) { + $this->DebugMessage('GetImageSize('.$this->sourceFilename.') SUCCEEDED: '.print_r($getimagesize, true), __FILE__, __LINE__); + } else { + $this->DebugMessage('GetImageSize('.$this->sourceFilename.') FAILED with error "'.$GetImageSizeError.'"', __FILE__, __LINE__); + } + if (is_array($getimagesize)) { + $this->DebugMessage('GetImageSize('.$this->sourceFilename.') returned [w='.$getimagesize[0].';h='.$getimagesize[1].';f='.$getimagesize[2].']', __FILE__, __LINE__); + $this->source_width = $getimagesize[0]; + $this->source_height = $getimagesize[1]; + $this->DebugMessage('source dimensions set to '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__); + $this->SetOrientationDependantWidthHeight(); + + if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) { + // not a transparency-capable format + $commandline .= ' -background '.escapeshellarg('#'.($this->bg ? $this->bg : 'FFFFFF')); + if ($getimagesize[2] == IMAGETYPE_GIF) { + $commandline .= ' -flatten'; + } + } + if ($getimagesize[2] == IMAGETYPE_GIF) { + $commandline .= ' -coalesce'; // may be needed for animated GIFs + } + if ($this->source_width || $this->source_height) { + if ($this->zc) { + + $borderThickness = 0; + if (!empty($this->fltr)) { + foreach ($this->fltr as $key => $value) { + if (preg_match('#^bord\|([0-9]+)#', $value, $matches)) { + $borderThickness = $matches[1]; + break; + } + } + } + $wAll = intval(max($this->w, $this->wp, $this->wl, $this->ws)) - (2 * $borderThickness); + $hAll = intval(max($this->h, $this->hp, $this->hl, $this->hs)) - (2 * $borderThickness); + $imAR = $this->source_width / $this->source_height; + $zcAR = (($wAll && $hAll) ? $wAll / $hAll : 1); + $side = phpthumb_functions::nonempty_min($this->source_width, $this->source_height, max($wAll, $hAll)); + $sideX = phpthumb_functions::nonempty_min($this->source_width, $wAll, round($hAll * $zcAR)); + $sideY = phpthumb_functions::nonempty_min( $this->source_height, $hAll, round($wAll / $zcAR)); + + $thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR)); + $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '').'x'.$thumbnailH); + + switch (strtoupper($this->zc)) { + case 'T': + $commandline .= ' -gravity north'; + break; + case 'B': + $commandline .= ' -gravity south'; + break; + case 'L': + $commandline .= ' -gravity west'; + break; + case 'R': + $commandline .= ' -gravity east'; + break; + case 'TL': + $commandline .= ' -gravity northwest'; + break; + case 'TR': + $commandline .= ' -gravity northeast'; + break; + case 'BL': + $commandline .= ' -gravity southwest'; + break; + case 'BR': + $commandline .= ' -gravity southeast'; + break; + case '1': + case 'C': + default: + $commandline .= ' -gravity center'; + break; + } + + if (($wAll > 0) && ($hAll > 0)) { + $commandline .= ' -crop '.escapeshellarg($wAll.'x'.$hAll.'+0+0'); + } else { + $commandline .= ' -crop '.escapeshellarg($side.'x'.$side.'+0+0'); + } + if ($this->ImageMagickSwitchAvailable('repage')) { + $commandline .= ' +repage'; + } else { + $this->DebugMessage('Skipping "+repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__); + } + + } elseif ($this->sw || $this->sh || $this->sx || $this->sy) { + + $crop_param = ''; + $crop_param .= ($this->sw ? (($this->sw < 2) ? round($this->sw * $this->source_width) : $this->sw) : $this->source_width); + $crop_param .= 'x'.($this->sh ? (($this->sh < 2) ? round($this->sh * $this->source_height) : $this->sh) : $this->source_height); + $crop_param .= '+'.(($this->sx < 2) ? round($this->sx * $this->source_width) : $this->sx); + $crop_param .= '+'.(($this->sy < 2) ? round($this->sy * $this->source_height) : $this->sy); +// TO BE FIXED +// makes 1x1 output +// http://trainspotted.com/phpThumb/phpThumb.php?src=/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg&w=100&h=100&far=1&f=png&fltr[]=lvl&sx=0.05&sy=0.25&sw=0.92&sh=0.42 +// '/usr/bin/convert' -density 150 -thumbnail 100x100 -contrast-stretch '0.1%' '/var/www/vhosts/trainspotted.com/httpdocs/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg[0]' png:'/var/www/vhosts/trainspotted.com/httpdocs/phpThumb/_cache/pThumbIIUlvj' +// $commandline .= ' -crop '.escapeshellarg($crop_param); + + // this is broken for aoe=1, but unsure how to fix. Send advice to info@silisoftware.com + if ($this->w || $this->h) { + //if ($this->ImageMagickSwitchAvailable('repage')) { + if (false) { +// TO BE FIXED +// newer versions of ImageMagick require -repage + $commandline .= ' -repage'; + } else { + $this->DebugMessage('Skipping "-repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__); + } + if ($IMuseExplicitImageOutputDimensions) { + if ($this->w && !$this->h) { + $this->h = ceil($this->w / ($this->source_width / $this->source_height)); + } elseif ($this->h && !$this->w) { + $this->w = ceil($this->h * ($this->source_width / $this->source_height)); + } + } + $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($this->w.'x'.$this->h); + } + + } else { + + if ($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) { + list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra); + $nw = ((round($nw) != 0) ? round($nw) : ''); + $nh = ((round($nh) != 0) ? round($nh) : ''); + $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($nw.'x'.$nh.'!'); + } else { + $this->w = ((($this->aoe || $this->far) && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : '')); + $this->h = ((($this->aoe || $this->far) && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : '')); + if ($this->w || $this->h) { + if ($IMuseExplicitImageOutputDimensions) { + if ($this->w && !$this->h) { + $this->h = ceil($this->w / ($this->source_width / $this->source_height)); + } elseif ($this->h && !$this->w) { + $this->w = ceil($this->h * ($this->source_width / $this->source_height)); + } + } + list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra); + $nw = ((round($nw) != 0) ? round($nw) : ''); + $nh = ((round($nh) != 0) ? round($nh) : ''); + $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($nw.'x'.$nh); + } + } + } + } + + } else { + + $this->DebugMessage('GetImageSize('.$this->sourceFilename.') failed', __FILE__, __LINE__); + if ($this->w || $this->h) { + $exactDimensionsBang = (($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) ? '!' : ''); + if ($IMuseExplicitImageOutputDimensions) { + // unknown source aspect ratio, just put large number and hope IM figures it out + $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg(($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999').$exactDimensionsBang); + } else { + $commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($this->w.'x'.$this->h.$exactDimensionsBang); + } + } + + } + + if ($this->ra) { + $this->ra = intval($this->ra); + if ($this->ImageMagickSwitchAvailable('rotate')) { + if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) { + $this->DebugMessage('Using ImageMagick rotate', __FILE__, __LINE__); + $commandline .= ' -rotate '.escapeshellarg($this->ra); + if (($this->ra % 90) != 0) { + if (preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) { + // alpha-capable format + $commandline .= ' -background rgba(255,255,255,0)'; + } else { + $commandline .= ' -background '.escapeshellarg('#'.($this->bg ? $this->bg : 'FFFFFF')); + } + } + $this->ra = 0; + } else { + $this->DebugMessage('Not using ImageMagick rotate because alpha background buggy before v6.3.7', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('Not using ImageMagick rotate because not supported', __FILE__, __LINE__); + } + } + + $successfullyProcessedFilters = array(); + foreach ($this->fltr as $filterkey => $filtercommand) { + @list($command, $parameter) = explode('|', $filtercommand, 2); + switch ($command) { + case 'brit': + if ($this->ImageMagickSwitchAvailable('modulate')) { + $commandline .= ' -modulate '.escapeshellarg((100 + intval($parameter)).',100,100'); + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'cont': + if ($this->ImageMagickSwitchAvailable('contrast')) { + $contDiv10 = round(intval($parameter) / 10); + if ($contDiv10 > 0) { + $contDiv10 = min($contDiv10, 100); + for ($i = 0; $i < $contDiv10; $i++) { + $commandline .= ' -contrast'; // increase contrast by 10% + } + } elseif ($contDiv10 < 0) { + $contDiv10 = max($contDiv10, -100); + for ($i = $contDiv10; $i < 0; $i++) { + $commandline .= ' +contrast'; // decrease contrast by 10% + } + } else { + // do nothing + } + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'ds': + if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) { + if ($parameter == 100) { + $commandline .= ' -colorspace GRAY'; + $commandline .= ' -modulate 100,0,100'; + } else { + $commandline .= ' -modulate '.escapeshellarg('100,'.(100 - intval($parameter)).',100'); + } + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'sat': + if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) { + if ($parameter == -100) { + $commandline .= ' -colorspace GRAY'; + $commandline .= ' -modulate 100,0,100'; + } else { + $commandline .= ' -modulate '.escapeshellarg('100,'.(100 + intval($parameter)).',100'); + } + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'gray': + if ($this->ImageMagickSwitchAvailable(array('colorspace', 'modulate'))) { + $commandline .= ' -colorspace GRAY'; + $commandline .= ' -modulate 100,0,100'; + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'clr': + if ($this->ImageMagickSwitchAvailable(array('fill', 'colorize'))) { + @list($amount, $color) = explode('|', $parameter); + $commandline .= ' -fill '.escapeshellarg('#'.preg_replace('#[^0-9A-F]#i', '', $color)); + $commandline .= ' -colorize '.escapeshellarg(min(max(intval($amount), 0), 100)); + } + break; + + case 'sep': + if ($this->ImageMagickSwitchAvailable('sepia-tone')) { + @list($amount, $color) = explode('|', $parameter); + $amount = ($amount ? $amount : 80); + if (!$color) { + $commandline .= ' -sepia-tone '.escapeshellarg(min(max(intval($amount), 0), 100).'%'); + $successfullyProcessedFilters[] = $filterkey; + } + } + break; + + case 'gam': + @list($amount) = explode('|', $parameter); + $amount = min(max(floatval($amount), 0.001), 10); + if (number_format($amount, 3) != '1.000') { + if ($this->ImageMagickSwitchAvailable('gamma')) { + $commandline .= ' -gamma '.escapeshellarg($amount); + $successfullyProcessedFilters[] = $filterkey; + } + } + break; + + case 'neg': + if ($this->ImageMagickSwitchAvailable('negate')) { + $commandline .= ' -negate'; + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'th': + @list($amount) = explode('|', $parameter); + if ($this->ImageMagickSwitchAvailable(array('threshold', 'dither', 'monochrome'))) { + $commandline .= ' -threshold '.escapeshellarg(round(min(max(intval($amount), 0), 255) / 2.55).'%'); + $commandline .= ' -dither'; + $commandline .= ' -monochrome'; + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'rcd': + if ($this->ImageMagickSwitchAvailable(array('colors', 'dither'))) { + @list($colors, $dither) = explode('|', $parameter); + $colors = ($colors ? (int) $colors : 256); + $dither = ((strlen($dither) > 0) ? (bool) $dither : true); + $commandline .= ' -colors '.escapeshellarg(max($colors, 8)); // ImageMagick will otherwise fail with "cannot quantize to fewer than 8 colors" + $commandline .= ($dither ? ' -dither' : ' +dither'); + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'flip': + if ($this->ImageMagickSwitchAvailable(array('flip', 'flop'))) { + if (strpos(strtolower($parameter), 'x') !== false) { + $commandline .= ' -flop'; + } + if (strpos(strtolower($parameter), 'y') !== false) { + $commandline .= ' -flip'; + } + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'edge': + if ($this->ImageMagickSwitchAvailable('edge')) { + $parameter = (!empty($parameter) ? $parameter : 2); + $commandline .= ' -edge '.escapeshellarg(!empty($parameter) ? intval($parameter) : 1); + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'emb': + if ($this->ImageMagickSwitchAvailable(array('emboss', 'negate'))) { + $parameter = (!empty($parameter) ? $parameter : 2); + $commandline .= ' -emboss '.escapeshellarg(intval($parameter)); + if ($parameter < 2) { + $commandline .= ' -negate'; // ImageMagick negates the image for some reason with '-emboss 1'; + } + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'lvl': + @list($band, $method, $threshold) = explode('|', $parameter); + $band = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*'); + $method = ((strlen($method) > 0) ? intval($method) : 2); + $threshold = ((strlen($threshold) > 0) ? min(max(floatval($threshold), 0), 100) : 0.1); + + $band = preg_replace('#[^RGBA\\*]#', '', strtoupper($band)); + + if (($method > 1) && !$this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) { + // Because ImageMagick processing happens before PHP-GD filters, and because some + // clipping is involved in the "lvl" filter, if "lvl" happens before "wb" then the + // "wb" filter will have (almost) no effect. Therefore, if "wb" is enabled then + // force the "lvl" filter to be processed by GD, not ImageMagick. + foreach ($this->fltr as $fltr_key => $fltr_value) { + list($fltr_cmd) = explode('|', $fltr_value); + if ($fltr_cmd == 'wb') { + $this->DebugMessage('Setting "lvl" filter method to "0" (from "'.$method.'") because white-balance filter also enabled', __FILE__, __LINE__); + $method = 0; + } + } + } + + switch ($method) { + case 0: // internal RGB + case 1: // internal grayscale + break; + case 2: // ImageMagick "contrast-stretch" + if ($this->ImageMagickSwitchAvailable('contrast-stretch')) { + if ($band != '*') { + $commandline .= ' -channel '.escapeshellarg(strtoupper($band)); + } + $threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure + //$commandline .= ' -contrast-stretch '.escapeshellarg($threshold.'%'); + $commandline .= ' -contrast-stretch \''.$threshold.'%\''; + if ($band != '*') { + $commandline .= ' +channel'; + } + $successfullyProcessedFilters[] = $filterkey; + } + break; + case 3: // ImageMagick "normalize" + if ($this->ImageMagickSwitchAvailable('normalize')) { + if ($band != '*') { + $commandline .= ' -channel '.escapeshellarg(strtoupper($band)); + } + $commandline .= ' -normalize'; + if ($band != '*') { + $commandline .= ' +channel'; + } + $successfullyProcessedFilters[] = $filterkey; + } + break; + default: + $this->DebugMessage('unsupported method ('.$method.') for "lvl" filter', __FILE__, __LINE__); + break; + } + if (isset($this->fltr[$filterkey]) && ($method > 1)) { + $this->fltr[$filterkey] = $command.'|'.$band.'|0|'.$threshold; + $this->DebugMessage('filter "lvl" remapped from method "'.$method.'" to method "0" because ImageMagick support is missing', __FILE__, __LINE__); + } + break; + + case 'wb': + if ($this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) { + @list($threshold) = explode('|', $parameter); + $threshold = (!empty($threshold) ? min(max(floatval($threshold), 0), 100) : 0.1); + $threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure + //$commandline .= ' -channel R -contrast-stretch '.escapeshellarg($threshold.'%'); // doesn't work on Windows because most versions of PHP do not properly + //$commandline .= ' -channel G -contrast-stretch '.escapeshellarg($threshold.'%'); // escape special characters (such as %) and just replace them with spaces + //$commandline .= ' -channel B -contrast-stretch '.escapeshellarg($threshold.'%'); // https://bugs.php.net/bug.php?id=43261 + $commandline .= ' -channel R -contrast-stretch \''.$threshold.'%\''; + $commandline .= ' -channel G -contrast-stretch \''.$threshold.'%\''; + $commandline .= ' -channel B -contrast-stretch \''.$threshold.'%\''; + $commandline .= ' +channel'; + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'blur': + if ($this->ImageMagickSwitchAvailable('blur')) { + @list($radius) = explode('|', $parameter); + $radius = (!empty($radius) ? min(max(intval($radius), 0), 25) : 1); + $commandline .= ' -blur '.escapeshellarg($radius); + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'gblr': + @list($radius) = explode('|', $parameter); + $radius = (!empty($radius) ? min(max(intval($radius), 0), 25) : 1); + // "-gaussian" changed to "-gaussian-blur" sometime around 2009 + if ($this->ImageMagickSwitchAvailable('gaussian-blur')) { + $commandline .= ' -gaussian-blur '.escapeshellarg($radius); + $successfullyProcessedFilters[] = $filterkey; + } elseif ($this->ImageMagickSwitchAvailable('gaussian')) { + $commandline .= ' -gaussian '.escapeshellarg($radius); + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'usm': + if ($this->ImageMagickSwitchAvailable('unsharp')) { + @list($amount, $radius, $threshold) = explode('|', $parameter); + $amount = ($amount ? min(max(intval($radius), 0), 255) : 80); + $radius = ($radius ? min(max(intval($radius), 0), 10) : 0.5); + $threshold = (strlen($threshold) ? min(max(intval($radius), 0), 50) : 3); + $commandline .= ' -unsharp '.escapeshellarg(number_format(($radius * 2) - 1, 2, '.', '').'x1+'.number_format($amount / 100, 2, '.', '').'+'.number_format($threshold / 100, 2, '.', '')); + $successfullyProcessedFilters[] = $filterkey; + } + break; + + case 'bord': + if ($this->ImageMagickSwitchAvailable(array('border', 'bordercolor', 'thumbnail', 'crop'))) { + if (!$this->zc) { + @list($width, $rX, $rY, $color) = explode('|', $parameter); + $width = intval($width); + $rX = intval($rX); + $rY = intval($rY); + if ($width && !$rX && !$rY) { + if (!phpthumb_functions::IsHexColor($color)) { + $color = ((!empty($this->bc) && phpthumb_functions::IsHexColor($this->bc)) ? $this->bc : '000000'); + } + $commandline .= ' -border '.escapeshellarg(intval($width)); + $commandline .= ' -bordercolor '.escapeshellarg('#'.$color); + + if (preg_match('# \\-crop "([0-9]+)x([0-9]+)\\+0\\+0" #', $commandline, $matches)) { + $commandline = str_replace(' -crop "'.$matches[1].'x'.$matches[2].'+0+0" ', ' -crop '.escapeshellarg(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width)).'+0+0').' ', $commandline); + } elseif (preg_match('# \\-'.$IMresizeParameter.' "([0-9]+)x([0-9]+)" #', $commandline, $matches)) { + $commandline = str_replace(' -'.$IMresizeParameter.' "'.$matches[1].'x'.$matches[2].'" ', ' -'.$IMresizeParameter.' '.escapeshellarg(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width))).' ', $commandline); + } + $successfullyProcessedFilters[] = $filterkey; + } + } + } + break; + + case 'crop': + break; + + case 'sblr': + break; + + case 'mean': + break; + + case 'smth': + break; + + case 'bvl': + break; + + case 'wmi': + break; + + case 'wmt': + break; + + case 'over': + break; + + case 'hist': + break; + + case 'fram': + break; + + case 'drop': + break; + + case 'mask': + break; + + case 'elip': + break; + + case 'ric': + break; + + case 'stc': + break; + + case 'size': + break; + + default: + $this->DebugMessage('Unknown $this->fltr['.$filterkey.'] ('.$filtercommand.') -- deleting filter command', __FILE__, __LINE__); + $successfullyProcessedFilters[] = $filterkey; + break; + } + if (!isset($this->fltr[$filterkey])) { + $this->DebugMessage('Processed $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__); + } else { + $this->DebugMessage('Skipping $this->fltr['.$filterkey.'] ('.$filtercommand.') with ImageMagick', __FILE__, __LINE__); + } + } + $this->DebugMessage('Remaining $this->fltr after ImageMagick: ('.$this->phpThumbDebugVarDump($this->fltr).')', __FILE__, __LINE__); + if (count($this->fltr) > 0) { + $this->useRawIMoutput = false; + } + + if (preg_match('#jpe?g#i', $outputFormat) && $this->q) { + if ($this->ImageMagickSwitchAvailable(array('quality', 'interlace'))) { + $commandline .= ' -quality '.escapeshellarg($this->thumbnailQuality); + if ($this->config_output_interlace) { + // causes weird things with animated GIF... leave for JPEG only + $commandline .= ' -interlace line '; // Use Line or Plane to create an interlaced PNG or GIF or progressive JPEG image + } + } + } + $commandline .= ' '.escapeshellarg(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['.intval($this->sfn).']')); // [0] means first frame of (GIF) animation, can be ignored + $commandline .= ' '.$outputFormat.':'.escapeshellarg($IMtempfilename); + if (!$this->iswindows) { + $commandline .= ' 2>&1'; + } + $this->DebugMessage('ImageMagick called as ('.$commandline.')', __FILE__, __LINE__); + $IMresult = phpthumb_functions::SafeExec($commandline); + clearstatcache(); + if (!@file_exists($IMtempfilename) || !@filesize($IMtempfilename)) { + $this->FatalError('ImageMagick failed with message ('.trim($IMresult).')'); + $this->DebugMessage('ImageMagick failed with message ('.trim($IMresult).')', __FILE__, __LINE__); + if ($this->iswindows && !$IMresult) { + $this->DebugMessage('Check to make sure that PHP has read+write permissions to "'.dirname($IMtempfilename).'"', __FILE__, __LINE__); + } + + } else { + + foreach ($successfullyProcessedFilters as $dummy => $filterkey) { + unset($this->fltr[$filterkey]); + } + $this->IMresizedData = file_get_contents($IMtempfilename); + $getimagesize_imresized = @GetImageSize($IMtempfilename); + $this->DebugMessage('GetImageSize('.$IMtempfilename.') returned [w='.$getimagesize_imresized[0].';h='.$getimagesize_imresized[1].';f='.$getimagesize_imresized[2].']', __FILE__, __LINE__); + if (($this->config_max_source_pixels > 0) && (($getimagesize_imresized[0] * $getimagesize_imresized[1]) > $this->config_max_source_pixels)) { + $this->DebugMessage('skipping ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() because IM output is too large ('.$getimagesize_imresized[0].'x'.$getimagesize_imresized[0].' = '.($getimagesize_imresized[0] * $getimagesize_imresized[1]).' > '.$this->config_max_source_pixels.')', __FILE__, __LINE__); + } elseif (function_exists(@$ImageCreateFunction) && ($this->gdimg_source = @$ImageCreateFunction($IMtempfilename))) { + $this->source_width = ImageSX($this->gdimg_source); + $this->source_height = ImageSY($this->gdimg_source); + $this->DebugMessage('ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() succeeded, $this->gdimg_source is now ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__); + $this->DebugMessage('ImageMagickThumbnailToGD() returning $this->IMresizedData ('.strlen($this->IMresizedData).' bytes)', __FILE__, __LINE__); + } else { + $this->useRawIMoutput = true; + $this->DebugMessage('$this->useRawIMoutput set to TRUE because '.@$ImageCreateFunction.'('.$IMtempfilename.') failed', __FILE__, __LINE__); + } + return true; + + } + if (file_exists($IMtempfilename)) { + $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__); + @unlink($IMtempfilename); + } + + } elseif ($this->issafemode) { + $this->DebugMessage('ImageMagickThumbnailToGD() aborting because PHP safe_mode is enabled and phpThumb_tempnam() failed', __FILE__, __LINE__); + $this->useRawIMoutput = false; + } else { + if (file_exists($IMtempfilename)) { + $this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__); + @unlink($IMtempfilename); + } + $this->DebugMessage('ImageMagickThumbnailToGD() aborting, phpThumb_tempnam() failed', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('ImageMagickThumbnailToGD() aborting because ImageMagickCommandlineBase() failed', __FILE__, __LINE__); + } + $this->useRawIMoutput = false; + return false; + } + + + function Rotate() { + if ($this->ra || $this->ar) { + if (!function_exists('ImageRotate')) { + $this->DebugMessage('!function_exists(ImageRotate)', __FILE__, __LINE__); + return false; + } + if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) { + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__); + return false; + } + + $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor); + if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) { + return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"'); + } + + $rotate_angle = 0; + if ($this->ra) { + + $rotate_angle = floatval($this->ra); + + } else { + + if ($this->ar == 'x') { + if (phpthumb_functions::version_compare_replacement(phpversion(), '4.2.0', '>=')) { + if ($this->sourceFilename) { + if (function_exists('exif_read_data')) { + if ($exif_data = @exif_read_data($this->sourceFilename, 'IFD0')) { + // http://sylvana.net/jpegcrop/exif_orientation.html + switch (@$exif_data['Orientation']) { + case 1: + $rotate_angle = 0; + break; + case 3: + $rotate_angle = 180; + break; + case 6: + $rotate_angle = 270; + break; + case 8: + $rotate_angle = 90; + break; + + default: + $this->DebugMessage('EXIF auto-rotate failed because unknown $exif_data[Orientation] "'.@$exif_data['Orientation'].'"', __FILE__, __LINE__); + return false; + break; + } + $this->DebugMessage('EXIF auto-rotate set to '.$rotate_angle.' degrees ($exif_data[Orientation] = "'.@$exif_data['Orientation'].'")', __FILE__, __LINE__); + } else { + $this->DebugMessage('failed: exif_read_data('.$this->sourceFilename.')', __FILE__, __LINE__); + return false; + } + } else { + $this->DebugMessage('!function_exists(exif_read_data)', __FILE__, __LINE__); + return false; + } + } else { + $this->DebugMessage('Cannot auto-rotate from EXIF data because $this->sourceFilename is empty', __FILE__, __LINE__); + return false; + } + } else { + $this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('.phpversion().')', __FILE__, __LINE__); + return false; + } + } elseif (($this->ar == 'l') && ($this->source_height > $this->source_width)) { + $rotate_angle = 270; + } elseif (($this->ar == 'L') && ($this->source_height > $this->source_width)) { + $rotate_angle = 90; + } elseif (($this->ar == 'p') && ($this->source_width > $this->source_height)) { + $rotate_angle = 90; + } elseif (($this->ar == 'P') && ($this->source_width > $this->source_height)) { + $rotate_angle = 270; + } + + } + if ($rotate_angle % 90) { + $this->is_alpha = true; + } + phpthumb_filters::ImprovedImageRotate($this->gdimg_source, $rotate_angle, $this->config_background_hexcolor, $this->bg); + $this->source_width = ImageSX($this->gdimg_source); + $this->source_height = ImageSY($this->gdimg_source); + } + return true; + } + + + function FixedAspectRatio() { + // optional fixed-dimension images (regardless of aspect ratio) + + if (!$this->far) { + // do nothing + return true; + } + + if (!$this->w || !$this->h) { + return false; + } + $this->thumbnail_width = $this->w; + $this->thumbnail_height = $this->h; + $this->is_alpha = true; + if ($this->thumbnail_image_width >= $this->thumbnail_width) { + + if ($this->w) { + $aspectratio = $this->thumbnail_image_height / $this->thumbnail_image_width; + $this->thumbnail_image_height = round($this->thumbnail_image_width * $aspectratio); + $this->thumbnail_height = ($this->h ? $this->h : $this->thumbnail_image_height); + } elseif ($this->thumbnail_image_height < $this->thumbnail_height) { + $this->thumbnail_image_height = $this->thumbnail_height; + $this->thumbnail_image_width = round($this->thumbnail_image_height / $aspectratio); + } + + } else { + if ($this->h) { + $aspectratio = $this->thumbnail_image_width / $this->thumbnail_image_height; + $this->thumbnail_image_width = round($this->thumbnail_image_height * $aspectratio); + } elseif ($this->thumbnail_image_width < $this->thumbnail_width) { + $this->thumbnail_image_width = $this->thumbnail_width; + $this->thumbnail_image_height = round($this->thumbnail_image_width / $aspectratio); + } + + } + return true; + } + + + function OffsiteDomainIsAllowed($hostname, $allowed_domains) { + static $domain_is_allowed = array(); + $hostname = strtolower($hostname); + if (!isset($domain_is_allowed[$hostname])) { + $domain_is_allowed[$hostname] = false; + foreach ($allowed_domains as $valid_domain) { + $starpos = strpos($valid_domain, '*'); + if ($starpos !== false) { + $valid_domain = substr($valid_domain, $starpos + 1); + if (preg_match('#'.preg_quote($valid_domain).'$#', $hostname)) { + $domain_is_allowed[$hostname] = true; + break; + } + } else { + if (strtolower($valid_domain) === $hostname) { + $domain_is_allowed[$hostname] = true; + break; + } + } + } + } + return $domain_is_allowed[$hostname]; + } + + + function AntiOffsiteLinking() { + // Optional anti-offsite hijacking of the thumbnail script + $allow = true; + if ($allow && $this->config_nooffsitelink_enabled && (@$_SERVER['HTTP_REFERER'] || $this->config_nooffsitelink_require_refer)) { + $this->DebugMessage('AntiOffsiteLinking() checking $_SERVER[HTTP_REFERER] "'.@$_SERVER['HTTP_REFERER'].'"', __FILE__, __LINE__); + foreach ($this->config_nooffsitelink_valid_domains as $key => $valid_domain) { + // $_SERVER['HTTP_HOST'] contains the port number, so strip it out here to make default configuration work + list($clean_domain) = explode(':', $valid_domain); + $this->config_nooffsitelink_valid_domains[$key] = $clean_domain; + } + $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']); + if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nooffsitelink_valid_domains)) { + $allow = false; + $erase = $this->config_nooffsitelink_erase_image; + $message = $this->config_nooffsitelink_text_message; + $this->ErrorImage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')'); + exit; + $this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__); + } else { + $this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__); + } + } + + if ($allow && $this->config_nohotlink_enabled && preg_match('#^(f|ht)tps?\://#i', $this->src)) { + $parsed_url = phpthumb_functions::ParseURLbetter($this->src); + //if (!phpthumb_functions::CaseInsensitiveInArray(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) { + if ($this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) { + // This domain is not allowed + $allow = false; + $erase = $this->config_nohotlink_erase_image; + $message = $this->config_nohotlink_text_message; + $this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is NOT in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__); + } else { + $this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__); + } + } + + if ($allow) { + $this->DebugMessage('AntiOffsiteLinking() says this is allowed', __FILE__, __LINE__); + return true; + } + + if (!phpthumb_functions::IsHexColor($this->config_error_bgcolor)) { + return $this->ErrorImage('Invalid hex color string "'.$this->config_error_bgcolor.'" for $this->config_error_bgcolor'); + } + if (!phpthumb_functions::IsHexColor($this->config_error_textcolor)) { + return $this->ErrorImage('Invalid hex color string "'.$this->config_error_textcolor.'" for $this->config_error_textcolor'); + } + if ($erase) { + + return $this->ErrorImage($message, $this->thumbnail_width, $this->thumbnail_height, $this->config_error_bgcolor, $this->config_error_textcolor, $this->config_error_fontsize); + + } else { + + $this->config_nooffsitelink_watermark_src = $this->ResolveFilenameToAbsolute($this->config_nooffsitelink_watermark_src); + if (is_file($this->config_nooffsitelink_watermark_src)) { + + if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) { + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__); + return false; + } + $watermark_img = $this->ImageCreateFromStringReplacement(file_get_contents($this->config_nooffsitelink_watermark_src)); + $phpthumbFilters = new phpthumb_filters(); + $phpthumbFilters->phpThumbObject = &$this; + $opacity = 50; + $margin = 5; + $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $watermark_img, '*', $opacity, $margin); + ImageDestroy($watermark_img); + unset($phpthumbFilters); + + } else { + + $nohotlink_text_array = explode("\n", wordwrap($message, floor($this->thumbnail_width / ImageFontWidth($this->config_error_fontsize)), "\n")); + $nohotlink_text_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_error_textcolor); + + $topoffset = round(($this->thumbnail_height - (count($nohotlink_text_array) * ImageFontHeight($this->config_error_fontsize))) / 2); + + $rowcounter = 0; + $this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__); + foreach ($nohotlink_text_array as $textline) { + $leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * ImageFontWidth($this->config_error_fontsize))) / 2)); + ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color); + } + + } + + } + return true; + } + + + function AlphaChannelFlatten() { + if (!$this->is_alpha) { + // image doesn't have alpha transparency, no need to flatten + $this->DebugMessage('skipping AlphaChannelFlatten() because !$this->is_alpha', __FILE__, __LINE__); + return false; + } + switch ($this->thumbnailFormat) { + case 'png': + case 'ico': + // image has alpha transparency, but output as PNG or ICO which can handle it + $this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'")', __FILE__, __LINE__); + return false; + break; + + case 'gif': + // image has alpha transparency, but output as GIF which can handle only single-color transparency + $CurrentImageColorTransparent = ImageColorTransparent($this->gdimg_output); + if ($CurrentImageColorTransparent == -1) { + // no transparent color defined + + if (phpthumb_functions::gd_version() < 2.0) { + $this->DebugMessage('AlphaChannelFlatten() failed because GD version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + + if ($img_alpha_mixdown_dither = @ImageCreateTrueColor(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) { + + for ($i = 0; $i <= 255; $i++) { + $dither_color[$i] = ImageColorAllocate($img_alpha_mixdown_dither, $i, $i, $i); + } + + // scan through current truecolor image copy alpha channel to temp image as grayscale + for ($x = 0; $x < $this->thumbnail_width; $x++) { + for ($y = 0; $y < $this->thumbnail_height; $y++) { + $PixelColor = phpthumb_functions::GetPixelColor($this->gdimg_output, $x, $y); + ImageSetPixel($img_alpha_mixdown_dither, $x, $y, $dither_color[($PixelColor['alpha'] * 2)]); + } + } + + // dither alpha channel grayscale version down to 2 colors + ImageTrueColorToPalette($img_alpha_mixdown_dither, true, 2); + + // reduce color palette to 256-1 colors (leave one palette position for transparent color) + ImageTrueColorToPalette($this->gdimg_output, true, 255); + + // allocate a new color for transparent color index + $TransparentColor = ImageColorAllocate($this->gdimg_output, 1, 254, 253); + ImageColorTransparent($this->gdimg_output, $TransparentColor); + + // scan through alpha channel image and note pixels with >50% transparency + $TransparentPixels = array(); + for ($x = 0; $x < $this->thumbnail_width; $x++) { + for ($y = 0; $y < $this->thumbnail_height; $y++) { + $AlphaChannelPixel = phpthumb_functions::GetPixelColor($img_alpha_mixdown_dither, $x, $y); + if ($AlphaChannelPixel['red'] > 127) { + ImageSetPixel($this->gdimg_output, $x, $y, $TransparentColor); + } + } + } + ImageDestroy($img_alpha_mixdown_dither); + + $this->DebugMessage('AlphaChannelFlatten() set image to 255+1 colors with transparency for GIF output', __FILE__, __LINE__); + return true; + + } else { + $this->DebugMessage('AlphaChannelFlatten() failed ImageCreate('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).')', __FILE__, __LINE__); + return false; + } + + } else { + // a single transparent color already defined, leave as-is + $this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'") and ImageColorTransparent returned "'.$CurrentImageColorTransparent.'"', __FILE__, __LINE__); + return true; + } + break; + } + $this->DebugMessage('continuing AlphaChannelFlatten() for output format "'.$this->thumbnailFormat.'"', __FILE__, __LINE__); + // image has alpha transparency, and is being output in a format that doesn't support it -- flatten + if ($gdimg_flatten_temp = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height)) { + + $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor); + if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) { + return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"'); + } + $background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor); + ImageFilledRectangle($gdimg_flatten_temp, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color); + ImageCopy($gdimg_flatten_temp, $this->gdimg_output, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height); + + ImageAlphaBlending($this->gdimg_output, true); + ImageSaveAlpha($this->gdimg_output, false); + ImageColorTransparent($this->gdimg_output, -1); + ImageCopy($this->gdimg_output, $gdimg_flatten_temp, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height); + + ImageDestroy($gdimg_flatten_temp); + return true; + + } else { + $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__); + } + return false; + } + + + function ApplyFilters() { + if ($this->fltr && is_array($this->fltr)) { + if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) { + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__); + return false; + } + $phpthumbFilters = new phpthumb_filters(); + $phpthumbFilters->phpThumbObject = &$this; + foreach ($this->fltr as $filtercommand) { + @list($command, $parameter) = explode('|', $filtercommand, 2); + $this->DebugMessage('Attempting to process filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__); + switch ($command) { + case 'brit': // Brightness + $phpthumbFilters->Brightness($this->gdimg_output, $parameter); + break; + + case 'cont': // Contrast + $phpthumbFilters->Contrast($this->gdimg_output, $parameter); + break; + + case 'ds': // Desaturation + $phpthumbFilters->Desaturate($this->gdimg_output, $parameter, ''); + break; + + case 'sat': // Saturation + $phpthumbFilters->Saturation($this->gdimg_output, $parameter, ''); + break; + + case 'gray': // Grayscale + $phpthumbFilters->Grayscale($this->gdimg_output); + break; + + case 'clr': // Colorize + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping Colorize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + break; + } + @list($amount, $color) = explode('|', $parameter, 2); + $phpthumbFilters->Colorize($this->gdimg_output, $amount, $color); + break; + + case 'sep': // Sepia + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping Sepia() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + break; + } + @list($amount, $color) = explode('|', $parameter, 2); + $phpthumbFilters->Sepia($this->gdimg_output, $amount, $color); + break; + + case 'gam': // Gamma correction + $phpthumbFilters->Gamma($this->gdimg_output, $parameter); + break; + + case 'neg': // Negative colors + $phpthumbFilters->Negative($this->gdimg_output); + break; + + case 'th': // Threshold + $phpthumbFilters->Threshold($this->gdimg_output, $parameter); + break; + + case 'rcd': // ReduceColorDepth + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping ReduceColorDepth() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + break; + } + @list($colors, $dither) = explode('|', $parameter, 2); + $colors = ($colors ? (int) $colors : 256); + $dither = ((strlen($dither) > 0) ? (bool) $dither : true); + $phpthumbFilters->ReduceColorDepth($this->gdimg_output, $colors, $dither); + break; + + case 'flip': // Flip + $phpthumbFilters->Flip($this->gdimg_output, (strpos(strtolower($parameter), 'x') !== false), (strpos(strtolower($parameter), 'y') !== false)); + break; + + case 'edge': // EdgeDetect + $phpthumbFilters->EdgeDetect($this->gdimg_output); + break; + + case 'emb': // Emboss + $phpthumbFilters->Emboss($this->gdimg_output); + break; + + case 'bvl': // Bevel + @list($width, $color1, $color2) = explode('|', $parameter, 3); + $phpthumbFilters->Bevel($this->gdimg_output, $width, $color1, $color2); + break; + + case 'lvl': // autoLevels + @list($band, $method, $threshold) = explode('|', $parameter, 3); + $band = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*'); + $method = ((strlen($method) > 0) ? intval($method) : 2); + $threshold = ((strlen($threshold) > 0) ? floatval($threshold) : 0.1); + + $phpthumbFilters->HistogramStretch($this->gdimg_output, $band, $method, $threshold); + break; + + case 'wb': // WhiteBalance + $phpthumbFilters->WhiteBalance($this->gdimg_output, $parameter); + break; + + case 'hist': // Histogram overlay + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping HistogramOverlay() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + break; + } + @list($bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y) = explode('|', $parameter, 8); + $bands = ($bands ? $bands : '*'); + $colors = ($colors ? $colors : ''); + $width = ($width ? $width : 0.25); + $height = ($height ? $height : 0.25); + $alignment = ($alignment ? $alignment : 'BR'); + $opacity = ($opacity ? $opacity : 50); + $margin_x = ($margin_x ? $margin_x : 5); + $margin_y = $margin_y; // just to note it wasn't forgotten, but let the value always pass unchanged + $phpthumbFilters->HistogramOverlay($this->gdimg_output, $bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y); + break; + + case 'fram': // Frame + @list($frame_width, $edge_width, $color_frame, $color1, $color2) = explode('|', $parameter, 5); + $phpthumbFilters->Frame($this->gdimg_output, $frame_width, $edge_width, $color_frame, $color1, $color2); + break; + + case 'drop': // DropShadow + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping DropShadow() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + $this->is_alpha = true; + @list($distance, $width, $color, $angle, $fade) = explode('|', $parameter, 5); + $phpthumbFilters->DropShadow($this->gdimg_output, $distance, $width, $color, $angle, $fade); + break; + + case 'mask': // Mask cropping + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping Mask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + $mask_filename = $this->ResolveFilenameToAbsolute($parameter); + if (@is_readable($mask_filename) && ($fp_mask = @fopen($mask_filename, 'rb'))) { + $MaskImageData = ''; + do { + $buffer = fread($fp_mask, 8192); + $MaskImageData .= $buffer; + } while (strlen($buffer) > 0); + fclose($fp_mask); + if ($gdimg_mask = $this->ImageCreateFromStringReplacement($MaskImageData)) { + $this->is_alpha = true; + $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output); + ImageDestroy($gdimg_mask); + } else { + $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$mask_filename.'"', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('Cannot open mask file "'.$mask_filename.'"', __FILE__, __LINE__); + } + break; + + case 'elip': // Elipse cropping + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping Elipse() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + $this->is_alpha = true; + $phpthumbFilters->Elipse($this->gdimg_output); + break; + + case 'ric': // RoundedImageCorners + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping RoundedImageCorners() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + @list($radius_x, $radius_y) = explode('|', $parameter, 2); + if (($radius_x < 1) || ($radius_y < 1)) { + $this->DebugMessage('Skipping RoundedImageCorners('.$radius_x.', '.$radius_y.') because x/y radius is less than 1', __FILE__, __LINE__); + break; + } + $this->is_alpha = true; + $phpthumbFilters->RoundedImageCorners($this->gdimg_output, $radius_x, $radius_y); + break; + + case 'crop': // Crop + @list($left, $right, $top, $bottom) = explode('|', $parameter, 4); + $phpthumbFilters->Crop($this->gdimg_output, $left, $right, $top, $bottom); + break; + + case 'bord': // Border + @list($border_width, $radius_x, $radius_y, $hexcolor_border) = explode('|', $parameter, 4); + $this->is_alpha = true; + $phpthumbFilters->ImageBorder($this->gdimg_output, $border_width, $radius_x, $radius_y, $hexcolor_border); + break; + + case 'over': // Overlay + @list($filename, $underlay, $margin, $opacity) = explode('|', $parameter, 4); + $underlay = (bool) ($underlay ? $underlay : false); + $margin = ((strlen($margin) > 0) ? $margin : ($underlay ? 0.1 : 0.0)); + $opacity = ((strlen($opacity) > 0) ? $opacity : 100); + if (($margin > 0) && ($margin < 1)) { + $margin = min(0.499, $margin); + } elseif (($margin > -1) && ($margin < 0)) { + $margin = max(-0.499, $margin); + } + + $filename = $this->ResolveFilenameToAbsolute($filename); + if (@is_readable($filename) && ($fp_watermark = @fopen($filename, 'rb'))) { + $WatermarkImageData = ''; + do { + $buffer = fread($fp_watermark, 8192); + $WatermarkImageData .= $buffer; + } while (strlen($buffer) > 0); + fclose($fp_watermark); + if ($img_watermark = $this->ImageCreateFromStringReplacement($WatermarkImageData)) { + if ($margin < 1) { + $resized_x = max(1, ImageSX($this->gdimg_output) - round(2 * (ImageSX($this->gdimg_output) * $margin))); + $resized_y = max(1, ImageSY($this->gdimg_output) - round(2 * (ImageSY($this->gdimg_output) * $margin))); + } else { + $resized_x = max(1, ImageSX($this->gdimg_output) - round(2 * $margin)); + $resized_y = max(1, ImageSY($this->gdimg_output) - round(2 * $margin)); + } + + if ($underlay) { + + if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) { + ImageAlphaBlending($img_watermark_resized, false); + ImageSaveAlpha($img_watermark_resized, true); + $this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark_resized), ImageSY($img_watermark_resized), ImageSX($img_watermark), ImageSY($img_watermark)); + if ($img_source_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) { + ImageAlphaBlending($img_source_resized, false); + ImageSaveAlpha($img_source_resized, true); + $this->ImageResizeFunction($img_source_resized, $this->gdimg_output, 0, 0, 0, 0, ImageSX($img_source_resized), ImageSY($img_source_resized), ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); + $phpthumbFilters->WatermarkOverlay($img_watermark_resized, $img_source_resized, 'C', $opacity, $margin); + ImageCopy($this->gdimg_output, $img_watermark_resized, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); + } else { + $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__); + } + ImageDestroy($img_watermark_resized); + } else { + $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).')', __FILE__, __LINE__); + } + + } else { // overlay + + if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) { + ImageAlphaBlending($img_watermark_resized, false); + ImageSaveAlpha($img_watermark_resized, true); + $this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark_resized), ImageSY($img_watermark_resized), ImageSX($img_watermark), ImageSY($img_watermark)); + $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark_resized, 'C', $opacity, $margin); + ImageDestroy($img_watermark_resized); + } else { + $this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__); + } + + } + ImageDestroy($img_watermark); + + } else { + $this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$filename.'"', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('Cannot open overlay file "'.$filename.'"', __FILE__, __LINE__); + } + break; + + case 'wmi': // WaterMarkImage + @list($filename, $alignment, $opacity, $margin['x'], $margin['y'], $rotate_angle) = explode('|', $parameter, 6); + // $margin can be pixel margin or percent margin if $alignment is text, or max width/height if $alignment is position like "50x75" + $alignment = ($alignment ? $alignment : 'BR'); + $opacity = (strlen($opacity) ? intval($opacity) : 50); + $rotate_angle = (strlen($rotate_angle) ? intval($rotate_angle) : 0); + if (!preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) { + $margins = array('x', 'y'); + foreach ($margins as $xy) { + $margin[$xy] = (strlen($margin[$xy]) ? $margin[$xy] : 5); + if (($margin[$xy] > 0) && ($margin[$xy] < 1)) { + $margin[$xy] = min(0.499, $margin[$xy]); + } elseif (($margin[$xy] > -1) && ($margin[$xy] < 0)) { + $margin[$xy] = max(-0.499, $margin[$xy]); + } + } + } + + $filename = $this->ResolveFilenameToAbsolute($filename); + if (@is_readable($filename)) { + if ($img_watermark = $this->ImageCreateFromFilename($filename)) { + if ($rotate_angle !== 0) { + $phpthumbFilters->ImprovedImageRotate($img_watermark, $rotate_angle); + } + if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) { + $watermark_max_width = intval($margin['x'] ? $margin['x'] : ImageSX($img_watermark)); + $watermark_max_height = intval($margin['y'] ? $margin['y'] : ImageSY($img_watermark)); + $scale = phpthumb_functions::ScaleToFitInBox(ImageSX($img_watermark), ImageSY($img_watermark), $watermark_max_width, $watermark_max_height, true, true); + $this->DebugMessage('Scaling watermark by a factor of '.number_format($scale, 4), __FILE__, __LINE__); + if (($scale > 1) || ($scale < 1)) { + if ($img_watermark2 = phpthumb_functions::ImageCreateFunction($scale * ImageSX($img_watermark), $scale * ImageSY($img_watermark))) { + ImageAlphaBlending($img_watermark2, false); + ImageSaveAlpha($img_watermark2, true); + $this->ImageResizeFunction($img_watermark2, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark2), ImageSY($img_watermark2), ImageSX($img_watermark), ImageSY($img_watermark)); + $img_watermark = $img_watermark2; + } else { + $this->DebugMessage('ImageCreateFunction('.($scale * ImageSX($img_watermark)).', '.($scale * ImageSX($img_watermark)).') failed', __FILE__, __LINE__); + } + } + $watermark_dest_x = round($matches[1] - (ImageSX($img_watermark) / 2)); + $watermark_dest_y = round($matches[2] - (ImageSY($img_watermark) / 2)); + $alignment = $watermark_dest_x.'x'.$watermark_dest_y; + } + $phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark, $alignment, $opacity, $margin['x'], $margin['y']); + ImageDestroy($img_watermark); + if (isset($img_watermark2) && is_resource($img_watermark2)) { + ImageDestroy($img_watermark2); + } + } else { + $this->DebugMessage('ImageCreateFromFilename() failed for "'.$filename.'"', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('!is_readable('.$filename.')', __FILE__, __LINE__); + } + break; + + case 'wmt': // WaterMarkText + @list($text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend) = explode('|', $parameter, 11); + $text = ($text ? $text : ''); + $size = ($size ? $size : 3); + $alignment = ($alignment ? $alignment : 'BR'); + $hex_color = ($hex_color ? $hex_color : '000000'); + $ttffont = ($ttffont ? $ttffont : ''); + $opacity = (strlen($opacity) ? $opacity : 50); + $margin = (strlen($margin) ? $margin : 5); + $angle = (strlen($angle) ? $angle : 0); + $bg_color = ($bg_color ? $bg_color : false); + $bg_opacity = ($bg_opacity ? $bg_opacity : 0); + $fillextend = ($fillextend ? $fillextend : ''); + + if (basename($ttffont) == $ttffont) { + $ttffont = realpath($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont); + } else { + $ttffont = $this->ResolveFilenameToAbsolute($ttffont); + } + $phpthumbFilters->WatermarkText($this->gdimg_output, $text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend); + break; + + case 'blur': // Blur + @list($radius) = explode('|', $parameter, 1); + $radius = ($radius ? $radius : 1); + if (phpthumb_functions::gd_version() >= 2) { + $phpthumbFilters->Blur($this->gdimg_output, $radius); + } else { + $this->DebugMessage('Skipping Blur() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + } + break; + + case 'gblr': // Gaussian Blur + $phpthumbFilters->BlurGaussian($this->gdimg_output); + break; + + case 'sblr': // Selective Blur + $phpthumbFilters->BlurSelective($this->gdimg_output); + break; + + case 'mean': // MeanRemoval blur + $phpthumbFilters->MeanRemoval($this->gdimg_output); + break; + + case 'smth': // Smooth blur + $phpthumbFilters->Smooth($this->gdimg_output, $parameter); + break; + + case 'usm': // UnSharpMask sharpening + @list($amount, $radius, $threshold) = explode('|', $parameter, 3); + $amount = ($amount ? $amount : 80); + $radius = ($radius ? $radius : 0.5); + $threshold = (strlen($threshold) ? $threshold : 3); + if (phpthumb_functions::gd_version() >= 2.0) { + ob_start(); + if (!@include_once(dirname(__FILE__).'/phpthumb.unsharp.php')) { + $include_error = ob_get_contents(); + if ($include_error) { + $this->DebugMessage('include_once("'.dirname(__FILE__).'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__); + } + $this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__); + ob_end_clean(); + return false; + } + ob_end_clean(); + phpUnsharpMask::applyUnsharpMask($this->gdimg_output, $amount, $radius, $threshold); + } else { + $this->DebugMessage('Skipping unsharp mask because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + break; + + case 'size': // Resize + @list($newwidth, $newheight, $stretch) = explode('|', $parameter); + $newwidth = (!$newwidth ? ImageSX($this->gdimg_output) : ((($newwidth > 0) && ($newwidth < 1)) ? round($newwidth * ImageSX($this->gdimg_output)) : round($newwidth))); + $newheight = (!$newheight ? ImageSY($this->gdimg_output) : ((($newheight > 0) && ($newheight < 1)) ? round($newheight * ImageSY($this->gdimg_output)) : round($newheight))); + $stretch = ($stretch ? true : false); + if ($stretch) { + $scale_x = phpthumb_functions::ScaleToFitInBox(ImageSX($this->gdimg_output), ImageSX($this->gdimg_output), $newwidth, $newwidth, true, true); + $scale_y = phpthumb_functions::ScaleToFitInBox(ImageSY($this->gdimg_output), ImageSY($this->gdimg_output), $newheight, $newheight, true, true); + } else { + $scale_x = phpthumb_functions::ScaleToFitInBox(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output), $newwidth, $newheight, true, true); + $scale_y = $scale_x; + } + $this->DebugMessage('Scaling watermark ('.($stretch ? 'with' : 'without').' stretch) by a factor of "'.number_format($scale_x, 4).' x '.number_format($scale_y, 4).'"', __FILE__, __LINE__); + if (($scale_x > 1) || ($scale_x < 1) || ($scale_y > 1) || ($scale_y < 1)) { + if ($img_temp = phpthumb_functions::ImageCreateFunction(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) { + ImageCopy($img_temp, $this->gdimg_output, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); + //ImageDestroy($this->gdimg_output); + if ($this->gdimg_output = phpthumb_functions::ImageCreateFunction($scale_x * ImageSX($img_temp), $scale_y * ImageSY($img_temp))) { + ImageAlphaBlending($this->gdimg_output, false); + ImageSaveAlpha($this->gdimg_output, true); + $this->ImageResizeFunction($this->gdimg_output, $img_temp, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output), ImageSX($img_temp), ImageSY($img_temp)); + } else { + $this->DebugMessage('ImageCreateFunction('.($scale_x * ImageSX($img_temp)).', '.($scale_y * ImageSY($img_temp)).') failed', __FILE__, __LINE__); + } + ImageDestroy($img_temp); + } else { + $this->DebugMessage('ImageCreateFunction('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).') failed', __FILE__, __LINE__); + } + } + break; + + case 'rot': // ROTate + @list($angle, $bgcolor) = explode('|', $parameter, 2); + $phpthumbFilters->ImprovedImageRotate($this->gdimg_output, $angle, $bgcolor); + break; + + case 'stc': // Source Transparent Color + @list($hexcolor, $min_limit, $max_limit) = explode('|', $parameter, 3); + if (!phpthumb_functions::IsHexColor($hexcolor)) { + $this->DebugMessage('Skipping SourceTransparentColor hex color is invalid ('.$hexcolor.')', __FILE__, __LINE__); + return false; + } + $min_limit = (strlen($min_limit) ? $min_limit : 5); + $max_limit = (strlen($max_limit) ? $max_limit : 10); + if ($gdimg_mask = $phpthumbFilters->SourceTransparentColorMask($this->gdimg_output, $hexcolor, $min_limit, $max_limit)) { + $this->is_alpha = true; + $phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output); + ImageDestroy($gdimg_mask); + } else { + $this->DebugMessage('SourceTransparentColorMask() failed for "'.$mask_filename.'"', __FILE__, __LINE__); + } + break; + } + $this->DebugMessage('Finished processing filter command "'.$command.'('.$parameter.')"', __FILE__, __LINE__); + } + } + return true; + } + + + function MaxFileSize() { + if (phpthumb_functions::gd_version() < 2) { + $this->DebugMessage('Skipping MaxFileSize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + if ($this->maxb > 0) { + switch ($this->thumbnailFormat) { + case 'png': + case 'gif': + $imgRenderFunction = 'image'.$this->thumbnailFormat; + + ob_start(); + $imgRenderFunction($this->gdimg_output); + $imgdata = ob_get_contents(); + ob_end_clean(); + + if (strlen($imgdata) > $this->maxb) { + for ($i = 8; $i >= 1; $i--) { + $tempIMG = ImageCreateTrueColor(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); + ImageCopy($tempIMG, $this->gdimg_output, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output)); + ImageTrueColorToPalette($tempIMG, true, pow(2, $i)); + ob_start(); + $imgRenderFunction($tempIMG); + $imgdata = ob_get_contents(); + ob_end_clean(); + + if (strlen($imgdata) <= $this->maxb) { + ImageTrueColorToPalette($this->gdimg_output, true, pow(2, $i)); + break; + } + } + } + if (strlen($imgdata) > $this->maxb) { + ImageTrueColorToPalette($this->gdimg_output, true, pow(2, $i)); + return false; + } + break; + + case 'jpeg': + ob_start(); + ImageJPEG($this->gdimg_output); + $imgdata = ob_get_contents(); + ob_end_clean(); + + $OriginalJPEGquality = $this->thumbnailQuality; + if (strlen($imgdata) > $this->maxb) { + for ($i = 3; $i < 20; $i++) { + $q = round(100 * (1 - log10($i / 2))); + ob_start(); + ImageJPEG($this->gdimg_output, '', $q); + $imgdata = ob_get_contents(); + ob_end_clean(); + + $this->thumbnailQuality = $q; + if (strlen($imgdata) <= $this->maxb) { + break; + } + } + } + if (strlen($imgdata) > $this->maxb) { + return false; + } + break; + + default: + return false; + break; + } + } + return true; + } + + + function CalculateThumbnailDimensions() { + $this->DebugMessage('CalculateThumbnailDimensions() starting with [W,H,sx,sy,sw,sh] initially set to ['.$this->source_width.','.$this->source_height.','.$this->sx.','.$this->sy.','.$this->sw.','.$this->sh.']', __FILE__, __LINE__); //echo $this->source_width.'x'.$this->source_height.'
    '; - $this->thumbnailCropX = ($this->sx ? (($this->sx >= 1) ? $this->sx : round($this->sx * $this->source_width)) : 0); + $this->thumbnailCropX = ($this->sx ? (($this->sx >= 2) ? $this->sx : round($this->sx * $this->source_width)) : 0); //echo $this->thumbnailCropX.'
    '; - $this->thumbnailCropY = ($this->sy ? (($this->sy >= 1) ? $this->sy : round($this->sy * $this->source_height)) : 0); + $this->thumbnailCropY = ($this->sy ? (($this->sy >= 2) ? $this->sy : round($this->sy * $this->source_height)) : 0); //echo $this->thumbnailCropY.'
    '; - $this->thumbnailCropW = ($this->sw ? (($this->sw >= 1) ? $this->sw : round($this->sw * $this->source_width)) : $this->source_width); + $this->thumbnailCropW = ($this->sw ? (($this->sw >= 2) ? $this->sw : round($this->sw * $this->source_width)) : $this->source_width); //echo $this->thumbnailCropW.'
    '; - $this->thumbnailCropH = ($this->sh ? (($this->sh >= 1) ? $this->sh : round($this->sh * $this->source_height)) : $this->source_height); + $this->thumbnailCropH = ($this->sh ? (($this->sh >= 2) ? $this->sh : round($this->sh * $this->source_height)) : $this->source_height); //echo $this->thumbnailCropH.'
    '; - // limit source area to original image area - $this->thumbnailCropW = max(1, min($this->thumbnailCropW, $this->source_width - $this->thumbnailCropX)); - $this->thumbnailCropH = max(1, min($this->thumbnailCropH, $this->source_height - $this->thumbnailCropY)); - - $this->DebugMessage('CalculateThumbnailDimensions() [x,y,w,h] initially set to ['.$this->thumbnailCropX.','.$this->thumbnailCropY.','.$this->thumbnailCropW.','.$this->thumbnailCropH.']', __FILE__, __LINE__); - - - if ($this->zc && $this->w && $this->h) { - // Zoom Crop - // retain proportional resizing we did above, but crop off larger dimension so smaller - // dimension fully fits available space - - $scaling_X = $this->source_width / $this->w; - $scaling_Y = $this->source_height / $this->h; - if ($scaling_X > $scaling_Y) { - // some of the width will need to be cropped - $allowable_width = $this->source_width / $scaling_X * $scaling_Y; - $this->thumbnailCropW = round($allowable_width); - $this->thumbnailCropX = round(($this->source_width - $allowable_width) / 2); - - } elseif ($scaling_Y > $scaling_X) { - // some of the height will need to be cropped - $allowable_height = $this->source_height / $scaling_Y * $scaling_X; - $this->thumbnailCropH = round($allowable_height); - $this->thumbnailCropY = round(($this->source_height - $allowable_height) / 2); - - } else { - // image fits perfectly, no cropping needed - } - $this->thumbnail_width = $this->w; - $this->thumbnail_height = $this->h; - $this->thumbnail_image_width = $this->thumbnail_width; - $this->thumbnail_image_height = $this->thumbnail_height; - - } elseif ($this->iar && $this->w && $this->h) { - - // Ignore Aspect Ratio - // stretch image to fit exactly 'w' x 'h' - $this->thumbnail_width = $this->w; - $this->thumbnail_height = $this->h; - $this->thumbnail_image_width = $this->thumbnail_width; - $this->thumbnail_image_height = $this->thumbnail_height; - - } else { - - $original_aspect_ratio = $this->thumbnailCropW / $this->thumbnailCropH; - if ($this->aoe) { - if ($this->w && $this->h) { - $maxwidth = min($this->w, $this->h * $original_aspect_ratio); - $maxheight = min($this->h, $this->w / $original_aspect_ratio); - } elseif ($this->w) { - $maxwidth = $this->w; - $maxheight = $this->w / $original_aspect_ratio; - } elseif ($this->h) { - $maxwidth = $this->h * $original_aspect_ratio; - $maxheight = $this->h; - } else { - $maxwidth = $this->thumbnailCropW; - $maxheight = $this->thumbnailCropH; - } - } else { - $maxwidth = phpthumb_functions::nonempty_min($this->w, $this->thumbnailCropW, $this->config_output_maxwidth); - $maxheight = phpthumb_functions::nonempty_min($this->h, $this->thumbnailCropH, $this->config_output_maxheight); + // limit source area to original image area + $this->thumbnailCropW = max(1, min($this->thumbnailCropW, $this->source_width - $this->thumbnailCropX)); + $this->thumbnailCropH = max(1, min($this->thumbnailCropH, $this->source_height - $this->thumbnailCropY)); + + $this->DebugMessage('CalculateThumbnailDimensions() starting with [x,y,w,h] initially set to ['.$this->thumbnailCropX.','.$this->thumbnailCropY.','.$this->thumbnailCropW.','.$this->thumbnailCropH.']', __FILE__, __LINE__); + + + if ($this->zc && $this->w && $this->h) { + // Zoom Crop + // retain proportional resizing we did above, but crop off larger dimension so smaller + // dimension fully fits available space + + $scaling_X = $this->source_width / $this->w; + $scaling_Y = $this->source_height / $this->h; + if ($scaling_X > $scaling_Y) { + // some of the width will need to be cropped + $allowable_width = $this->source_width / $scaling_X * $scaling_Y; + $this->thumbnailCropW = round($allowable_width); + $this->thumbnailCropX = round(($this->source_width - $allowable_width) / 2); + + } elseif ($scaling_Y > $scaling_X) { + // some of the height will need to be cropped + $allowable_height = $this->source_height / $scaling_Y * $scaling_X; + $this->thumbnailCropH = round($allowable_height); + $this->thumbnailCropY = round(($this->source_height - $allowable_height) / 2); + + } else { + // image fits perfectly, no cropping needed + } + $this->thumbnail_width = $this->w; + $this->thumbnail_height = $this->h; + $this->thumbnail_image_width = $this->thumbnail_width; + $this->thumbnail_image_height = $this->thumbnail_height; + + } elseif ($this->iar && $this->w && $this->h) { + + // Ignore Aspect Ratio + // stretch image to fit exactly 'w' x 'h' + $this->thumbnail_width = $this->w; + $this->thumbnail_height = $this->h; + $this->thumbnail_image_width = $this->thumbnail_width; + $this->thumbnail_image_height = $this->thumbnail_height; + + } else { + + $original_aspect_ratio = $this->thumbnailCropW / $this->thumbnailCropH; + if ($this->aoe) { + if ($this->w && $this->h) { + $maxwidth = min($this->w, $this->h * $original_aspect_ratio); + $maxheight = min($this->h, $this->w / $original_aspect_ratio); + } elseif ($this->w) { + $maxwidth = $this->w; + $maxheight = $this->w / $original_aspect_ratio; + } elseif ($this->h) { + $maxwidth = $this->h * $original_aspect_ratio; + $maxheight = $this->h; + } else { + $maxwidth = $this->thumbnailCropW; + $maxheight = $this->thumbnailCropH; + } + } else { + $maxwidth = phpthumb_functions::nonempty_min($this->w, $this->thumbnailCropW, $this->config_output_maxwidth); + $maxheight = phpthumb_functions::nonempty_min($this->h, $this->thumbnailCropH, $this->config_output_maxheight); //echo $maxwidth.'x'.$maxheight.'
    '; - $maxwidth = min($maxwidth, $maxheight * $original_aspect_ratio); - $maxheight = min($maxheight, $maxwidth / $original_aspect_ratio); + $maxwidth = min($maxwidth, $maxheight * $original_aspect_ratio); + $maxheight = min($maxheight, $maxwidth / $original_aspect_ratio); //echo $maxwidth.'x'.$maxheight.'
    '; - } - - $this->thumbnail_image_width = $maxwidth; - $this->thumbnail_image_height = $maxheight; - $this->thumbnail_width = $maxwidth; - $this->thumbnail_height = $maxheight; - - $this->FixedAspectRatio(); - } - - $this->thumbnail_width = max(1, floor($this->thumbnail_width)); - $this->thumbnail_height = max(1, floor($this->thumbnail_height)); - return true; - } - - - function CreateGDoutput() { - $this->CalculateThumbnailDimensions(); - - // Create the GD image (either true-color or 256-color, depending on GD version) - $this->gdimg_output = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height); - - // Images that have transparency must have the background filled with the configured 'bg' color - // otherwise the transparent color will appear as black - ImageSaveAlpha($this->gdimg_output, true); - if ($this->is_alpha && phpthumb_functions::gd_version() >= 2) { - - ImageAlphaBlending($this->gdimg_output, false); - $output_full_alpha = phpthumb_functions::ImageColorAllocateAlphaSafe($this->gdimg_output, 255, 255, 255, 127); - ImageFilledRectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $output_full_alpha); - - } else { - - $current_transparent_color = ImageColorTransparent($this->gdimg_source); - if ($this->bg || (@$current_transparent_color >= 0)) { - - $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor); - if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) { - return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"'); - } - $background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor); - ImageFilledRectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color); - - } - - } - $this->DebugMessage('CreateGDoutput() returning canvas "'.$this->thumbnail_width.'x'.$this->thumbnail_height.'"', __FILE__, __LINE__); - return true; - } - - function SetOrientationDependantWidthHeight() { - $this->DebugMessage('SetOrientationDependantWidthHeight() starting with "'.$this->source_width.'"x"'.$this->source_height.'"', __FILE__, __LINE__); - if ($this->source_height > $this->source_width) { - // portrait - $this->w = phpthumb_functions::OneOfThese($this->wp, $this->w, $this->ws, $this->wl); - $this->h = phpthumb_functions::OneOfThese($this->hp, $this->h, $this->hs, $this->hl); - } elseif ($this->source_height < $this->source_width) { - // landscape - $this->w = phpthumb_functions::OneOfThese($this->wl, $this->w, $this->ws, $this->wp); - $this->h = phpthumb_functions::OneOfThese($this->hl, $this->h, $this->hs, $this->hp); - } else { - // square - $this->w = phpthumb_functions::OneOfThese($this->ws, $this->w, $this->wl, $this->wp); - $this->h = phpthumb_functions::OneOfThese($this->hs, $this->h, $this->hl, $this->hp); - } - //$this->w = round($this->w ? $this->w : (($this->h && $this->source_height) ? $this->h * $this->source_width / $this->source_height : $this->w)); - //$this->h = round($this->h ? $this->h : (($this->w && $this->source_width) ? $this->w * $this->source_height / $this->source_width : $this->h)); - $this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'.intval($this->w).'", h="'.intval($this->h).'"', __FILE__, __LINE__); - return true; - } - - function ExtractEXIFgetImageSize() { - $this->DebugMessage('starting ExtractEXIFgetImageSize()', __FILE__, __LINE__); - - if (is_resource($this->gdimg_source)) { - - $this->source_width = ImageSX($this->gdimg_source); - $this->source_height = ImageSY($this->gdimg_source); - - $this->SetOrientationDependantWidthHeight(); - - } elseif ($this->rawImageData && !$this->sourceFilename) { - - $this->DebugMessage('bypassing EXIF and GetImageSize sections because $this->rawImageData is set and $this->sourceFilename is not set', __FILE__, __LINE__); - - } - - if (is_null($this->getimagesizeinfo)) { - $this->getimagesizeinfo = @GetImageSize($this->sourceFilename); - } - - if (!empty($this->getimagesizeinfo)) { - // great - $this->getimagesizeinfo['filesize'] = @filesize($this->sourceFilename); - } elseif (!$this->rawImageData) { - $this->DebugMessage('GetImageSize("'.$this->sourceFilename.'") failed', __FILE__, __LINE__); - } - - if ($this->config_prefer_imagemagick) { - if ($this->ImageMagickThumbnailToGD()) { - return true; - } - $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__); - } - - $this->source_width = $this->getimagesizeinfo[0]; - $this->source_height = $this->getimagesizeinfo[1]; - - $this->SetOrientationDependantWidthHeight(); - - if (phpthumb_functions::version_compare_replacement(phpversion(), '4.2.0', '>=') && function_exists('exif_read_data')) { - $this->exif_raw_data = @exif_read_data($this->sourceFilename, 0, true); - } - if (function_exists('exif_thumbnail') && ($this->getimagesizeinfo[2] == 2)) { - // Extract EXIF info from JPEGs - - $this->exif_thumbnail_width = ''; - $this->exif_thumbnail_height = ''; - $this->exif_thumbnail_type = ''; - - // The parameters width, height and imagetype are available since PHP v4.3.0 - if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=')) { - - $this->exif_thumbnail_data = @exif_thumbnail($this->sourceFilename, $this->exif_thumbnail_width, $this->exif_thumbnail_height, $this->exif_thumbnail_type); - - } else { - - // older versions of exif_thumbnail output an error message but NOT return false on failure - ob_start(); - $this->exif_thumbnail_data = exif_thumbnail($this->sourceFilename); - $exit_thumbnail_error = ob_get_contents(); - ob_end_clean(); - if (!$exit_thumbnail_error && $this->exif_thumbnail_data) { - - if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) { - $this->exif_thumbnail_width = ImageSX($gdimg_exif_temp); - $this->exif_thumbnail_height = ImageSY($gdimg_exif_temp); - $this->exif_thumbnail_type = 2; // (2 == JPEG) before PHP v4.3.0 only JPEG format EXIF thumbnails are returned - unset($gdimg_exif_temp); - } else { - return $this->ErrorImage('Failed - $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data) in '.__FILE__.' on line '.__LINE__); - } - - } - - } - - } elseif (!function_exists('exif_thumbnail')) { - - $this->DebugMessage('exif_thumbnail() does not exist, cannot extract EXIF thumbnail', __FILE__, __LINE__); - return false; - - } - - $this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '.intval($this->exif_thumbnail_width).'x'.intval($this->exif_thumbnail_height).')', __FILE__, __LINE__); - - // see if EXIF thumbnail can be used directly with no processing - if ($this->config_use_exif_thumbnail_for_speed && $this->exif_thumbnail_data) { - while (true) { - if (!$this->xto) { - $source_ar = $this->source_width / $this->source_height; - $exif_ar = $this->exif_thumbnail_width / $this->exif_thumbnail_height; - if (number_format($source_ar, 2) != number_format($exif_ar, 2)) { - $this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__); - break; - } - if ($this->w && ($this->w != $this->exif_thumbnail_width)) { - $this->DebugMessage('not using EXIF thumbnail because $this->w != $this->exif_thumbnail_width ('.$this->w.' != '.$this->exif_thumbnail_width.')', __FILE__, __LINE__); - break; - } - if ($this->h && ($this->h != $this->exif_thumbnail_height)) { - $this->DebugMessage('not using EXIF thumbnail because $this->h != $this->exif_thumbnail_height ('.$this->h.' != '.$this->exif_thumbnail_height.')', __FILE__, __LINE__); - break; - } - $CannotBeSetParameters = array('sx', 'sy', 'sh', 'sw', 'far', 'bg', 'bc', 'fltr', 'phpThumbDebug'); - foreach ($CannotBeSetParameters as $parameter) { - if ($this->$parameter) { - break 2; - } - } - } - - $this->DebugMessage('setting $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data)', __FILE__, __LINE__); - $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data); - $this->source_width = ImageSX($this->gdimg_source); - $this->source_height = ImageSY($this->gdimg_source); - return true; - } - } - - if (($this->config_max_source_pixels > 0) && (($this->source_width * $this->source_height) > $this->config_max_source_pixels)) { - - // Source image is larger than would fit in available PHP memory. - // If ImageMagick is installed, use it to generate the thumbnail. - // Else, if an EXIF thumbnail is available, use that as the source image. - // Otherwise, no choice but to fail with an error message - $this->DebugMessage('image is '.$this->source_width.'x'.$this->source_height.' and therefore contains more pixels ('.($this->source_width * $this->source_height).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__); - if (!$this->config_prefer_imagemagick && $this->ImageMagickThumbnailToGD()) { - // excellent, we have a thumbnailed source image - return true; - } - - } - return true; - } - - - function SetCacheFilename() { - if (!is_null($this->cache_filename)) { - $this->DebugMessage('$this->cache_filename already set, skipping SetCacheFilename()', __FILE__, __LINE__); - return true; - } - $this->setOutputFormat(); - $this->setCacheDirectory(); - if (!$this->config_cache_directory) { - $this->DebugMessage('SetCacheFilename() failed because $this->config_cache_directory is empty', __FILE__, __LINE__); - return false; - } - - if (!$this->sourceFilename && !$this->rawImageData && $this->src) { - $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src); - } - - if ($this->config_cache_default_only_suffix && $this->sourceFilename) { - // simplified cache filenames: - // only use default parameters in phpThumb.config.php - // substitute source filename into * in $this->config_cache_default_only_suffix - // (eg: '*_thumb' becomes 'picture_thumb.jpg') - if (strpos($this->config_cache_default_only_suffix, '*') === false) { - $this->DebugMessage('aborting simplified caching filename because no * in "'.$this->config_cache_default_only_suffix.'"', __FILE__, __LINE__); - } else { - preg_match('/(.+)(\.[a-z0-9]+)?$/i', basename($this->sourceFilename), $matches); - $this->cache_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.rawurlencode(str_replace('*', @$matches[1], $this->config_cache_default_only_suffix)).'.'.strtolower($this->thumbnailFormat); - return true; - } - } - - $this->cache_filename = ''; - $broad_directory_name = ''; - if ($this->new) { - $broad_directory_name = strtolower(md5($this->new)); - $this->cache_filename .= '_new'.$broad_directory_name; - } elseif ($this->md5s) { - // source image MD5 hash provided - $this->DebugMessage('SetCacheFilename() _raw set from $this->md5s = "'.$this->md5s.'"', __FILE__, __LINE__); - $broad_directory_name = $this->md5s; - $this->cache_filename .= '_raw'.$this->md5s; - } elseif (!$this->src && $this->rawImageData) { - $this->DebugMessage('SetCacheFilename() _raw set from md5($this->rawImageData) = "'.md5($this->rawImageData).'"', __FILE__, __LINE__); - $broad_directory_name = strtolower(md5($this->rawImageData)); - $this->cache_filename .= '_raw'.$broad_directory_name; - } else { - $this->DebugMessage('SetCacheFilename() _src set from md5($this->sourceFilename) "'.$this->sourceFilename.'" = "'.md5($this->sourceFilename).'"', __FILE__, __LINE__); - $broad_directory_name = strtolower(md5($this->sourceFilename)); - $this->cache_filename .= '_src'.$broad_directory_name; - } - if (@$_SERVER['HTTP_REFERER'] && $this->config_nooffsitelink_enabled) { - $parsed_url1 = @phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']); - $parsed_url2 = @phpthumb_functions::ParseURLbetter('http://'.@$_SERVER['HTTP_HOST']); - if (@$parsed_url1['host'] && @$parsed_url2['host'] && ($parsed_url1['host'] != $parsed_url2['host'])) { - // include "_offsite" only if nooffsitelink_enabled and if referrer doesn't match the domain of the current server - $this->cache_filename .= '_offsite'; - } - } - - $ParametersString = ''; - if ($this->fltr && is_array($this->fltr)) { - $ParametersString .= '_fltr'.implode('_fltr', $this->fltr); - } - $FilenameParameters1 = array('ar', 'bg', 'bc', 'far', 'sx', 'sy', 'sw', 'sh', 'zc'); - foreach ($FilenameParameters1 as $key) { - if ($this->$key) { - $ParametersString .= '_'.$key.$this->$key; - } - } - $FilenameParameters2 = array('h', 'w', 'wl', 'wp', 'ws', 'hp', 'hs', 'xto', 'ra', 'iar', 'aoe', 'maxb', 'sfn', 'dpi'); - foreach ($FilenameParameters2 as $key) { - if ($this->$key) { - $ParametersString .= '_'.$key.intval($this->$key); - } - } - if ($this->thumbnailFormat == 'jpeg') { - // only JPEG output has variable quality option - $ParametersString .= '_q'.intval($this->thumbnailQuality); - } - $this->DebugMessage('SetCacheFilename() _par set from md5('.$ParametersString.')', __FILE__, __LINE__); - $this->cache_filename .= '_par'.strtolower(md5($ParametersString)); - - if ($this->md5s) { - // source image MD5 hash provided - // do not source image modification date -- - // cached image will be used even if file was modified or removed - } elseif (!$this->config_cache_source_filemtime_ignore_remote && preg_match('/^(f|ht)tps?\:\/\//i', $this->src)) { - $this->cache_filename .= '_dat'.intval(phpthumb_functions::filedate_remote($this->src)); - } elseif (!$this->config_cache_source_filemtime_ignore_local && $this->src && !$this->rawImageData) { - $this->cache_filename .= '_dat'.intval(@filemtime($this->sourceFilename)); - } - - $this->cache_filename .= '.'.strtolower($this->thumbnailFormat); - $broad_directories = ''; - for ($i = 0; $i < $this->config_cache_directory_depth; $i++) { - $broad_directories .= DIRECTORY_SEPARATOR.substr($broad_directory_name, 0, $i + 1); - } - - $this->cache_filename = $this->config_cache_directory.$broad_directories.DIRECTORY_SEPARATOR.$this->config_cache_prefix.rawurlencode($this->cache_filename); - return true; - } - - - function SourceImageIsTooLarge($width, $height) { - if (!$this->config_max_source_pixels) { - return false; - } - if (function_exists('memory_get_usage')) { - $available_memory = max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576; - $available_memory -= memory_get_usage(); - return (bool) (($width * $height * 5) > $available_memory); - } - return (bool) (($width * $height) > $this->config_max_source_pixels); - } - - function ImageCreateFromFilename($filename) { - // try to create GD image source directly via GD, if possible, - // rather than buffering to memory and creating with ImageCreateFromString - $ImageCreateWasAttempted = false; - $gd_image = false; - - $this->DebugMessage('starting ImageCreateFromFilename('.$filename.')', __FILE__, __LINE__); - if ($filename && ($getimagesizeinfo = @GetImageSize($filename))) { - if (!$this->SourceImageIsTooLarge($getimagesizeinfo[0], $getimagesizeinfo[1])) { - $ImageCreateFromFunction = array( - 1 => 'ImageCreateFromGIF', - 2 => 'ImageCreateFromJPEG', - 3 => 'ImageCreateFromPNG', - 15 => 'ImageCreateFromWBMP', - ); - $this->DebugMessage('ImageCreateFromFilename found ($getimagesizeinfo[2]=='.@$getimagesizeinfo[2].')', __FILE__, __LINE__); - switch (@$getimagesizeinfo[2]) { - case 1: // GIF - case 2: // JPEG - case 3: // PNG - case 15: // WBMP - $ImageCreateFromFunctionName = $ImageCreateFromFunction[$getimagesizeinfo[2]]; - if (function_exists($ImageCreateFromFunctionName)) { - $this->DebugMessage('Calling '.$ImageCreateFromFunctionName.'('.$filename.')', __FILE__, __LINE__); - $ImageCreateWasAttempted = true; - $gd_image = $ImageCreateFromFunctionName($filename); - } else { - $this->DebugMessage('NOT calling '.$ImageCreateFromFunctionName.'('.$filename.') because !function_exists('.$ImageCreateFromFunctionName.')', __FILE__, __LINE__); - } - break; - - case 4: // SWF - case 5: // PSD - case 6: // BMP - case 7: // TIFF (LE) - case 8: // TIFF (BE) - case 9: // JPC - case 10: // JP2 - case 11: // JPX - case 12: // JB2 - case 13: // SWC - case 14: // IFF - case 16: // XBM - $this->DebugMessage('No built-in image creation function for image type "'.@$getimagesizeinfo[2].'" ($getimagesizeinfo[2])', __FILE__, __LINE__); - break; - - default: - $this->DebugMessage('Unknown value for $getimagesizeinfo[2]: "'.@$getimagesizeinfo[2].'"', __FILE__, __LINE__); - break; - } - } else { - $this->DebugMessage('image is '.$getimagesizeinfo[0].'x'.$getimagesizeinfo[1].' and therefore contains more pixels ('.($getimagesizeinfo[0] * $getimagesizeinfo[1]).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__); - return false; - } - } else { - $this->DebugMessage('empty $filename or GetImageSize('.$filename.') failed', __FILE__, __LINE__); - } - - if (!$gd_image) { - // cannot create from filename, attempt to create source image with ImageCreateFromString, if possible - if ($ImageCreateWasAttempted) { - $this->DebugMessage(@$ImageCreateFromFunctionName.'() was attempted but FAILED', __FILE__, __LINE__); - } - $this->DebugMessage('Populating $rawimagedata', __FILE__, __LINE__); - $rawimagedata = ''; - if ($fp = @fopen($filename, 'rb')) { - $filesize = filesize($filename); - $blocksize = 8192; - $blockreads = ceil($filesize / $blocksize); - for ($i = 0; $i < $blockreads; $i++) { - $rawimagedata .= fread($fp, $blocksize); - } - fclose($fp); - } else { - $this->DebugMessage('cannot fopen('.$filename.')', __FILE__, __LINE__); - } - if ($rawimagedata) { - $this->DebugMessage('attempting ImageCreateFromStringReplacement($rawimagedata ('.strlen($rawimagedata).' bytes), true)', __FILE__, __LINE__); - $gd_image = $this->ImageCreateFromStringReplacement($rawimagedata, true); - } - } - return $gd_image; - } - - function SourceImageToGD() { - if (is_resource($this->gdimg_source)) { - $this->source_width = ImageSX($this->gdimg_source); - $this->source_height = ImageSY($this->gdimg_source); - $this->DebugMessage('skipping SourceImageToGD() because $this->gdimg_source is already a resource ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__); - return true; - } - $this->DebugMessage('starting SourceImageToGD()', __FILE__, __LINE__); - - if ($this->ImageMagickThumbnailToGD()) { - - // excellent, we have a thumbnailed source image - $this->DebugMessage('ImageMagickThumbnailToGD() succeeded', __FILE__, __LINE__); - - } elseif (!$this->gdimg_source && $this->rawImageData) { - - if ($this->md5s && ($this->md5s != md5($this->rawImageData))) { - return $this->ErrorImage('$this->md5s != md5($this->rawImageData)'."\n".'"'.$this->md5s.'" != '."\n".'"'.md5($this->rawImageData).'"'); - } - $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->rawImageData); - if (!$this->gdimg_source) { - if (substr($this->rawImageData, 0, 2) === 'BM') { - $this->getimagesizeinfo[2] = 6; // BMP - } elseif (substr($this->rawImageData, 0, 4) === 'II'."\x2A\x00") { - $this->getimagesizeinfo[2] = 7; // TIFF (littlendian) - } elseif (substr($this->rawImageData, 0, 4) === 'MM'."\x00\x2A") { - $this->getimagesizeinfo[2] = 8; // TIFF (bigendian) - } - $this->DebugMessage('SourceImageToGD.ImageCreateFromStringReplacement() failed with unknown image type "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).')', __FILE__, __LINE__); + } + + $this->thumbnail_image_width = $maxwidth; + $this->thumbnail_image_height = $maxheight; + $this->thumbnail_width = $maxwidth; + $this->thumbnail_height = $maxheight; + + $this->FixedAspectRatio(); + } + + $this->thumbnail_width = max(1, floor($this->thumbnail_width)); + $this->thumbnail_height = max(1, floor($this->thumbnail_height)); + return true; + } + + + function CreateGDoutput() { + $this->CalculateThumbnailDimensions(); + + // Create the GD image (either true-color or 256-color, depending on GD version) + $this->gdimg_output = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height); + + // Images that have transparency must have the background filled with the configured 'bg' color + // otherwise the transparent color will appear as black + ImageSaveAlpha($this->gdimg_output, true); + if ($this->is_alpha && phpthumb_functions::gd_version() >= 2) { + + ImageAlphaBlending($this->gdimg_output, false); + $output_full_alpha = phpthumb_functions::ImageColorAllocateAlphaSafe($this->gdimg_output, 255, 255, 255, 127); + ImageFilledRectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $output_full_alpha); + + } else { + + $current_transparent_color = ImageColorTransparent($this->gdimg_source); + if ($this->bg || (@$current_transparent_color >= 0)) { + + $this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor); + if (!phpthumb_functions::IsHexColor($this->config_background_hexcolor)) { + return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"'); + } + $background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor); + ImageFilledRectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color); + + } + + } + $this->DebugMessage('CreateGDoutput() returning canvas "'.$this->thumbnail_width.'x'.$this->thumbnail_height.'"', __FILE__, __LINE__); + return true; + } + + function SetOrientationDependantWidthHeight() { + $this->DebugMessage('SetOrientationDependantWidthHeight() starting with "'.$this->source_width.'"x"'.$this->source_height.'"', __FILE__, __LINE__); + if ($this->source_height > $this->source_width) { + // portrait + $this->w = phpthumb_functions::OneOfThese($this->wp, $this->w, $this->ws, $this->wl); + $this->h = phpthumb_functions::OneOfThese($this->hp, $this->h, $this->hs, $this->hl); + } elseif ($this->source_height < $this->source_width) { + // landscape + $this->w = phpthumb_functions::OneOfThese($this->wl, $this->w, $this->ws, $this->wp); + $this->h = phpthumb_functions::OneOfThese($this->hl, $this->h, $this->hs, $this->hp); + } else { + // square + $this->w = phpthumb_functions::OneOfThese($this->ws, $this->w, $this->wl, $this->wp); + $this->h = phpthumb_functions::OneOfThese($this->hs, $this->h, $this->hl, $this->hp); + } + //$this->w = round($this->w ? $this->w : (($this->h && $this->source_height) ? $this->h * $this->source_width / $this->source_height : $this->w)); + //$this->h = round($this->h ? $this->h : (($this->w && $this->source_width) ? $this->w * $this->source_height / $this->source_width : $this->h)); + $this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'.intval($this->w).'", h="'.intval($this->h).'"', __FILE__, __LINE__); + return true; + } + + function ExtractEXIFgetImageSize() { + $this->DebugMessage('starting ExtractEXIFgetImageSize()', __FILE__, __LINE__); + + if (preg_match('#^http:#i', $this->src) && !$this->sourceFilename && $this->rawImageData) { + !$this->SourceDataToTempFile(); + } + if (is_null($this->getimagesizeinfo)) { + if ($this->sourceFilename) { + $this->getimagesizeinfo = @GetImageSize($this->sourceFilename); + $this->source_width = $this->getimagesizeinfo[0]; + $this->source_height = $this->getimagesizeinfo[1]; + $this->DebugMessage('GetImageSize('.$this->sourceFilename.') says image is '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__); + } else { + $this->DebugMessage('skipping GetImageSize() because $this->sourceFilename is empty', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('skipping GetImageSize() because !is_null($this->getimagesizeinfo)', __FILE__, __LINE__); + } + + if (is_resource($this->gdimg_source)) { + + $this->source_width = ImageSX($this->gdimg_source); + $this->source_height = ImageSY($this->gdimg_source); + + $this->SetOrientationDependantWidthHeight(); + + } elseif ($this->rawImageData && !$this->sourceFilename) { + + if ($this->SourceImageIsTooLarge($this->source_width, $this->source_height)) { + $this->DebugMessage('NOT bypassing EXIF and GetImageSize sections because source image is too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__); + } else { + $this->DebugMessage('bypassing EXIF and GetImageSize sections because $this->rawImageData is set, and $this->sourceFilename is not set, and source image is not too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__); + } + + } + + if (is_null($this->getimagesizeinfo)) { + $this->getimagesizeinfo = @GetImageSize($this->sourceFilename); + } + + if (!empty($this->getimagesizeinfo)) { + // great + $this->getimagesizeinfo['filesize'] = @filesize($this->sourceFilename); + } elseif (!$this->rawImageData) { + $this->DebugMessage('GetImageSize("'.$this->sourceFilename.'") failed', __FILE__, __LINE__); + } + + if ($this->config_prefer_imagemagick) { + if ($this->ImageMagickThumbnailToGD()) { + return true; + } + $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__); + } + + $this->source_width = $this->getimagesizeinfo[0]; + $this->source_height = $this->getimagesizeinfo[1]; + + $this->SetOrientationDependantWidthHeight(); + + if (phpthumb_functions::version_compare_replacement(phpversion(), '4.2.0', '>=') && function_exists('exif_read_data')) { + switch ($this->getimagesizeinfo[2]) { + case IMAGETYPE_JPEG: + case IMAGETYPE_TIFF_II: + case IMAGETYPE_TIFF_MM: + $this->exif_raw_data = @exif_read_data($this->sourceFilename, 0, true); + break; + } + } + if (function_exists('exif_thumbnail') && ($this->getimagesizeinfo[2] == IMAGETYPE_JPEG)) { + // Extract EXIF info from JPEGs + + $this->exif_thumbnail_width = ''; + $this->exif_thumbnail_height = ''; + $this->exif_thumbnail_type = ''; + + // The parameters width, height and imagetype are available since PHP v4.3.0 + if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=')) { + + $this->exif_thumbnail_data = @exif_thumbnail($this->sourceFilename, $this->exif_thumbnail_width, $this->exif_thumbnail_height, $this->exif_thumbnail_type); + + } else { + + // older versions of exif_thumbnail output an error message but NOT return false on failure + ob_start(); + $this->exif_thumbnail_data = exif_thumbnail($this->sourceFilename); + $exit_thumbnail_error = ob_get_contents(); + ob_end_clean(); + if (!$exit_thumbnail_error && $this->exif_thumbnail_data) { + + if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) { + $this->exif_thumbnail_width = ImageSX($gdimg_exif_temp); + $this->exif_thumbnail_height = ImageSY($gdimg_exif_temp); + $this->exif_thumbnail_type = 2; // (2 == JPEG) before PHP v4.3.0 only JPEG format EXIF thumbnails are returned + unset($gdimg_exif_temp); + } else { + return $this->ErrorImage('Failed - $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data) in '.__FILE__.' on line '.__LINE__); + } + + } + + } + + } elseif (!function_exists('exif_thumbnail')) { + + $this->DebugMessage('exif_thumbnail() does not exist, cannot extract EXIF thumbnail', __FILE__, __LINE__); + + } + + $this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '.intval($this->exif_thumbnail_width).'x'.intval($this->exif_thumbnail_height).')', __FILE__, __LINE__); + + // see if EXIF thumbnail can be used directly with no processing + if ($this->config_use_exif_thumbnail_for_speed && $this->exif_thumbnail_data) { + while (true) { + if (!$this->xto) { + $source_ar = $this->source_width / $this->source_height; + $exif_ar = $this->exif_thumbnail_width / $this->exif_thumbnail_height; + if (number_format($source_ar, 2) != number_format($exif_ar, 2)) { + $this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__); + break; + } + if ($this->w && ($this->w != $this->exif_thumbnail_width)) { + $this->DebugMessage('not using EXIF thumbnail because $this->w != $this->exif_thumbnail_width ('.$this->w.' != '.$this->exif_thumbnail_width.')', __FILE__, __LINE__); + break; + } + if ($this->h && ($this->h != $this->exif_thumbnail_height)) { + $this->DebugMessage('not using EXIF thumbnail because $this->h != $this->exif_thumbnail_height ('.$this->h.' != '.$this->exif_thumbnail_height.')', __FILE__, __LINE__); + break; + } + $CannotBeSetParameters = array('sx', 'sy', 'sh', 'sw', 'far', 'bg', 'bc', 'fltr', 'phpThumbDebug'); + foreach ($CannotBeSetParameters as $parameter) { + if ($this->$parameter) { + break 2; + } + } + } + + $this->DebugMessage('setting $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data)', __FILE__, __LINE__); + $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data); + $this->source_width = ImageSX($this->gdimg_source); + $this->source_height = ImageSY($this->gdimg_source); + return true; + } + } + + if (($this->config_max_source_pixels > 0) && (($this->source_width * $this->source_height) > $this->config_max_source_pixels)) { + + // Source image is larger than would fit in available PHP memory. + // If ImageMagick is installed, use it to generate the thumbnail. + // Else, if an EXIF thumbnail is available, use that as the source image. + // Otherwise, no choice but to fail with an error message + $this->DebugMessage('image is '.$this->source_width.'x'.$this->source_height.' and therefore contains more pixels ('.($this->source_width * $this->source_height).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__); + if (!$this->config_prefer_imagemagick && $this->ImageMagickThumbnailToGD()) { + // excellent, we have a thumbnailed source image + return true; + } + + } + return true; + } + + + function SetCacheFilename() { + if (!is_null($this->cache_filename)) { + $this->DebugMessage('$this->cache_filename already set, skipping SetCacheFilename()', __FILE__, __LINE__); + return true; + } + $this->setOutputFormat(); + $this->setCacheDirectory(); + if (!$this->config_cache_directory) { + $this->DebugMessage('SetCacheFilename() failed because $this->config_cache_directory is empty', __FILE__, __LINE__); + return false; + } + + if (!$this->sourceFilename && !$this->rawImageData && $this->src) { + $this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src); + } + + if ($this->config_cache_default_only_suffix && $this->sourceFilename) { + // simplified cache filenames: + // only use default parameters in phpThumb.config.php + // substitute source filename into * in $this->config_cache_default_only_suffix + // (eg: '*_thumb' becomes 'picture_thumb.jpg') + if (strpos($this->config_cache_default_only_suffix, '*') === false) { + $this->DebugMessage('aborting simplified caching filename because no * in "'.$this->config_cache_default_only_suffix.'"', __FILE__, __LINE__); + } else { + preg_match('#(.+)(\\.[a-z0-9]+)?$#i', basename($this->sourceFilename), $matches); + $this->cache_filename = $this->config_cache_directory.DIRECTORY_SEPARATOR.rawurlencode(str_replace('*', @$matches[1], $this->config_cache_default_only_suffix)).'.'.strtolower($this->thumbnailFormat); + return true; + } + } + + $this->cache_filename = ''; + $broad_directory_name = ''; + if ($this->new) { + $broad_directory_name = strtolower(md5($this->new)); + $this->cache_filename .= '_new'.$broad_directory_name; + } elseif ($this->md5s) { + // source image MD5 hash provided + $this->DebugMessage('SetCacheFilename() _raw set from $this->md5s = "'.$this->md5s.'"', __FILE__, __LINE__); + $broad_directory_name = $this->md5s; + $this->cache_filename .= '_raw'.$this->md5s; + } elseif (!$this->src && $this->rawImageData) { + $this->DebugMessage('SetCacheFilename() _raw set from md5($this->rawImageData) = "'.md5($this->rawImageData).'"', __FILE__, __LINE__); + $broad_directory_name = strtolower(md5($this->rawImageData)); + $this->cache_filename .= '_raw'.$broad_directory_name; + } else { + $this->DebugMessage('SetCacheFilename() _src set from md5($this->sourceFilename) "'.$this->sourceFilename.'" = "'.md5($this->sourceFilename).'"', __FILE__, __LINE__); + $broad_directory_name = strtolower(md5($this->sourceFilename)); + $this->cache_filename .= '_src'.$broad_directory_name; + } + if (@$_SERVER['HTTP_REFERER'] && $this->config_nooffsitelink_enabled) { + $parsed_url1 = @phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']); + $parsed_url2 = @phpthumb_functions::ParseURLbetter('http://'.@$_SERVER['HTTP_HOST']); + if (@$parsed_url1['host'] && @$parsed_url2['host'] && ($parsed_url1['host'] != $parsed_url2['host'])) { + // include "_offsite" only if nooffsitelink_enabled and if referrer doesn't match the domain of the current server + $this->cache_filename .= '_offsite'; + } + } + + $ParametersString = ''; + if ($this->fltr && is_array($this->fltr)) { + $ParametersString .= '_fltr'.implode('_fltr', $this->fltr); + } + $FilenameParameters1 = array('ar', 'bg', 'bc', 'far', 'sx', 'sy', 'sw', 'sh', 'zc'); + foreach ($FilenameParameters1 as $key) { + if ($this->$key) { + $ParametersString .= '_'.$key.$this->$key; + } + } + $FilenameParameters2 = array('h', 'w', 'wl', 'wp', 'ws', 'hp', 'hs', 'xto', 'ra', 'iar', 'aoe', 'maxb', 'sfn', 'dpi'); + foreach ($FilenameParameters2 as $key) { + if ($this->$key) { + $ParametersString .= '_'.$key.intval($this->$key); + } + } + if ($this->thumbnailFormat == 'jpeg') { + // only JPEG output has variable quality option + $ParametersString .= '_q'.intval($this->thumbnailQuality); + } + $this->DebugMessage('SetCacheFilename() _par set from md5('.$ParametersString.')', __FILE__, __LINE__); + $this->cache_filename .= '_par'.strtolower(md5($ParametersString)); + + if ($this->md5s) { + // source image MD5 hash provided + // do not source image modification date -- + // cached image will be used even if file was modified or removed + } elseif (!$this->config_cache_source_filemtime_ignore_remote && preg_match('#^(f|ht)tps?\://#i', $this->src)) { + $this->cache_filename .= '_dat'.intval(phpthumb_functions::filedate_remote($this->src)); + } elseif (!$this->config_cache_source_filemtime_ignore_local && $this->src && !$this->rawImageData) { + $this->cache_filename .= '_dat'.intval(@filemtime($this->sourceFilename)); + } + + $this->cache_filename .= '.'.strtolower($this->thumbnailFormat); + $broad_directories = ''; + for ($i = 0; $i < $this->config_cache_directory_depth; $i++) { + $broad_directories .= DIRECTORY_SEPARATOR.substr($broad_directory_name, 0, $i + 1); + } + + $this->cache_filename = $this->config_cache_directory.$broad_directories.DIRECTORY_SEPARATOR.$this->config_cache_prefix.rawurlencode($this->cache_filename); + return true; + } + + + function SourceImageIsTooLarge($width, $height) { + if (!$this->config_max_source_pixels) { + return false; + } + if (function_exists('memory_get_usage')) { + $available_memory = max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576; + $available_memory -= memory_get_usage(); + return (bool) (($width * $height * 5) > $available_memory); + } + return (bool) (($width * $height) > $this->config_max_source_pixels); + } + + function ImageCreateFromFilename($filename) { + // try to create GD image source directly via GD, if possible, + // rather than buffering to memory and creating with ImageCreateFromString + $ImageCreateWasAttempted = false; + $gd_image = false; + + $this->DebugMessage('starting ImageCreateFromFilename('.$filename.')', __FILE__, __LINE__); + if ($filename && ($getimagesizeinfo = @GetImageSize($filename))) { + if (!$this->SourceImageIsTooLarge($getimagesizeinfo[0], $getimagesizeinfo[1])) { + $ImageCreateFromFunction = array( + 1 => 'ImageCreateFromGIF', + 2 => 'ImageCreateFromJPEG', + 3 => 'ImageCreateFromPNG', + 15 => 'ImageCreateFromWBMP', + ); + $this->DebugMessage('ImageCreateFromFilename found ($getimagesizeinfo[2]=='.@$getimagesizeinfo[2].')', __FILE__, __LINE__); + switch (@$getimagesizeinfo[2]) { + case 1: // GIF + case 2: // JPEG + case 3: // PNG + case 15: // WBMP + $ImageCreateFromFunctionName = $ImageCreateFromFunction[$getimagesizeinfo[2]]; + if (function_exists($ImageCreateFromFunctionName)) { + $this->DebugMessage('Calling '.$ImageCreateFromFunctionName.'('.$filename.')', __FILE__, __LINE__); + $ImageCreateWasAttempted = true; + $gd_image = $ImageCreateFromFunctionName($filename); + } else { + $this->DebugMessage('NOT calling '.$ImageCreateFromFunctionName.'('.$filename.') because !function_exists('.$ImageCreateFromFunctionName.')', __FILE__, __LINE__); + } + break; + + case 4: // SWF + case 5: // PSD + case 6: // BMP + case 7: // TIFF (LE) + case 8: // TIFF (BE) + case 9: // JPC + case 10: // JP2 + case 11: // JPX + case 12: // JB2 + case 13: // SWC + case 14: // IFF + case 16: // XBM + $this->DebugMessage('No built-in image creation function for image type "'.@$getimagesizeinfo[2].'" ($getimagesizeinfo[2])', __FILE__, __LINE__); + break; + + default: + $this->DebugMessage('Unknown value for $getimagesizeinfo[2]: "'.@$getimagesizeinfo[2].'"', __FILE__, __LINE__); + break; + } + } else { + $this->DebugMessage('image is '.$getimagesizeinfo[0].'x'.$getimagesizeinfo[1].' and therefore contains more pixels ('.($getimagesizeinfo[0] * $getimagesizeinfo[1]).') than $this->config_max_source_pixels setting ('.$this->config_max_source_pixels.')', __FILE__, __LINE__); + return false; + } + } else { + $this->DebugMessage('empty $filename or GetImageSize('.$filename.') failed', __FILE__, __LINE__); + } + + if (!$gd_image) { + // cannot create from filename, attempt to create source image with ImageCreateFromString, if possible + if ($ImageCreateWasAttempted) { + $this->DebugMessage(@$ImageCreateFromFunctionName.'() was attempted but FAILED', __FILE__, __LINE__); + } + $this->DebugMessage('Populating $rawimagedata', __FILE__, __LINE__); + $rawimagedata = ''; + if ($fp = @fopen($filename, 'rb')) { + $filesize = filesize($filename); + $blocksize = 8192; + $blockreads = ceil($filesize / $blocksize); + for ($i = 0; $i < $blockreads; $i++) { + $rawimagedata .= fread($fp, $blocksize); + } + fclose($fp); + } else { + $this->DebugMessage('cannot fopen('.$filename.')', __FILE__, __LINE__); + } + if ($rawimagedata) { + $this->DebugMessage('attempting ImageCreateFromStringReplacement($rawimagedata ('.strlen($rawimagedata).' bytes), true)', __FILE__, __LINE__); + $gd_image = $this->ImageCreateFromStringReplacement($rawimagedata, true); + } + } + return $gd_image; + } + + function SourceImageToGD() { + if (is_resource($this->gdimg_source)) { + $this->source_width = ImageSX($this->gdimg_source); + $this->source_height = ImageSY($this->gdimg_source); + $this->DebugMessage('skipping SourceImageToGD() because $this->gdimg_source is already a resource ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__); + return true; + } + $this->DebugMessage('starting SourceImageToGD()', __FILE__, __LINE__); + + if ($this->config_prefer_imagemagick) { + if (empty($this->sourceFilename) && !empty($this->rawImageData)) { + $this->DebugMessage('Copying raw image data to temp file and trying again with ImageMagick', __FILE__, __LINE__); + if ($tempnam = $this->phpThumb_tempnam()) { + if (file_put_contents($tempname, $this->rawImageData)) { + $this->sourceFilename = $tempnam; + if ($this->ImageMagickThumbnailToGD()) { + // excellent, we have a thumbnailed source image + $this->DebugMessage('ImageMagickThumbnailToGD() succeeded', __FILE__, __LINE__); + } else { + $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('failed to put $this->rawImageData into temp file "'.$tempnam.'"', __FILE__, __LINE__); + } + } else { + $this->DebugMessage('failed to generate temp file name', __FILE__, __LINE__); + } + } + } + if (!$this->gdimg_source && $this->rawImageData) { + + if ($this->SourceImageIsTooLarge($this->source_width, $this->source_height)) { + $memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0); + return $this->ErrorImage('Source image is too large ('.$this->source_width.'x'.$this->source_height.' = '.number_format($this->source_width * $this->source_height / 1000000, 1).'Mpx, max='.number_format($this->config_max_source_pixels / 1000000, 1).'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '.ceil(($memory_get_usage + (5 * $this->source_width * $this->source_height)) / 1048576).'M).'); + } + if ($this->md5s && ($this->md5s != md5($this->rawImageData))) { + return $this->ErrorImage('$this->md5s != md5($this->rawImageData)'."\n".'"'.$this->md5s.'" != '."\n".'"'.md5($this->rawImageData).'"'); + } + //if ($this->issafemode) { + // return $this->ErrorImage('Cannot generate thumbnails from raw image data when PHP SAFE_MODE enabled'); + //} + $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->rawImageData); + if (!$this->gdimg_source) { + if (substr($this->rawImageData, 0, 2) === 'BM') { + $this->getimagesizeinfo[2] = 6; // BMP + } elseif (substr($this->rawImageData, 0, 4) === 'II'."\x2A\x00") { + $this->getimagesizeinfo[2] = 7; // TIFF (littlendian) + } elseif (substr($this->rawImageData, 0, 4) === 'MM'."\x00\x2A") { + $this->getimagesizeinfo[2] = 8; // TIFF (bigendian) + } + $this->DebugMessage('SourceImageToGD.ImageCreateFromStringReplacement() failed with unknown image type "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).')', __FILE__, __LINE__); // return $this->ErrorImage('Unknown image type identified by "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).') in SourceImageToGD()['.__LINE__.']'); - } - - } elseif (!$this->gdimg_source && $this->sourceFilename) { - - if ($this->md5s && ($this->md5s != phpthumb_functions::md5_file_safe($this->sourceFilename))) { - return $this->ErrorImage('$this->md5s != md5(sourceFilename)'."\n".'"'.$this->md5s.'" != '."\n".'"'.phpthumb_functions::md5_file_safe($this->sourceFilename).'"'); - } - switch (@$this->getimagesizeinfo[2]) { - case 1: - case 3: - // GIF or PNG input file may have transparency - $this->is_alpha = true; - break; - } - if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) { - $this->gdimg_source = $this->ImageCreateFromFilename($this->sourceFilename); - } - - } - - while (true) { - if ($this->gdimg_source) { - $this->DebugMessage('Not using EXIF thumbnail data because $this->gdimg_source is already set', __FILE__, __LINE__); - break; - } - if (!$this->exif_thumbnail_data) { - $this->DebugMessage('Not using EXIF thumbnail data because $this->exif_thumbnail_data is empty', __FILE__, __LINE__); - break; - } - if (ini_get('safe_mode')) { - if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) { - $this->DebugMessage('Using EXIF thumbnail data because source image too large and safe_mode enabled', __FILE__, __LINE__); - $this->aoe = true; - } else { - break; - } - } else { - if (!$this->config_use_exif_thumbnail_for_speed) { - $this->DebugMessage('Not using EXIF thumbnail data because $this->config_use_exif_thumbnail_for_speed is FALSE', __FILE__, __LINE__); - break; - } - if (($this->thumbnailCropX != 0) || ($this->thumbnailCropY != 0)) { - $this->DebugMessage('Not using EXIF thumbnail data because source cropping is enabled ('.$this->thumbnailCropX.','.$this->thumbnailCropY.')', __FILE__, __LINE__); - break; - } - if (($this->w > $this->exif_thumbnail_width) || ($this->h > $this->exif_thumbnail_height)) { - $this->DebugMessage('Not using EXIF thumbnail data because EXIF thumbnail is too small ('.$this->exif_thumbnail_width.'x'.$this->exif_thumbnail_height.' vs '.$this->w.'x'.$this->h.')', __FILE__, __LINE__); - break; - } - $source_ar = $this->source_width / $this->source_height; - $exif_ar = $this->exif_thumbnail_width / $this->exif_thumbnail_height; - if (number_format($source_ar, 2) != number_format($exif_ar, 2)) { - $this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__); - break; - } - } - - // EXIF thumbnail exists, and is equal to or larger than destination thumbnail, and will be use as source image - $this->DebugMessage('Trying to use EXIF thumbnail as source image', __FILE__, __LINE__); - - if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) { - - $this->DebugMessage('Successfully using EXIF thumbnail as source image', __FILE__, __LINE__); - $this->gdimg_source = $gdimg_exif_temp; - $this->source_width = $this->exif_thumbnail_width; - $this->source_height = $this->exif_thumbnail_height; - $this->thumbnailCropW = $this->source_width; - $this->thumbnailCropH = $this->source_height; - return true; - - } else { - $this->DebugMessage('$this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false) failed', __FILE__, __LINE__); - } - - break; - } - - if (!$this->gdimg_source) { - $this->DebugMessage('$this->gdimg_source is still empty', __FILE__, __LINE__); - - $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__); - - $imageHeader = ''; - $gd_info = gd_info(); - $GDreadSupport = false; - switch (@$this->getimagesizeinfo[2]) { - case 1: - $imageHeader = 'Content-Type: image/gif'; - $GDreadSupport = (bool) @$gd_info['GIF Read Support']; - break; - case 2: - $imageHeader = 'Content-Type: image/jpeg'; - $GDreadSupport = (bool) @$gd_info['JPG Support']; - break; - case 3: - $imageHeader = 'Content-Type: image/png'; - $GDreadSupport = (bool) @$gd_info['PNG Support']; - break; - } - if ($imageHeader) { - // cannot create image for whatever reason (maybe ImageCreateFromJPEG et al are not available?) - // and ImageMagick is not available either, no choice but to output original (not resized/modified) data and exit - if ($this->config_error_die_on_source_failure) { - $errormessages = array(); - $errormessages[] = 'All attempts to create GD image source failed.'; - if ($this->fatalerror) { - $errormessages[] = $this->fatalerror; - } - if (ini_get('safe_mode')) { - $errormessages[] = 'Safe Mode enabled, therefore ImageMagick is unavailable. (disable Safe Mode if possible)'; - } elseif (!$this->ImageMagickVersion()) { - $errormessages[] = 'ImageMagick is not installed (it is highly recommended that you install it).'; - } - if ($this->SourceImageIsTooLarge($this->getimagesizeinfo[0], $this->getimagesizeinfo[1])) { - $memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0); - $errormessages[] = 'Source image is too large ('.$this->getimagesizeinfo[0].'x'.$this->getimagesizeinfo[1].' = '.number_format($this->getimagesizeinfo[0] * $this->getimagesizeinfo[1] / 1000000, 1).'Mpx, max='.number_format($this->config_max_source_pixels / 1000000, 1).'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '.ceil(($memory_get_usage + (5 * $this->getimagesizeinfo[0] * $this->getimagesizeinfo[1])) / 1000000).'M).'; - } elseif (!$GDreadSupport) { - $errormessages[] = 'GD does not have read support for "'.$imageHeader.'".'; - } else { - $errormessages[] = 'Source image probably corrupt.'; - } - $this->ErrorImage(implode("\n", $errormessages)); - - } else { - $this->DebugMessage('All attempts to create GD image source failed ('.(ini_get('safe_mode') ? 'Safe Mode enabled, ImageMagick unavailable and source image probably too large for GD': ($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"')).'), cannot generate thumbnail'); - //$this->DebugMessage('All attempts to create GD image source failed ('.($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"').'), outputing raw image', __FILE__, __LINE__); - //if (!$this->phpThumbDebug) { - // header($imageHeader); - // echo $this->rawImageData; - // exit; - //} - return false; - } - } - - //switch (substr($this->rawImageData, 0, 2)) { - // case 'BM': - switch (@$this->getimagesizeinfo[2]) { - case 6: - ob_start(); - if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) { - ob_end_clean(); - return $this->ErrorImage('include_once('.dirname(__FILE__).'/phpthumb.bmp.php) failed'); - } - ob_end_clean(); - if ($fp = @fopen($this->sourceFilename, 'rb')) { - $this->rawImageData = ''; - while (!feof($fp)) { - $this->rawImageData .= fread($fp, 32768); - } - fclose($fp); - } - $phpthumb_bmp = new phpthumb_bmp(); - $this->gdimg_source = $phpthumb_bmp->phpthumb_bmp2gd($this->rawImageData, (phpthumb_functions::gd_version() >= 2.0)); - unset($phpthumb_bmp); - if ($this->gdimg_source) { - $this->DebugMessage('$phpthumb_bmp->phpthumb_bmp2gd() succeeded', __FILE__, __LINE__); - } else { - return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on BMP source conversion' : 'phpthumb_bmp2gd() failed'); - } - break; - //} - //switch (substr($this->rawImageData, 0, 4)) { - // case 'II'."\x2A\x00": - // case 'MM'."\x00\x2A": - case 7: - case 8: - return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on TIFF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support TIFF source images without it'); - break; - - //case "\xD7\xCD\xC6\x9A": - // return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it'); - // break; - } - - if (!$this->gdimg_source) { - $HeaderFourBytes = ''; - if ($fp = @fopen($this->sourceFilename, 'rb')) { - $HeaderFourBytes = fread($fp, 4); - fclose($fp); - } - if ($HeaderFourBytes == "\xD7\xCD\xC6\x9A") { // WMF - return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it'); - } elseif ($HeaderFourBytes == '%PDF') { // "%PDF" - return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick and GhostScript are both required for PDF source images; GhostScript may not be properly configured' : 'ImageMagick and/or GhostScript are unavailable and phpThumb() does not support PDF source images without them'); - } elseif (substr($HeaderFourBytes, 0, 3) == "\xFF\xD8\xFF") { // JPEG - return $this->ErrorImage('Image is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting'); - } elseif ($HeaderFourBytes == '%PNG') { // "%PNG" - return $this->ErrorImage('Image is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting'); - } elseif (substr($HeaderFourBytes, 0, 3) == 'GIF') { // GIF - return $this->ErrorImage('Image is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting'); - } - return $this->ErrorImage('Unknown image type identified by "'.substr($HeaderFourBytes, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($HeaderFourBytes, 0, 4)).') in SourceImageToGD()['.__LINE__.']'); - - } - } - - if (!$this->gdimg_source) { - if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) { - $this->DebugMessage('All other attempts failed, but successfully using EXIF thumbnail as source image', __FILE__, __LINE__); - $this->gdimg_source = $gdimg_exif_temp; - // override allow-enlarging setting if EXIF thumbnail is the only source available - // otherwise thumbnails larger than the EXIF thumbnail will be created at EXIF size - $this->aoe = true; - return true; - } - return false; - } - - $this->source_width = ImageSX($this->gdimg_source); - $this->source_height = ImageSY($this->gdimg_source); - return true; - } - - - function phpThumbDebugVarDump($var) { - if (is_null($var)) { - return 'NULL'; - } elseif (is_bool($var)) { - return ($var ? 'TRUE' : 'FALSE'); - } elseif (is_string($var)) { - return 'string('.strlen($var).')'.str_repeat(' ', max(0, 3 - strlen(strlen($var)))).' "'.$var.'"'; - } elseif (is_int($var)) { - return 'integer '.$var; - } elseif (is_float($var)) { - return 'float '.$var; - } elseif (is_array($var)) { - ob_start(); - var_dump($var); - $vardumpoutput = ob_get_contents(); - ob_end_clean(); - return strtr($vardumpoutput, "\n\r\t", ' '); - } - return gettype($var); - } - - function phpThumbDebug($level='') { - if ($level && ($this->phpThumbDebug !== $level)) { - return true; - } - if ($this->config_disable_debug) { - return $this->ErrorImage('phpThumbDebug disabled'); - } - - $FunctionsExistance = array('exif_thumbnail', 'gd_info', 'image_type_to_mime_type', 'ImageCopyResampled', 'ImageCopyResized', 'ImageCreate', 'ImageCreateFromString', 'ImageCreateTrueColor', 'ImageIsTrueColor', 'ImageRotate', 'ImageTypes', 'version_compare', 'ImageCreateFromGIF', 'ImageCreateFromJPEG', 'ImageCreateFromPNG', 'ImageCreateFromWBMP', 'ImageCreateFromXBM', 'ImageCreateFromXPM', 'ImageCreateFromString', 'ImageCreateFromGD', 'ImageCreateFromGD2', 'ImageCreateFromGD2Part', 'ImageJPEG', 'ImageGIF', 'ImagePNG', 'ImageWBMP'); - $ParameterNames = array('src', 'new', 'w', 'h', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'far', 'bg', 'bc', 'file', 'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'iar', 'maxb'); - $ConfigVariableNames = array('document_root', 'temp_directory', 'output_format', 'output_maxwidth', 'output_maxheight', 'error_message_image_default', 'error_bgcolor', 'error_textcolor', 'error_fontsize', 'error_die_on_error', 'error_silent_die_on_error', 'error_die_on_source_failure', 'nohotlink_enabled', 'nohotlink_valid_domains', 'nohotlink_erase_image', 'nohotlink_text_message', 'nooffsitelink_enabled', 'nooffsitelink_valid_domains', 'nooffsitelink_require_refer', 'nooffsitelink_erase_image', 'nooffsitelink_text_message', 'high_security_enabled', 'allow_src_above_docroot', 'allow_src_above_phpthumb', 'allow_parameter_file', 'allow_parameter_goto', 'max_source_pixels', 'use_exif_thumbnail_for_speed', 'border_hexcolor', 'background_hexcolor', 'ttf_directory', 'disable_pathinfo_parsing', 'disable_imagecopyresampled'); - $OtherVariableNames = array('phpThumbDebug', 'thumbnailQuality', 'thumbnailFormat', 'gdimg_output', 'gdimg_source', 'sourceFilename', 'source_width', 'source_height', 'thumbnailCropX', 'thumbnailCropY', 'thumbnailCropW', 'thumbnailCropH', 'exif_thumbnail_width', 'exif_thumbnail_height', 'exif_thumbnail_type', 'thumbnail_width', 'thumbnail_height', 'thumbnail_image_width', 'thumbnail_image_height'); - - $DebugOutput = array(); - $DebugOutput[] = 'phpThumb() version = '.$this->phpthumb_version; - $DebugOutput[] = 'phpversion() = '.@phpversion(); - $DebugOutput[] = 'PHP_OS = '.PHP_OS; - $DebugOutput[] = '__FILE__ = '.__FILE__; - $DebugOutput[] = 'realpath(.) = '.@realpath('.'); - $DebugOutput[] = '$_SERVER[PHP_SELF] = '.@$_SERVER['PHP_SELF']; - $DebugOutput[] = '$_SERVER[HOST_NAME] = '.@$_SERVER['HOST_NAME']; - $DebugOutput[] = '$_SERVER[HTTP_REFERER] = '.@$_SERVER['HTTP_REFERER']; - $DebugOutput[] = '$_SERVER[QUERY_STRING] = '.@$_SERVER['QUERY_STRING']; - $DebugOutput[] = '$_SERVER[PATH_INFO] = '.@$_SERVER['PATH_INFO']; - $DebugOutput[] = '$_SERVER[DOCUMENT_ROOT] = '.@$_SERVER['DOCUMENT_ROOT']; - $DebugOutput[] = 'getenv(DOCUMENT_ROOT) = '.@getenv('DOCUMENT_ROOT'); - $DebugOutput[] = ''; - - $DebugOutput[] = 'get_magic_quotes_gpc() = '.$this->phpThumbDebugVarDump(@get_magic_quotes_gpc()); - $DebugOutput[] = 'get_magic_quotes_runtime() = '.$this->phpThumbDebugVarDump(@get_magic_quotes_runtime()); - $DebugOutput[] = 'error_reporting() = '.$this->phpThumbDebugVarDump(error_reporting()); - $DebugOutput[] = 'ini_get(error_reporting) = '.$this->phpThumbDebugVarDump(@ini_get('error_reporting')); - $DebugOutput[] = 'ini_get(display_errors) = '.$this->phpThumbDebugVarDump(@ini_get('display_errors')); - $DebugOutput[] = 'ini_get(allow_url_fopen) = '.$this->phpThumbDebugVarDump(@ini_get('allow_url_fopen')); - $DebugOutput[] = 'ini_get(disable_functions) = '.$this->phpThumbDebugVarDump(@ini_get('disable_functions')); - $DebugOutput[] = 'get_cfg_var(disable_functions) = '.$this->phpThumbDebugVarDump(@get_cfg_var('disable_functions')); - $DebugOutput[] = 'ini_get(safe_mode) = '.$this->phpThumbDebugVarDump(@ini_get('safe_mode')); - $DebugOutput[] = 'ini_get(open_basedir) = '.$this->phpThumbDebugVarDump(@ini_get('open_basedir')); - $DebugOutput[] = 'ini_get(max_execution_time) = '.$this->phpThumbDebugVarDump(@ini_get('max_execution_time')); - $DebugOutput[] = 'ini_get(memory_limit) = '.$this->phpThumbDebugVarDump(@ini_get('memory_limit')); - $DebugOutput[] = 'get_cfg_var(memory_limit) = '.$this->phpThumbDebugVarDump(@get_cfg_var('memory_limit')); - $DebugOutput[] = 'memory_get_usage() = '.(function_exists('memory_get_usage') ? $this->phpThumbDebugVarDump(@memory_get_usage()) : 'n/a'); - $DebugOutput[] = ''; - - $DebugOutput[] = '$this->config_prefer_imagemagick = '.$this->phpThumbDebugVarDump($this->config_prefer_imagemagick); - $DebugOutput[] = '$this->config_imagemagick_path = '.$this->phpThumbDebugVarDump($this->config_imagemagick_path); - $DebugOutput[] = '$this->ImageMagickWhichConvert() = '.$this->ImageMagickWhichConvert(); - $IMpathUsed = ($this->config_imagemagick_path ? $this->config_imagemagick_path : $this->ImageMagickWhichConvert()); - $DebugOutput[] = '[actual ImageMagick path used] = '.$this->phpThumbDebugVarDump($IMpathUsed); - $DebugOutput[] = 'file_exists([actual ImageMagick path used]) = '.$this->phpThumbDebugVarDump(@file_exists($IMpathUsed)); - $DebugOutput[] = 'ImageMagickVersion(false) = '.$this->ImageMagickVersion(false); - $DebugOutput[] = 'ImageMagickVersion(true) = '.$this->ImageMagickVersion(true); - $DebugOutput[] = ''; - - $DebugOutput[] = '$this->config_cache_directory = '.$this->phpThumbDebugVarDump($this->config_cache_directory); - $DebugOutput[] = '$this->config_cache_directory_depth = '.$this->phpThumbDebugVarDump($this->config_cache_directory_depth); - $DebugOutput[] = '$this->config_cache_disable_warning = '.$this->phpThumbDebugVarDump($this->config_cache_disable_warning); - $DebugOutput[] = '$this->config_cache_maxage = '.$this->phpThumbDebugVarDump($this->config_cache_maxage); - $DebugOutput[] = '$this->config_cache_maxsize = '.$this->phpThumbDebugVarDump($this->config_cache_maxsize); - $DebugOutput[] = '$this->config_cache_maxfiles = '.$this->phpThumbDebugVarDump($this->config_cache_maxfiles); - $DebugOutput[] = '$this->config_cache_force_passthru = '.$this->phpThumbDebugVarDump($this->config_cache_force_passthru); - $DebugOutput[] = '$this->cache_filename = '.$this->phpThumbDebugVarDump($this->cache_filename); - $DebugOutput[] = 'is_readable($this->config_cache_directory) = '.$this->phpThumbDebugVarDump(@is_readable($this->config_cache_directory)); - $DebugOutput[] = 'is_writable($this->config_cache_directory) = '.$this->phpThumbDebugVarDump(@is_writable($this->config_cache_directory)); - $DebugOutput[] = 'is_readable($this->cache_filename) = '.$this->phpThumbDebugVarDump(@is_readable($this->cache_filename)); - $DebugOutput[] = 'is_writable($this->cache_filename) = '.(@file_exists($this->cache_filename) ? $this->phpThumbDebugVarDump(@is_writable($this->cache_filename)) : 'n/a'); - $DebugOutput[] = ''; - - foreach ($ConfigVariableNames as $varname) { - $varname = 'config_'.$varname; - $value = $this->$varname; - $DebugOutput[] = '$this->'.str_pad($varname, 37, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); - } - $DebugOutput[] = ''; - foreach ($OtherVariableNames as $varname) { - $value = $this->$varname; - $DebugOutput[] = '$this->'.str_pad($varname, 27, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); - } - $DebugOutput[] = 'strlen($this->rawImageData) = '.strlen(@$this->rawImageData); - $DebugOutput[] = 'strlen($this->exif_thumbnail_data) = '.strlen(@$this->exif_thumbnail_data); - $DebugOutput[] = ''; - - foreach ($ParameterNames as $varname) { - $value = $this->$varname; - $DebugOutput[] = '$this->'.str_pad($varname, 4, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); - } - $DebugOutput[] = ''; - - foreach ($FunctionsExistance as $functionname) { - $DebugOutput[] = 'builtin_function_exists('.$functionname.')'.str_repeat(' ', 23 - strlen($functionname)).' = '.$this->phpThumbDebugVarDump(phpthumb_functions::builtin_function_exists($functionname)); - } - $DebugOutput[] = ''; - - $gd_info = gd_info(); - foreach ($gd_info as $key => $value) { - $DebugOutput[] = 'gd_info.'.str_pad($key, 34, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); - } - $DebugOutput[] = ''; - - $exif_info = phpthumb_functions::exif_info(); - foreach ($exif_info as $key => $value) { - $DebugOutput[] = 'exif_info.'.str_pad($key, 26, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); - } - $DebugOutput[] = ''; - - if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) { - foreach ($ApacheLookupURIarray as $key => $value) { - $DebugOutput[] = 'ApacheLookupURIarray.'.str_pad($key, 15, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); - } - } else { - $DebugOutput[] = 'ApacheLookupURIarray() -- FAILED'; - } - $DebugOutput[] = ''; - - if (isset($_GET) && is_array($_GET)) { - foreach ($_GET as $key => $value) { - $DebugOutput[] = '$_GET['.$key.']'.str_repeat(' ', 30 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value); - } - } - if (isset($_POST) && is_array($_POST)) { - foreach ($_POST as $key => $value) { - $DebugOutput[] = '$_POST['.$key.']'.str_repeat(' ', 29 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value); - } - } - $DebugOutput[] = ''; - - $DebugOutput[] = '$this->debugmessages:'; - foreach ($this->debugmessages as $errorstring) { - $DebugOutput[] = ' * '.$errorstring; - } - $DebugOutput[] = ''; - - $DebugOutput[] = '$this->debugtiming:'; - foreach ($this->debugtiming as $timestamp => $timingstring) { - $DebugOutput[] = ' * '.$timestamp.' '.$timingstring; - } - $DebugOutput[] = ' * Total processing time: '.number_format(max(array_keys($this->debugtiming)) - min(array_keys($this->debugtiming)), 6); - - $this->f = (isset($_GET['f']) ? $_GET['f'] : $this->f); // debug modes 0-2 don't recognize text mode otherwise - return $this->ErrorImage(implode("\n", $DebugOutput), 700, 500, true); - } - - function FatalError($text) { - if (is_null($this->fatalerror)) { - $this->fatalerror = $text; - } - return true; - } - - function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) { - $width = ($width ? $width : $this->config_error_image_width); - $height = ($height ? $height : $this->config_error_image_height); - - $text = 'phpThumb() v'.$this->phpthumb_version."\n\n".$text; - if ($this->config_disable_debug) { - $text = 'Error messages disabled'; - } - - $this->FatalError($text); - $this->DebugMessage($text, __FILE__, __LINE__); - if ($this->phpThumbDebug && !$forcedisplay) { - return false; - } - if (!$this->config_error_die_on_error && !$forcedisplay) { - return false; - } - if ($this->config_error_silent_die_on_error) { - exit; - } - if ($this->err || $this->config_error_message_image_default) { - // Show generic custom error image instead of error message - // for use on production sites where you don't want debug messages - if ($this->err == 'showerror') { - // fall through and actually show error message even if default error image is set - } else { - header('Location: '.($this->err ? $this->err : $this->config_error_message_image_default)); - exit; - } - } - $this->setOutputFormat(); - if (!$this->thumbnailFormat || (phpthumb_functions::gd_version() < 1)) { - $this->thumbnailFormat = 'text'; - } - if (@$this->thumbnailFormat == 'text') { - // bypass all GD functions and output text error message - if (!headers_sent()) { - header('Content-type: text/plain'); - echo $text; - } else { - echo '
    '.htmlspecialchars($text).'
    '; - } - exit; - } - - $FontWidth = ImageFontWidth($this->config_error_fontsize); - $FontHeight = ImageFontHeight($this->config_error_fontsize); - - $LinesOfText = explode("\n", @wordwrap($text, floor($width / $FontWidth), "\n", true)); - $height = max($height, count($LinesOfText) * $FontHeight); - - $headers_file = ''; - $headers_line = ''; - if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=') && headers_sent($headers_file, $headers_line)) { - - echo "\n".'**Headers already sent in file "'.$headers_file.'" on line "'.$headers_line.'", dumping error message as text:**
    '."\n\n".$text."\n".'
    '; - - } elseif (headers_sent()) { - - echo "\n".'**Headers already sent, dumping error message as text:**
    '."\n\n".$text."\n".'
    '; - - } elseif ($gdimg_error = ImageCreate($width, $height)) { - - $background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_bgcolor, true); - $text_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_textcolor, true); - ImageFilledRectangle($gdimg_error, 0, 0, $width, $height, $background_color); - $lineYoffset = 0; - foreach ($LinesOfText as $line) { - ImageString($gdimg_error, $this->config_error_fontsize, 2, $lineYoffset, $line, $text_color); - $lineYoffset += $FontHeight; - } - if (function_exists('ImageTypes')) { - $imagetypes = ImageTypes(); - if ($imagetypes & IMG_PNG) { - header('Content-Type: image/png'); - ImagePNG($gdimg_error); - } elseif ($imagetypes & IMG_GIF) { - header('Content-Type: image/gif'); - ImageGIF($gdimg_error); - } elseif ($imagetypes & IMG_JPG) { - header('Content-Type: image/jpeg'); - ImageJPEG($gdimg_error); - } elseif ($imagetypes & IMG_WBMP) { - header('Content-Type: image/vnd.wap.wbmp'); - ImageWBMP($gdimg_error); - } - } - ImageDestroy($gdimg_error); - - } - if (!headers_sent()) { - echo "\n".'**Failed to send graphical error image, dumping error message as text:**
    '."\n\n".$text; - } - exit; - return true; - } - - function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) { - // there are serious bugs in the non-bundled versions of GD which may cause - // PHP to segfault when calling ImageCreateFromString() - avoid if at all possible - // when not using a bundled version of GD2 - if (!phpthumb_functions::gd_version()) { - if ($DieOnErrors) { - if (!headers_sent()) { - // base64-encoded error image in GIF format - $ERROR_NOGD = 'R0lGODlhIAAgALMAAAAAABQUFCQkJDY2NkZGRldXV2ZmZnJycoaGhpSUlKWlpbe3t8XFxdXV1eTk5P7+/iwAAAAAIAAgAAAE/vDJSau9WILtTAACUinDNijZtAHfCojS4W5H+qxD8xibIDE9h0OwWaRWDIljJSkUJYsN4bihMB8th3IToAKs1VtYM75cyV8sZ8vygtOE5yMKmGbO4jRdICQCjHdlZzwzNW4qZSQmKDaNjhUMBX4BBAlmMywFSRWEmAI6b5gAlhNxokGhooAIK5o/pi9vEw4Lfj4OLTAUpj6IabMtCwlSFw0DCKBoFqwAB04AjI54PyZ+yY3TD0ss2YcVmN/gvpcu4TOyFivWqYJlbAHPpOntvxNAACcmGHjZzAZqzSzcq5fNjxFmAFw9iFRunD1epU6tsIPmFCAJnWYE0FURk7wJDA0MTKpEzoWAAskiAAA7'; - header('Content-Type: image/gif'); - echo base64_decode($ERROR_NOGD); - } else { - echo '*** ERROR: No PHP-GD support available ***'; - } - exit; - } else { - $this->DebugMessage('ImageCreateFromStringReplacement() failed: gd_version says "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); - return false; - } - } - if (phpthumb_functions::gd_is_bundled()) { - $this->DebugMessage('ImageCreateFromStringReplacement() calling built-in ImageCreateFromString()', __FILE__, __LINE__); - return @ImageCreateFromString($RawImageData); - } - if (ini_get('safe_mode')) { - $this->DebugMessage('ImageCreateFromStringReplacement() failed: cannot create temp file in SAFE_MODE', __FILE__, __LINE__); - return false; - } - - switch (substr($RawImageData, 0, 3)) { - case 'GIF': - $ICFSreplacementFunctionName = 'ImageCreateFromGIF'; - break; - case "\xFF\xD8\xFF": - $ICFSreplacementFunctionName = 'ImageCreateFromJPEG'; - break; - case "\x89".'PN': - $ICFSreplacementFunctionName = 'ImageCreateFromPNG'; - break; - default: - $this->DebugMessage('ImageCreateFromStringReplacement() failed: unknown fileformat signature "'.phpthumb_functions::HexCharDisplay(substr($RawImageData, 0, 3)).'"', __FILE__, __LINE__); - return false; - break; - } - if ($tempnam = $this->phpThumb_tempnam()) { - if ($fp_tempnam = @fopen($tempnam, 'wb')) { - fwrite($fp_tempnam, $RawImageData); - fclose($fp_tempnam); - if (($ICFSreplacementFunctionName == 'ImageCreateFromGIF') && !function_exists($ICFSreplacementFunctionName)) { - - // Need to create from GIF file, but ImageCreateFromGIF does not exist - ob_start(); - if (!@include_once(dirname(__FILE__).'/phpthumb.gif.php')) { - $ErrorMessage = 'Failed to include required file "'.dirname(__FILE__).'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__; - $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); - } - ob_end_clean(); - // gif_loadFileToGDimageResource() cannot read from raw data, write to file first - if ($tempfilename = $this->phpThumb_tempnam()) { - if ($fp_tempfile = @fopen($tempfilename, 'wb')) { - fwrite($fp_tempfile, $RawImageData); - fclose($fp_tempfile); - $gdimg_source = gif_loadFileToGDimageResource($tempfilename); - $this->DebugMessage('gif_loadFileToGDimageResource('.$tempfilename.') completed', __FILE__, __LINE__); - unlink($tempfilename); - return $gdimg_source; - break; - } else { - $ErrorMessage = 'Failed to open tempfile in '.__FILE__.' on line '.__LINE__; - $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); - } - } else { - $ErrorMessage = 'Failed to open generate tempfile name in '.__FILE__.' on line '.__LINE__; - $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); - } - - } elseif (function_exists($ICFSreplacementFunctionName) && ($gdimg_source = @$ICFSreplacementFunctionName($tempnam))) { - - // great - $this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') succeeded', __FILE__, __LINE__); - unlink($tempnam); - return $gdimg_source; - - } else { - - // GD functions not available, or failed to create image - $this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') '.(function_exists($ICFSreplacementFunctionName) ? 'failed' : 'does not exist'), __FILE__, __LINE__); - if (isset($_GET['phpThumbDebug'])) { - $this->phpThumbDebug(); - } - - } - } else { - $ErrorMessage = 'Failed to fopen('.$tempnam.', "wb") in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php'; - $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); - } - @unlink($tempnam); - } else { - $ErrorMessage = 'Failed to generate phpThumb_tempnam() in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php'; - } - if ($DieOnErrors && $ErrorMessage) { - return $this->ErrorImage($ErrorMessage); - } - return false; - } - - function ImageResizeFunction(&$dst_im, &$src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH) { - $this->DebugMessage('ImageResizeFunction($o, $s, '.$dstX.', '.$dstY.', '.$srcX.', '.$srcY.', '.$dstW.', '.$dstH.', '.$srcW.', '.$srcH.')', __FILE__, __LINE__); - if (($dstW == $srcW) && ($dstH == $srcH)) { - return ImageCopy($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $srcW, $srcH); - } - if (phpthumb_functions::gd_version() >= 2.0) { - if ($this->config_disable_imagecopyresampled) { - return phpthumb_functions::ImageCopyResampleBicubic($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); - } - return ImageCopyResampled($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); - } - return ImageCopyResized($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); - } - - function InitializeTempDirSetting() { - $this->config_temp_directory = realpath($this->config_temp_directory ? $this->config_temp_directory : (getenv('TMPDIR') ? getenv('TMPDIR') : getenv('TMP'))); - return true; - } - - function phpThumb_tempnam() { - $this->InitializeTempDirSetting(); - $tempnam = realpath(tempnam($this->config_temp_directory, 'pThumb')); - $this->DebugMessage('phpThumb_tempnam() returning "'.$tempnam.'"', __FILE__, __LINE__); - return $tempnam; - } - - function DebugMessage($message, $file='', $line='') { - $this->debugmessages[] = $message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : ''); - return true; - } - - function DebugTimingMessage($message, $file='', $line='', $timestamp=0) { - if (!$timestamp) { - $timestamp = array_sum(explode(' ', microtime())); - } - $this->debugtiming[number_format($timestamp, 6, '.', '')] = ': '.$message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : ''); - return true; - } + } + + } elseif (!$this->gdimg_source && $this->sourceFilename) { + + if ($this->md5s && ($this->md5s != phpthumb_functions::md5_file_safe($this->sourceFilename))) { + return $this->ErrorImage('$this->md5s != md5(sourceFilename)'."\n".'"'.$this->md5s.'" != '."\n".'"'.phpthumb_functions::md5_file_safe($this->sourceFilename).'"'); + } + switch (@$this->getimagesizeinfo[2]) { + case 1: + case 3: + // GIF or PNG input file may have transparency + $this->is_alpha = true; + break; + } + if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) { + $this->gdimg_source = $this->ImageCreateFromFilename($this->sourceFilename); + } + + } + + while (true) { + if ($this->gdimg_source) { + $this->DebugMessage('Not using EXIF thumbnail data because $this->gdimg_source is already set', __FILE__, __LINE__); + break; + } + if (!$this->exif_thumbnail_data) { + $this->DebugMessage('Not using EXIF thumbnail data because $this->exif_thumbnail_data is empty', __FILE__, __LINE__); + break; + } + if (ini_get('safe_mode')) { + if (!$this->SourceImageIsTooLarge($this->source_width, $this->source_height)) { + $this->DebugMessage('Using EXIF thumbnail data because source image too large and safe_mode enabled', __FILE__, __LINE__); + $this->aoe = true; + } else { + break; + } + } else { + if (!$this->config_use_exif_thumbnail_for_speed) { + $this->DebugMessage('Not using EXIF thumbnail data because $this->config_use_exif_thumbnail_for_speed is FALSE', __FILE__, __LINE__); + break; + } + if (($this->thumbnailCropX != 0) || ($this->thumbnailCropY != 0)) { + $this->DebugMessage('Not using EXIF thumbnail data because source cropping is enabled ('.$this->thumbnailCropX.','.$this->thumbnailCropY.')', __FILE__, __LINE__); + break; + } + if (($this->w > $this->exif_thumbnail_width) || ($this->h > $this->exif_thumbnail_height)) { + $this->DebugMessage('Not using EXIF thumbnail data because EXIF thumbnail is too small ('.$this->exif_thumbnail_width.'x'.$this->exif_thumbnail_height.' vs '.$this->w.'x'.$this->h.')', __FILE__, __LINE__); + break; + } + $source_ar = $this->source_width / $this->source_height; + $exif_ar = $this->exif_thumbnail_width / $this->exif_thumbnail_height; + if (number_format($source_ar, 2) != number_format($exif_ar, 2)) { + $this->DebugMessage('not using EXIF thumbnail because $source_ar != $exif_ar ('.$source_ar.' != '.$exif_ar.')', __FILE__, __LINE__); + break; + } + } + + // EXIF thumbnail exists, and is equal to or larger than destination thumbnail, and will be use as source image + $this->DebugMessage('Trying to use EXIF thumbnail as source image', __FILE__, __LINE__); + + if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) { + + $this->DebugMessage('Successfully using EXIF thumbnail as source image', __FILE__, __LINE__); + $this->gdimg_source = $gdimg_exif_temp; + $this->source_width = $this->exif_thumbnail_width; + $this->source_height = $this->exif_thumbnail_height; + $this->thumbnailCropW = $this->source_width; + $this->thumbnailCropH = $this->source_height; + return true; + + } else { + $this->DebugMessage('$this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false) failed', __FILE__, __LINE__); + } + + break; + } + + if (!$this->gdimg_source) { + $this->DebugMessage('$this->gdimg_source is still empty', __FILE__, __LINE__); + + $this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__); + + $imageHeader = ''; + $gd_info = gd_info(); + $GDreadSupport = false; + switch (@$this->getimagesizeinfo[2]) { + case 1: + $imageHeader = 'Content-Type: image/gif'; + $GDreadSupport = (bool) @$gd_info['GIF Read Support']; + break; + case 2: + $imageHeader = 'Content-Type: image/jpeg'; + $GDreadSupport = (bool) @$gd_info['JPG Support']; + break; + case 3: + $imageHeader = 'Content-Type: image/png'; + $GDreadSupport = (bool) @$gd_info['PNG Support']; + break; + } + if ($imageHeader) { + // cannot create image for whatever reason (maybe ImageCreateFromJPEG et al are not available?) + // and ImageMagick is not available either, no choice but to output original (not resized/modified) data and exit + if ($this->config_error_die_on_source_failure) { + $errormessages = array(); + $errormessages[] = 'All attempts to create GD image source failed.'; + if ($this->fatalerror) { + $errormessages[] = $this->fatalerror; + } + if ($this->issafemode) { + $errormessages[] = 'Safe Mode enabled, therefore ImageMagick is unavailable. (disable Safe Mode if possible)'; + } elseif (!$this->ImageMagickVersion()) { + $errormessages[] = 'ImageMagick is not installed (it is highly recommended that you install it).'; + } + if ($this->SourceImageIsTooLarge($this->getimagesizeinfo[0], $this->getimagesizeinfo[1])) { + $memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0); + $errormessages[] = 'Source image is too large ('.$this->getimagesizeinfo[0].'x'.$this->getimagesizeinfo[1].' = '.number_format($this->getimagesizeinfo[0] * $this->getimagesizeinfo[1] / 1000000, 1).'Mpx, max='.number_format($this->config_max_source_pixels / 1000000, 1).'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '.ceil(($memory_get_usage + (5 * $this->getimagesizeinfo[0] * $this->getimagesizeinfo[1])) / 1048576).'M).'; + } elseif (!$GDreadSupport) { + $errormessages[] = 'GD does not have read support for "'.$imageHeader.'".'; + } else { + $errormessages[] = 'Source image probably corrupt.'; + } + $this->ErrorImage(implode("\n", $errormessages)); + + } else { + $this->DebugMessage('All attempts to create GD image source failed ('.(ini_get('safe_mode') ? 'Safe Mode enabled, ImageMagick unavailable and source image probably too large for GD': ($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"')).'), cannot generate thumbnail'); + //$this->DebugMessage('All attempts to create GD image source failed ('.($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"').'), outputing raw image', __FILE__, __LINE__); + //if (!$this->phpThumbDebug) { + // header($imageHeader); + // echo $this->rawImageData; + // exit; + //} + return false; + } + } + + //switch (substr($this->rawImageData, 0, 2)) { + // case 'BM': + switch (@$this->getimagesizeinfo[2]) { + case 6: + ob_start(); + if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) { + ob_end_clean(); + return $this->ErrorImage('include_once('.dirname(__FILE__).'/phpthumb.bmp.php) failed'); + } + ob_end_clean(); + if ($fp = @fopen($this->sourceFilename, 'rb')) { + $this->rawImageData = ''; + while (!feof($fp)) { + $this->rawImageData .= fread($fp, 32768); + } + fclose($fp); + } + $phpthumb_bmp = new phpthumb_bmp(); + $this->gdimg_source = $phpthumb_bmp->phpthumb_bmp2gd($this->rawImageData, (phpthumb_functions::gd_version() >= 2.0)); + unset($phpthumb_bmp); + if ($this->gdimg_source) { + $this->DebugMessage('$phpthumb_bmp->phpthumb_bmp2gd() succeeded', __FILE__, __LINE__); + } else { + return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on BMP source conversion' : 'phpthumb_bmp2gd() failed'); + } + break; + //} + //switch (substr($this->rawImageData, 0, 4)) { + // case 'II'."\x2A\x00": + // case 'MM'."\x00\x2A": + case 7: + case 8: + return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on TIFF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support TIFF source images without it'); + break; + + //case "\xD7\xCD\xC6\x9A": + // return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it'); + // break; + } + + if (!$this->gdimg_source) { + $HeaderFourBytes = ''; + if ($this->rawImageData) { + $HeaderFourBytes = substr($this->rawImageData, 0, 4); + } elseif ($this->sourceFilename) { + if ($fp = @fopen($this->sourceFilename, 'rb')) { + $HeaderFourBytes = fread($fp, 4); + fclose($fp); + } else { + return $this->ErrorImage('failed to open "'.$this->sourceFilename.'" SourceImageToGD() ['.__LINE__.']'); + } + } else { + return $this->ErrorImage('Unable to create image, neither filename nor image data suppplied in SourceImageToGD() ['.__LINE__.']'); + } + if (!$this->ImageMagickVersion() && !phpthumb_functions::gd_version()) { + return $this->ErrorImage('Neither GD nor ImageMagick seem to be installed on this server. At least one (preferably GD), or better both, MUST be installed for phpThumb to work.'); + } elseif ($HeaderFourBytes == "\xD7\xCD\xC6\x9A") { // WMF + return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on WMF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support WMF source images without it'); + } elseif ($HeaderFourBytes == '%PDF') { // "%PDF" + return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick and GhostScript are both required for PDF source images; GhostScript may not be properly configured' : 'ImageMagick and/or GhostScript are unavailable and phpThumb() does not support PDF source images without them'); + } elseif (substr($HeaderFourBytes, 0, 3) == "\xFF\xD8\xFF") { // JPEG + return $this->ErrorImage('Image (JPEG) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting'); + } elseif ($HeaderFourBytes == '%PNG') { // "%PNG" + return $this->ErrorImage('Image (PNG) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting'); + } elseif (substr($HeaderFourBytes, 0, 3) == 'GIF') { // GIF + return $this->ErrorImage('Image (GIF) is too large for PHP-GD memory_limit, please install ImageMagick or increase php.ini memory_limit setting'); + } + return $this->ErrorImage('Unknown image type identified by "'.$HeaderFourBytes.'" ('.phpthumb_functions::HexCharDisplay($HeaderFourBytes).') in SourceImageToGD() ['.__LINE__.']'); + } + } + + if (!$this->gdimg_source) { + if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) { + $this->DebugMessage('All other attempts failed, but successfully using EXIF thumbnail as source image', __FILE__, __LINE__); + $this->gdimg_source = $gdimg_exif_temp; + // override allow-enlarging setting if EXIF thumbnail is the only source available + // otherwise thumbnails larger than the EXIF thumbnail will be created at EXIF size + $this->aoe = true; + return true; + } + return false; + } + + $this->source_width = ImageSX($this->gdimg_source); + $this->source_height = ImageSY($this->gdimg_source); + return true; + } + + + function phpThumbDebugVarDump($var) { + if (is_null($var)) { + return 'NULL'; + } elseif (is_bool($var)) { + return ($var ? 'TRUE' : 'FALSE'); + } elseif (is_string($var)) { + return 'string('.strlen($var).')'.str_repeat(' ', max(0, 3 - strlen(strlen($var)))).' "'.$var.'"'; + } elseif (is_int($var)) { + return 'integer '.$var; + } elseif (is_float($var)) { + return 'float '.$var; + } elseif (is_array($var)) { + ob_start(); + var_dump($var); + $vardumpoutput = ob_get_contents(); + ob_end_clean(); + return strtr($vardumpoutput, "\n\r\t", ' '); + } + return gettype($var); + } + + function phpThumbDebug($level='') { + if ($level && ($this->phpThumbDebug !== $level)) { + return true; + } + if ($this->config_disable_debug) { + return $this->ErrorImage('phpThumbDebug disabled'); + } + + $FunctionsExistance = array('exif_thumbnail', 'gd_info', 'image_type_to_mime_type', 'GetImageSize', 'ImageCopyResampled', 'ImageCopyResized', 'ImageCreate', 'ImageCreateFromString', 'ImageCreateTrueColor', 'ImageIsTrueColor', 'ImageRotate', 'ImageTypes', 'version_compare', 'ImageCreateFromGIF', 'ImageCreateFromJPEG', 'ImageCreateFromPNG', 'ImageCreateFromWBMP', 'ImageCreateFromXBM', 'ImageCreateFromXPM', 'ImageCreateFromString', 'ImageCreateFromGD', 'ImageCreateFromGD2', 'ImageCreateFromGD2Part', 'ImageJPEG', 'ImageGIF', 'ImagePNG', 'ImageWBMP'); + $ParameterNames = array('src', 'new', 'w', 'h', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'far', 'bg', 'bc', 'file', 'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'iar', 'maxb'); + $ConfigVariableNames = array('document_root', 'temp_directory', 'output_format', 'output_maxwidth', 'output_maxheight', 'error_message_image_default', 'error_bgcolor', 'error_textcolor', 'error_fontsize', 'error_die_on_error', 'error_silent_die_on_error', 'error_die_on_source_failure', 'nohotlink_enabled', 'nohotlink_valid_domains', 'nohotlink_erase_image', 'nohotlink_text_message', 'nooffsitelink_enabled', 'nooffsitelink_valid_domains', 'nooffsitelink_require_refer', 'nooffsitelink_erase_image', 'nooffsitelink_text_message', 'high_security_enabled', 'allow_src_above_docroot', 'allow_src_above_phpthumb', 'max_source_pixels', 'use_exif_thumbnail_for_speed', 'border_hexcolor', 'background_hexcolor', 'ttf_directory', 'disable_pathinfo_parsing', 'disable_imagecopyresampled'); + $OtherVariableNames = array('phpThumbDebug', 'thumbnailQuality', 'thumbnailFormat', 'gdimg_output', 'gdimg_source', 'sourceFilename', 'source_width', 'source_height', 'thumbnailCropX', 'thumbnailCropY', 'thumbnailCropW', 'thumbnailCropH', 'exif_thumbnail_width', 'exif_thumbnail_height', 'exif_thumbnail_type', 'thumbnail_width', 'thumbnail_height', 'thumbnail_image_width', 'thumbnail_image_height'); + + $DebugOutput = array(); + $DebugOutput[] = 'phpThumb() version = '.$this->phpthumb_version; + $DebugOutput[] = 'phpversion() = '.@phpversion(); + $DebugOutput[] = 'PHP_OS = '.PHP_OS; + $DebugOutput[] = '$_SERVER[SERVER_SOFTWARE] = '.@$_SERVER['SERVER_SOFTWARE']; + $DebugOutput[] = '__FILE__ = '.__FILE__; + $DebugOutput[] = 'realpath(.) = '.@realpath('.'); + $DebugOutput[] = '$_SERVER[PHP_SELF] = '.@$_SERVER['PHP_SELF']; + $DebugOutput[] = '$_SERVER[HOST_NAME] = '.@$_SERVER['HOST_NAME']; + $DebugOutput[] = '$_SERVER[HTTP_REFERER] = '.@$_SERVER['HTTP_REFERER']; + $DebugOutput[] = '$_SERVER[QUERY_STRING] = '.@$_SERVER['QUERY_STRING']; + $DebugOutput[] = '$_SERVER[PATH_INFO] = '.@$_SERVER['PATH_INFO']; + $DebugOutput[] = '$_SERVER[DOCUMENT_ROOT] = '.@$_SERVER['DOCUMENT_ROOT']; + $DebugOutput[] = 'getenv(DOCUMENT_ROOT) = '.@getenv('DOCUMENT_ROOT'); + $DebugOutput[] = ''; + + $DebugOutput[] = 'get_magic_quotes_gpc() = '.$this->phpThumbDebugVarDump(@get_magic_quotes_gpc()); + $DebugOutput[] = 'get_magic_quotes_runtime() = '.$this->phpThumbDebugVarDump(@get_magic_quotes_runtime()); + $DebugOutput[] = 'error_reporting() = '.$this->phpThumbDebugVarDump(error_reporting()); + $DebugOutput[] = 'ini_get(error_reporting) = '.$this->phpThumbDebugVarDump(@ini_get('error_reporting')); + $DebugOutput[] = 'ini_get(display_errors) = '.$this->phpThumbDebugVarDump(@ini_get('display_errors')); + $DebugOutput[] = 'ini_get(allow_url_fopen) = '.$this->phpThumbDebugVarDump(@ini_get('allow_url_fopen')); + $DebugOutput[] = 'ini_get(disable_functions) = '.$this->phpThumbDebugVarDump(@ini_get('disable_functions')); + $DebugOutput[] = 'get_cfg_var(disable_functions) = '.$this->phpThumbDebugVarDump(@get_cfg_var('disable_functions')); + $DebugOutput[] = 'ini_get(safe_mode) = '.$this->phpThumbDebugVarDump(@ini_get('safe_mode')); + $DebugOutput[] = 'ini_get(open_basedir) = '.$this->phpThumbDebugVarDump(@ini_get('open_basedir')); + $DebugOutput[] = 'ini_get(max_execution_time) = '.$this->phpThumbDebugVarDump(@ini_get('max_execution_time')); + $DebugOutput[] = 'ini_get(memory_limit) = '.$this->phpThumbDebugVarDump(@ini_get('memory_limit')); + $DebugOutput[] = 'get_cfg_var(memory_limit) = '.$this->phpThumbDebugVarDump(@get_cfg_var('memory_limit')); + $DebugOutput[] = 'memory_get_usage() = '.(function_exists('memory_get_usage') ? $this->phpThumbDebugVarDump(@memory_get_usage()) : 'n/a'); + $DebugOutput[] = ''; + + $DebugOutput[] = '$this->config_prefer_imagemagick = '.$this->phpThumbDebugVarDump($this->config_prefer_imagemagick); + $DebugOutput[] = '$this->config_imagemagick_path = '.$this->phpThumbDebugVarDump($this->config_imagemagick_path); + $DebugOutput[] = '$this->ImageMagickWhichConvert() = '.$this->ImageMagickWhichConvert(); + $IMpathUsed = ($this->config_imagemagick_path ? $this->config_imagemagick_path : $this->ImageMagickWhichConvert()); + $DebugOutput[] = '[actual ImageMagick path used] = '.$this->phpThumbDebugVarDump($IMpathUsed); + $DebugOutput[] = 'file_exists([actual ImageMagick path used]) = '.$this->phpThumbDebugVarDump(@file_exists($IMpathUsed)); + $DebugOutput[] = 'ImageMagickVersion(false) = '.$this->ImageMagickVersion(false); + $DebugOutput[] = 'ImageMagickVersion(true) = '.$this->ImageMagickVersion(true); + $DebugOutput[] = ''; + + $DebugOutput[] = '$this->config_cache_directory = '.$this->phpThumbDebugVarDump($this->config_cache_directory); + $DebugOutput[] = '$this->config_cache_directory_depth = '.$this->phpThumbDebugVarDump($this->config_cache_directory_depth); + $DebugOutput[] = '$this->config_cache_disable_warning = '.$this->phpThumbDebugVarDump($this->config_cache_disable_warning); + $DebugOutput[] = '$this->config_cache_maxage = '.$this->phpThumbDebugVarDump($this->config_cache_maxage); + $DebugOutput[] = '$this->config_cache_maxsize = '.$this->phpThumbDebugVarDump($this->config_cache_maxsize); + $DebugOutput[] = '$this->config_cache_maxfiles = '.$this->phpThumbDebugVarDump($this->config_cache_maxfiles); + $DebugOutput[] = '$this->config_cache_force_passthru = '.$this->phpThumbDebugVarDump($this->config_cache_force_passthru); + $DebugOutput[] = '$this->cache_filename = '.$this->phpThumbDebugVarDump($this->cache_filename); + $DebugOutput[] = 'is_readable($this->config_cache_directory) = '.$this->phpThumbDebugVarDump(@is_readable($this->config_cache_directory)); + $DebugOutput[] = 'is_writable($this->config_cache_directory) = '.$this->phpThumbDebugVarDump(@is_writable($this->config_cache_directory)); + $DebugOutput[] = 'is_readable($this->cache_filename) = '.$this->phpThumbDebugVarDump(@is_readable($this->cache_filename)); + $DebugOutput[] = 'is_writable($this->cache_filename) = '.(@file_exists($this->cache_filename) ? $this->phpThumbDebugVarDump(@is_writable($this->cache_filename)) : 'n/a'); + $DebugOutput[] = ''; + + foreach ($ConfigVariableNames as $varname) { + $varname = 'config_'.$varname; + $value = $this->$varname; + $DebugOutput[] = '$this->'.str_pad($varname, 37, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); + } + $DebugOutput[] = ''; + foreach ($OtherVariableNames as $varname) { + $value = $this->$varname; + $DebugOutput[] = '$this->'.str_pad($varname, 27, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); + } + $DebugOutput[] = 'strlen($this->rawImageData) = '.strlen(@$this->rawImageData); + $DebugOutput[] = 'strlen($this->exif_thumbnail_data) = '.strlen(@$this->exif_thumbnail_data); + $DebugOutput[] = ''; + + foreach ($ParameterNames as $varname) { + $value = $this->$varname; + $DebugOutput[] = '$this->'.str_pad($varname, 4, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); + } + $DebugOutput[] = ''; + + foreach ($FunctionsExistance as $functionname) { + $DebugOutput[] = 'builtin_function_exists('.$functionname.')'.str_repeat(' ', 23 - strlen($functionname)).' = '.$this->phpThumbDebugVarDump(phpthumb_functions::builtin_function_exists($functionname)); + } + $DebugOutput[] = ''; + + $gd_info = gd_info(); + foreach ($gd_info as $key => $value) { + $DebugOutput[] = 'gd_info.'.str_pad($key, 34, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); + } + $DebugOutput[] = ''; + + $exif_info = phpthumb_functions::exif_info(); + foreach ($exif_info as $key => $value) { + $DebugOutput[] = 'exif_info.'.str_pad($key, 26, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); + } + $DebugOutput[] = ''; + + if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) { + foreach ($ApacheLookupURIarray as $key => $value) { + $DebugOutput[] = 'ApacheLookupURIarray.'.str_pad($key, 15, ' ', STR_PAD_RIGHT).' = '.$this->phpThumbDebugVarDump($value); + } + } else { + $DebugOutput[] = 'ApacheLookupURIarray() -- FAILED'; + } + $DebugOutput[] = ''; + + if (isset($_GET) && is_array($_GET)) { + foreach ($_GET as $key => $value) { + $DebugOutput[] = '$_GET['.$key.']'.str_repeat(' ', 30 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value); + } + } + if (isset($_POST) && is_array($_POST)) { + foreach ($_POST as $key => $value) { + $DebugOutput[] = '$_POST['.$key.']'.str_repeat(' ', 29 - strlen($key)).'= '.$this->phpThumbDebugVarDump($value); + } + } + $DebugOutput[] = ''; + + $DebugOutput[] = '$this->debugmessages:'; + foreach ($this->debugmessages as $errorstring) { + $DebugOutput[] = ' * '.$errorstring; + } + $DebugOutput[] = ''; + + $DebugOutput[] = '$this->debugtiming:'; + foreach ($this->debugtiming as $timestamp => $timingstring) { + $DebugOutput[] = ' * '.$timestamp.' '.$timingstring; + } + $DebugOutput[] = ' * Total processing time: '.number_format(max(array_keys($this->debugtiming)) - min(array_keys($this->debugtiming)), 6); + + $this->f = (isset($_GET['f']) ? $_GET['f'] : $this->f); // debug modes 0-2 don't recognize text mode otherwise + return $this->ErrorImage(implode("\n", $DebugOutput), 700, 500, true); + } + + function FatalError($text) { + if (is_null($this->fatalerror)) { + $this->fatalerror = $text; + } + return true; + } + + function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) { + $width = ($width ? $width : $this->config_error_image_width); + $height = ($height ? $height : $this->config_error_image_height); + + $text = 'phpThumb() v'.$this->phpthumb_version."\n".'http://phpthumb.sourceforge.net'."\n\n".($this->config_disable_debug ? 'Error messages disabled' : $text); + + $this->FatalError($text); + $this->DebugMessage($text, __FILE__, __LINE__); + $this->purgeTempFiles(); + if ($this->phpThumbDebug && !$forcedisplay) { + return false; + } + if (!$this->config_error_die_on_error && !$forcedisplay) { + return false; + } + if ($this->config_error_silent_die_on_error) { + exit; + } + if ($this->err || $this->config_error_message_image_default) { + // Show generic custom error image instead of error message + // for use on production sites where you don't want debug messages + if (($this->err == 'showerror') || $this->phpThumbDebug) { + // fall through and actually show error message even if default error image is set + } else { + header('Location: '.($this->err ? $this->err : $this->config_error_message_image_default)); + exit; + } + } + $this->setOutputFormat(); + if (!$this->thumbnailFormat || (phpthumb_functions::gd_version() < 1)) { + $this->thumbnailFormat = 'text'; + } + if (@$this->thumbnailFormat == 'text') { + // bypass all GD functions and output text error message + if (!headers_sent()) { + header('Content-type: text/plain'); + echo $text; + } else { + echo '
    '.htmlspecialchars($text).'
    '; + } + exit; + } + + $FontWidth = ImageFontWidth($this->config_error_fontsize); + $FontHeight = ImageFontHeight($this->config_error_fontsize); + + $LinesOfText = explode("\n", @wordwrap($text, floor($width / $FontWidth), "\n", true)); + $height = max($height, count($LinesOfText) * $FontHeight); + + $headers_file = ''; + $headers_line = ''; + if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=') && headers_sent($headers_file, $headers_line)) { + + echo "\n".'**Headers already sent in file "'.$headers_file.'" on line "'.$headers_line.'", dumping error message as text:**
    '."\n\n".$text."\n".'
    '; + + } elseif (headers_sent()) { + + echo "\n".'**Headers already sent, dumping error message as text:**
    '."\n\n".$text."\n".'
    '; + + } elseif ($gdimg_error = ImageCreate($width, $height)) { + + $background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_bgcolor, true); + $text_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_textcolor, true); + ImageFilledRectangle($gdimg_error, 0, 0, $width, $height, $background_color); + $lineYoffset = 0; + foreach ($LinesOfText as $line) { + ImageString($gdimg_error, $this->config_error_fontsize, 2, $lineYoffset, $line, $text_color); + $lineYoffset += $FontHeight; + } + if (function_exists('ImageTypes')) { + $imagetypes = ImageTypes(); + if ($imagetypes & IMG_PNG) { + header('Content-Type: image/png'); + ImagePNG($gdimg_error); + } elseif ($imagetypes & IMG_GIF) { + header('Content-Type: image/gif'); + ImageGIF($gdimg_error); + } elseif ($imagetypes & IMG_JPG) { + header('Content-Type: image/jpeg'); + ImageJPEG($gdimg_error); + } elseif ($imagetypes & IMG_WBMP) { + header('Content-Type: image/vnd.wap.wbmp'); + ImageWBMP($gdimg_error); + } + } + ImageDestroy($gdimg_error); + + } + if (!headers_sent()) { + echo "\n".'**Failed to send graphical error image, dumping error message as text:**
    '."\n\n".$text; + } + exit; + return true; + } + + function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) { + // there are serious bugs in the non-bundled versions of GD which may cause + // PHP to segfault when calling ImageCreateFromString() - avoid if at all possible + // when not using a bundled version of GD2 + if (!phpthumb_functions::gd_version()) { + if ($DieOnErrors) { + if (!headers_sent()) { + // base64-encoded error image in GIF format + $ERROR_NOGD = 'R0lGODlhIAAgALMAAAAAABQUFCQkJDY2NkZGRldXV2ZmZnJycoaGhpSUlKWlpbe3t8XFxdXV1eTk5P7+/iwAAAAAIAAgAAAE/vDJSau9WILtTAACUinDNijZtAHfCojS4W5H+qxD8xibIDE9h0OwWaRWDIljJSkUJYsN4bihMB8th3IToAKs1VtYM75cyV8sZ8vygtOE5yMKmGbO4jRdICQCjHdlZzwzNW4qZSQmKDaNjhUMBX4BBAlmMywFSRWEmAI6b5gAlhNxokGhooAIK5o/pi9vEw4Lfj4OLTAUpj6IabMtCwlSFw0DCKBoFqwAB04AjI54PyZ+yY3TD0ss2YcVmN/gvpcu4TOyFivWqYJlbAHPpOntvxNAACcmGHjZzAZqzSzcq5fNjxFmAFw9iFRunD1epU6tsIPmFCAJnWYE0FURk7wJDA0MTKpEzoWAAskiAAA7'; + header('Content-Type: image/gif'); + echo base64_decode($ERROR_NOGD); + } else { + echo '*** ERROR: No PHP-GD support available ***'; + } + exit; + } else { + $this->DebugMessage('ImageCreateFromStringReplacement() failed: gd_version says "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__); + return false; + } + } + if (phpthumb_functions::gd_is_bundled()) { + $this->DebugMessage('ImageCreateFromStringReplacement() calling built-in ImageCreateFromString()', __FILE__, __LINE__); + return @ImageCreateFromString($RawImageData); + } + if ($this->issafemode) { + $this->DebugMessage('ImageCreateFromStringReplacement() failed: cannot create temp file in SAFE_MODE', __FILE__, __LINE__); + return false; + } + + switch (substr($RawImageData, 0, 3)) { + case 'GIF': + $ICFSreplacementFunctionName = 'ImageCreateFromGIF'; + break; + case "\xFF\xD8\xFF": + $ICFSreplacementFunctionName = 'ImageCreateFromJPEG'; + break; + case "\x89".'PN': + $ICFSreplacementFunctionName = 'ImageCreateFromPNG'; + break; + default: + $this->DebugMessage('ImageCreateFromStringReplacement() failed: unknown fileformat signature "'.phpthumb_functions::HexCharDisplay(substr($RawImageData, 0, 3)).'"', __FILE__, __LINE__); + return false; + break; + } + if ($tempnam = $this->phpThumb_tempnam()) { + if ($fp_tempnam = @fopen($tempnam, 'wb')) { + fwrite($fp_tempnam, $RawImageData); + fclose($fp_tempnam); + if (($ICFSreplacementFunctionName == 'ImageCreateFromGIF') && !function_exists($ICFSreplacementFunctionName)) { + + // Need to create from GIF file, but ImageCreateFromGIF does not exist + ob_start(); + if (!@include_once(dirname(__FILE__).'/phpthumb.gif.php')) { + $ErrorMessage = 'Failed to include required file "'.dirname(__FILE__).'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__; + $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); + } + ob_end_clean(); + // gif_loadFileToGDimageResource() cannot read from raw data, write to file first + if ($tempfilename = $this->phpThumb_tempnam()) { + if ($fp_tempfile = @fopen($tempfilename, 'wb')) { + fwrite($fp_tempfile, $RawImageData); + fclose($fp_tempfile); + $gdimg_source = gif_loadFileToGDimageResource($tempfilename); + $this->DebugMessage('gif_loadFileToGDimageResource('.$tempfilename.') completed', __FILE__, __LINE__); + $this->DebugMessage('deleting "'.$tempfilename.'"', __FILE__, __LINE__); + unlink($tempfilename); + return $gdimg_source; + break; + } else { + $ErrorMessage = 'Failed to open tempfile in '.__FILE__.' on line '.__LINE__; + $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); + } + } else { + $ErrorMessage = 'Failed to open generate tempfile name in '.__FILE__.' on line '.__LINE__; + $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); + } + + } elseif (function_exists($ICFSreplacementFunctionName) && ($gdimg_source = @$ICFSreplacementFunctionName($tempnam))) { + + // great + $this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') succeeded', __FILE__, __LINE__); + $this->DebugMessage('deleting "'.$tempnam.'"', __FILE__, __LINE__); + unlink($tempnam); + return $gdimg_source; + + } else { + + // GD functions not available, or failed to create image + $this->DebugMessage($ICFSreplacementFunctionName.'('.$tempnam.') '.(function_exists($ICFSreplacementFunctionName) ? 'failed' : 'does not exist'), __FILE__, __LINE__); + if (isset($_GET['phpThumbDebug'])) { + $this->phpThumbDebug(); + } + + } + } else { + $ErrorMessage = 'Failed to fopen('.$tempnam.', "wb") in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php'; + if ($this->issafemode) { + $ErrorMessage = 'ImageCreateFromStringReplacement() failed in '.__FILE__.' on line '.__LINE__.': cannot create temp file in SAFE_MODE'; + } + $this->DebugMessage($ErrorMessage, __FILE__, __LINE__); + } + $this->DebugMessage('deleting "'.$tempnam.'"', __FILE__, __LINE__); + @unlink($tempnam); + } else { + $ErrorMessage = 'Failed to generate phpThumb_tempnam() in '.__FILE__.' on line '.__LINE__."\n".'You may need to set $PHPTHUMB_CONFIG[temp_directory] in phpThumb.config.php'; + if ($this->issafemode) { + $ErrorMessage = 'ImageCreateFromStringReplacement() failed in '.__FILE__.' on line '.__LINE__.': cannot create temp file in SAFE_MODE'; + } + } + if ($DieOnErrors && $ErrorMessage) { + return $this->ErrorImage($ErrorMessage); + } + return false; + } + + function ImageResizeFunction(&$dst_im, &$src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH) { + $this->DebugMessage('ImageResizeFunction($o, $s, '.$dstX.', '.$dstY.', '.$srcX.', '.$srcY.', '.$dstW.', '.$dstH.', '.$srcW.', '.$srcH.')', __FILE__, __LINE__); + if (($dstW == $srcW) && ($dstH == $srcH)) { + return ImageCopy($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $srcW, $srcH); + } + if (phpthumb_functions::gd_version() >= 2.0) { + if ($this->config_disable_imagecopyresampled) { + return phpthumb_functions::ImageCopyResampleBicubic($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); + } + return ImageCopyResampled($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); + } + return ImageCopyResized($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); + } + + function InitializeTempDirSetting() { + $this->config_temp_directory = realpath($this->config_temp_directory ? $this->config_temp_directory : (getenv('TMPDIR') ? getenv('TMPDIR') : getenv('TMP'))); + return true; + } + + function phpThumb_tempnam() { + $this->InitializeTempDirSetting(); + $tempnam = realpath(tempnam($this->config_temp_directory, 'pThumb')); + $this->tempFilesToDelete[$tempnam] = $tempnam; + $this->DebugMessage('phpThumb_tempnam() returning "'.$tempnam.'"', __FILE__, __LINE__); + return $tempnam; + } + + function DebugMessage($message, $file='', $line='') { + $this->debugmessages[] = $message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : ''); + return true; + } + + function DebugTimingMessage($message, $file='', $line='', $timestamp=0) { + if (!$timestamp) { + $timestamp = array_sum(explode(' ', microtime())); + } + $this->debugtiming[number_format($timestamp, 6, '.', '')] = ': '.$message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : ''); + return true; + } } -?> +?> \ No newline at end of file From a58d5cd6091d3d42e92d2b1cdab2b6424d0d69b9 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:10:54 +0300 Subject: [PATCH 357/530] update phpthumb config --- assets/snippets/phpthumb/phpThumb.config.php | 32 +++++++++---------- .../phpthumb/phpThumb.config.php.default | 18 +++++------ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/assets/snippets/phpthumb/phpThumb.config.php b/assets/snippets/phpthumb/phpThumb.config.php index 9b03b2ac22..11191b885a 100644 --- a/assets/snippets/phpthumb/phpThumb.config.php +++ b/assets/snippets/phpthumb/phpThumb.config.php @@ -12,8 +12,8 @@ ob_start(); if (!file_exists(dirname(__FILE__).'/phpthumb.functions.php') || !include_once(dirname(__FILE__).'/phpthumb.functions.php')) { - ob_end_flush(); - die('failed to include_once(phpthumb.functions.php) - realpath="'.realpath(dirname(__FILE__).'/phpthumb.functions.php').'"'); + ob_end_flush(); + die('failed to include_once(phpthumb.functions.php) - realpath="'.realpath(dirname(__FILE__).'/phpthumb.functions.php').'"'); } ob_end_clean(); @@ -27,7 +27,7 @@ //$PHPTHUMB_CONFIG['document_root'] = 'c:\\webroot\\example.com\\www'; //$PHPTHUMB_CONFIG['document_root'] = $_SERVER['DOCUMENT_ROOT']; $PHPTHUMB_CONFIG['document_root'] = realpath((@$_SERVER['DOCUMENT_ROOT'] && file_exists(@$_SERVER['DOCUMENT_ROOT'].$_SERVER['PHP_SELF'])) ? $_SERVER['DOCUMENT_ROOT'] : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', realpath('.')))); -//$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && ereg('^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))), realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__)))); +//$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && preg_match('#^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))).'#', realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__)))); // * Cache directory configuration (choose only one of these - leave the other lines commented-out): // Note: this directory must be writable (usually chmod 777 is neccesary) for caching to work. @@ -108,15 +108,15 @@ // As a general guideline, this number will be about 20% of your PHP memory // configuration, so 8M = 1,677,722; 16M = 3,355,443; 32M = 6,710,886; etc. if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=') && !defined('memory_get_usage') && !@ini_get('memory_limit')) { - // memory_get_usage() will only be defined if your PHP is compiled with the --enable-memory-limit configuration option. - $PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit + // memory_get_usage() will only be defined if your PHP is compiled with the --enable-memory-limit configuration option. + $PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit } else { - // calculate default max_source_pixels as 1/6 of memory limit configuration - $PHPTHUMB_CONFIG['max_source_pixels'] = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 / 6); - //$PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit - //$PHPTHUMB_CONFIG['max_source_pixels'] = 1920000; // allow 1600x1200 images (2Mpx), no larger (about 12MB memory required) - //$PHPTHUMB_CONFIG['max_source_pixels'] = 2795000; // 16MB memory limit - //$PHPTHUMB_CONFIG['max_source_pixels'] = 3871488; // allow 2272x1704 images (4Mpx), no larger (about 24MB memory required) + // calculate default max_source_pixels as 1/6 of memory limit configuration + $PHPTHUMB_CONFIG['max_source_pixels'] = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 / 6); + //$PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit + //$PHPTHUMB_CONFIG['max_source_pixels'] = 1920000; // allow 1600x1200 images (2Mpx), no larger (about 12MB memory required) + //$PHPTHUMB_CONFIG['max_source_pixels'] = 2795000; // 16MB memory limit + //$PHPTHUMB_CONFIG['max_source_pixels'] = 3871488; // allow 2272x1704 images (4Mpx), no larger (about 24MB memory required) } @@ -124,12 +124,12 @@ $PHPTHUMB_CONFIG['prefer_imagemagick'] = false; // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low. $PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = false; // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { - // Windows: set absolute pathname - $PHPTHUMB_CONFIG['imagemagick_path'] = ''; + // Windows: set absolute pathname + $PHPTHUMB_CONFIG['imagemagick_path'] = ''; } else { - // *nix: set absolute pathname to "convert", or leave as null if "convert" is in the path (location detected with `which`) - //$PHPTHUMB_CONFIG['imagemagick_path'] = '/usr/local/bin/convert'; - $PHPTHUMB_CONFIG['imagemagick_path'] = null; + // *nix: set absolute pathname to "convert", or leave as null if "convert" is in the path (location detected with `which`) + //$PHPTHUMB_CONFIG['imagemagick_path'] = '/usr/local/bin/convert'; + $PHPTHUMB_CONFIG['imagemagick_path'] = null; } diff --git a/assets/snippets/phpthumb/phpThumb.config.php.default b/assets/snippets/phpthumb/phpThumb.config.php.default index e6cf99ef7b..d710cdde94 100644 --- a/assets/snippets/phpthumb/phpThumb.config.php.default +++ b/assets/snippets/phpthumb/phpThumb.config.php.default @@ -27,7 +27,7 @@ ob_end_clean(); //$PHPTHUMB_CONFIG['document_root'] = 'c:\\webroot\\example.com\\www'; //$PHPTHUMB_CONFIG['document_root'] = $_SERVER['DOCUMENT_ROOT']; //$PHPTHUMB_CONFIG['document_root'] = realpath((@$_SERVER['DOCUMENT_ROOT'] && file_exists(@$_SERVER['DOCUMENT_ROOT'].$_SERVER['PHP_SELF'])) ? $_SERVER['DOCUMENT_ROOT'] : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', realpath('.')))); -$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && ereg('^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))), realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__)))); +$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && preg_match('#^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))).'#', realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__)))); // * Cache directory configuration (choose only one of these - leave the other lines commented-out): // Note: this directory must be writable (usually chmod 777 is neccesary) for caching to work. @@ -42,7 +42,7 @@ $PHPTHUMB_CONFIG['cache_directory'] = dirname(__FILE__).'/cache/'; // $PHPTHUMB_CONFIG['cache_directory'] = '/tmp/persistent/phpthumb/cache/'; //} -$PHPTHUMB_CONFIG['cache_disable_warning'] = true; // If [cache_directory] is non-existant or not writable, and [cache_disable_warning] is false, an error image will be generated warning to either set the cache directory or disable the warning (to avoid people not knowing about the cache) +$PHPTHUMB_CONFIG['cache_disable_warning'] = false; // If [cache_directory] is non-existant or not writable, and [cache_disable_warning] is false, an error image will be generated warning to either set the cache directory or disable the warning (to avoid people not knowing about the cache) $PHPTHUMB_CONFIG['cache_directory_depth'] = 4; // If this larger than zero, cache structure will be broken into a broad directory structure based on cache filename. For example "cache_src012345..." will be stored in "/0/01/012/0123/cache_src012345..." when (cache_directory_depth = 4) @@ -78,7 +78,7 @@ $PHPTHUMB_CONFIG['cache_default_only_suffix'] = ''; // cached in norma //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb'; // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc) //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*'; // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc) -$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.str_replace('www.', '', @$_SERVER['SERVER_NAME']); +$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain //$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server $PHPTHUMB_CONFIG['cache_force_passthru'] = true; // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead @@ -135,7 +135,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { // * Default output configuration: -$PHPTHUMB_CONFIG['output_format'] = 'jpeg'; // default output format ('jpeg', 'png' or 'gif') - thumbnail will be output in this format (if available in your version of GD). This is always overridden by ?f=___ GETstring parameter +$PHPTHUMB_CONFIG['output_format'] = 'jpeg'; // default output format ('jpeg', 'png' or 'gif') - thumbnail will be output in this format (if available in your version of GD or ImageMagick). This is only used if the "f" parameter is not specified, and if the thumbnail can't be output in the input format. $PHPTHUMB_CONFIG['output_maxwidth'] = 0; // default maximum thumbnail width. If this is zero then default width is the width of the source image. This is always overridden by ?w=___ GETstring parameter $PHPTHUMB_CONFIG['output_maxheight'] = 0; // default maximum thumbnail height. If this is zero then default height is the height of the source image. This is always overridden by ?h=___ GETstring parameter $PHPTHUMB_CONFIG['output_interlace'] = true; // if true: interlaced output for GIF/PNG, progressive output for JPEG; if false: non-interlaced for GIF/PNG, baseline for JPEG. @@ -181,7 +181,7 @@ $PHPTHUMB_CONFIG['ttf_directory'] = dirname(__FILE__).'/fonts'; // Base director // Note: the data retrieved must be the actual binary data of the image, not a URL or filename $PHPTHUMB_CONFIG['mysql_query'] = ''; -//$PHPTHUMB_CONFIG['mysql_query'] = 'SELECT `picture` FROM `products` WHERE (`id` = \''.mysql_real_escape_string(@$_GET['id']).'\')'; +//$PHPTHUMB_CONFIG['mysql_query'] = 'SELECT `picture` FROM `products` WHERE (`id` = \''.mysql_escape_string(@$_GET['id']).'\')'; // These 4 values must be modified if $PHPTHUMB_CONFIG['mysql_query'] is not empty, but may be ignored if $PHPTHUMB_CONFIG['mysql_query'] is blank. $PHPTHUMB_CONFIG['mysql_hostname'] = 'localhost'; @@ -191,13 +191,11 @@ $PHPTHUMB_CONFIG['mysql_database'] = ''; // * Security configuration -$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to at least 5 characters, and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs -$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, must be at least 5 characters long -$PHPTHUMB_CONFIG['disable_debug'] = false; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled +$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs +$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password +$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled $PHPTHUMB_CONFIG['allow_src_above_docroot'] = false; // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root $PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true; // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation -$PHPTHUMB_CONFIG['allow_parameter_file'] = false; // if true, allow use of 'file' parameter; if false (default) the 'file' parameter is disabled/ignored -$PHPTHUMB_CONFIG['allow_parameter_goto'] = false; // if true, allow use of 'goto' parameter; if false (default) the 'goto' parameter is disabled/ignored // * HTTP UserAgent configuration From 7f526881052f56ede0330dbb28afff2987be5f69 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:11:26 +0300 Subject: [PATCH 358/530] update phpthumb filters function --- assets/snippets/phpthumb/phpthumb.filters.php | 285 ++++++++++++++---- .../snippets/phpthumb/phpthumb.functions.php | 46 +-- 2 files changed, 251 insertions(+), 80 deletions(-) diff --git a/assets/snippets/phpthumb/phpthumb.filters.php b/assets/snippets/phpthumb/phpthumb.filters.php index 11b67c81da..c30a98cc7a 100644 --- a/assets/snippets/phpthumb/phpthumb.filters.php +++ b/assets/snippets/phpthumb/phpthumb.filters.php @@ -73,20 +73,20 @@ function Bevel(&$gdimg, $width, $hexcolor1, $hexcolor2) { ImageAlphaBlending($gdimg, true); for ($i = 0; $i < $width; $i++) { $alpha = round(($i / $width) * 127); - $color1[$i] = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1, false, $alpha); - $color2[$i] = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2, false, $alpha); + $color1 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1, false, $alpha); + $color2 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2, false, $alpha); - ImageLine($gdimg, $i, $i, $i, ImageSY($gdimg) - $i, $color1[$i]); // left - ImageLine($gdimg, $i, $i, ImageSX($gdimg) - $i, $i, $color1[$i]); // top - ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i, ImageSX($gdimg) - $i, $i, $color2[$i]); // right - ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i, $i, ImageSY($gdimg) - $i, $color2[$i]); // bottom + ImageLine($gdimg, $i, $i + 1, $i, ImageSY($gdimg) - $i - 1, $color1); // left + ImageLine($gdimg, $i, $i , ImageSX($gdimg) - $i, $i , $color1); // top + ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i - 1, ImageSX($gdimg) - $i, $i + 1, $color2); // right + ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i , $i, ImageSY($gdimg) - $i , $color2); // bottom } return true; } function Blur(&$gdimg, $radius=0.5) { - // Taken from Torstein Hnsi's phpUnsharpMask (see phpthumb.unsharp.php) + // Taken from Torstein H￸nsi's phpUnsharpMask (see phpthumb.unsharp.php) $radius = round(max(0, min($radius, 50)) * 2); if (!$radius) { @@ -185,6 +185,8 @@ function Contrast(&$gdimg, $amount=0) { $amount = max(-255, min(255, $amount)); if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) { + // ImageFilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!) + $amount = ($amount / 255) * -100; if (ImageFilter($gdimg, IMG_FILTER_CONTRAST, $amount)) { return true; } @@ -212,6 +214,7 @@ function Contrast(&$gdimg, $amount=0) { function Colorize(&$gdimg, $amount, $targetColor) { $amount = (is_numeric($amount) ? $amount : 25); + $amountPct = $amount / 100; $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray'); if ($amount == 0) { @@ -222,9 +225,9 @@ function Colorize(&$gdimg, $amount, $targetColor) { if ($targetColor == 'gray') { $targetColor = '808080'; } - $r = substr($targetColor, 0, 2); - $g = substr($targetColor, 2, 2); - $b = substr($targetColor, 4, 2); + $r = round($amountPct * hexdec(substr($targetColor, 0, 2))); + $g = round($amountPct * hexdec(substr($targetColor, 2, 2))); + $b = round($amountPct * hexdec(substr($targetColor, 4, 2))); if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) { return true; } @@ -246,7 +249,7 @@ function Colorize(&$gdimg, $amount, $targetColor) { $TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel); } foreach ($TargetPixel as $key => $value) { - $NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * ($amount / 100))))); + $NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct)))); } //$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']); $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']); @@ -293,15 +296,24 @@ function Desaturate(&$gdimg, $amount, $color='') { } - function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $fade) { + function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) { if (phpthumb_functions::gd_version() < 2) { return false; } $distance = ($distance ? $distance : 10); $width = ($width ? $width : 10); $hexcolor = ($hexcolor ? $hexcolor : '000000'); - $angle = ($angle ? $angle : 225); - $fade = ($fade ? $fade : 1); + $angle = ($angle ? $angle : 225) % 360; + $alpha = max(0, min(100, ($alpha ? $alpha : 100))); + + if ($alpha <= 0) { + // invisible shadow, nothing to do + return true; + } + if ($distance <= 0) { + // shadow completely obscured by source image, nothing to do + return true; + } $width_shadow = cos(deg2rad($angle)) * ($distance + $width); $height_shadow = sin(deg2rad($angle)) * ($distance + $width); @@ -309,7 +321,7 @@ function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $fade) { $scaling = min(ImageSX($gdimg) / (ImageSX($gdimg) + abs($width_shadow)), ImageSY($gdimg) / (ImageSY($gdimg) + abs($height_shadow))); for ($i = 0; $i < $width; $i++) { - $WidthAlpha[$i] = (abs(($width / 2) - $i) / $width) * $fade; + $WidthAlpha[$i] = (abs(($width / 2) - $i) / $width); $Offset['x'] = cos(deg2rad($angle)) * ($distance + $i); $Offset['y'] = sin(deg2rad($angle)) * ($distance + $i); } @@ -626,7 +638,7 @@ function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height= $DefaultColors = array('r'=>'FF0000', 'g'=>'00FF00', 'b'=>'0000FF', 'a'=>'999999', '*'=>'FFFFFF'); $Colors = explode(';', $colors); - $BandsToGraph = array_unique(preg_split('//', $bands)); + $BandsToGraph = array_unique(preg_split('##', $bands)); $keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>'gray'); foreach ($BandsToGraph as $key => $band) { if (!isset($keys[$band])) { @@ -909,12 +921,33 @@ function Saturation(&$gdimg, $amount, $color='') { function Sepia(&$gdimg, $amount, $targetColor) { $amount = (is_numeric($amount) ? max(0, min(100, $amount)) : 50); + $amountPct = $amount / 100; $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'A28065'); if ($amount == 0) { return true; } + if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) { + if (ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)) { + + $r = round($amountPct * hexdec(substr($targetColor, 0, 2))); + $g = round($amountPct * hexdec(substr($targetColor, 2, 2))); + $b = round($amountPct * hexdec(substr($targetColor, 4, 2))); + if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) { + return true; + } + $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__); + // fall through and try it the hard way + + } else { + + $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__); + // fall through and try it the hard way + + } + } + $TargetPixel['red'] = hexdec(substr($targetColor, 0, 2)); $TargetPixel['green'] = hexdec(substr($targetColor, 2, 2)); $TargetPixel['blue'] = hexdec(substr($targetColor, 4, 2)); @@ -929,7 +962,7 @@ function Sepia(&$gdimg, $amount, $targetColor) { // http://www.gimpguru.org/Tutorials/SepiaToning/ // "In the traditional sepia toning process, the tinting occurs most in // the mid-tones: the lighter and darker areas appear to be closer to B&W." - $SepiaAmount = ((128 - abs($GrayPixel['red'] - 128)) / 128) * ($amount / 100); + $SepiaAmount = ((128 - abs($GrayPixel['red'] - 128)) / 128) * $amountPct; foreach ($TargetPixel as $key => $value) { $NewPixel[$key] = round(max(0, min(255, $GrayPixel[$key] * (1 - $SepiaAmount) + ($TargetPixel[$key] * $SepiaAmount)))); @@ -960,10 +993,36 @@ function Smooth(&$gdimg, $amount=6) { } + function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit=10) { + $width = ImageSX($gdimg); + $height = ImageSY($gdimg); + if ($gdimg_mask = ImageCreateTrueColor($width, $height)) { + $R = hexdec(substr($hexcolor, 0, 2)); + $G = hexdec(substr($hexcolor, 2, 2)); + $B = hexdec(substr($hexcolor, 4, 2)); + $targetPixel = array('red'=>$R, 'green'=>$G, 'blue'=>$B); + $cutoffRange = $max_limit - $min_limit; + for ($x = 0; $x < $width; $x++) { + for ($y = 0; $y < $height; $y++) { + $currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y); + $colorDiff = phpthumb_functions::PixelColorDifferencePercent($currentPixel, $targetPixel); + $grayLevel = min($cutoffRange, MAX(0, -$min_limit + $colorDiff)) * (255 / MAX(1, $cutoffRange)); + $newColor = ImageColorAllocate($gdimg_mask, $grayLevel, $grayLevel, $grayLevel); + ImageSetPixel($gdimg_mask, $x, $y, $newColor); + } + } + return $gdimg_mask; + } + return false; + } + + function Threshold(&$gdimg, $cutoff) { + $width = ImageSX($gdimg); + $height = ImageSY($gdimg); $cutoff = min(255, max(0, ($cutoff ? $cutoff : 128))); - for ($x = 0; $x < ImageSX($gdimg); $x++) { - for ($y = 0; $y < ImageSY($gdimg); $y++) { + for ($x = 0; $x < $width; $x++) { + for ($y = 0; $y < $height; $y++) { $currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y); $grayPixel = phpthumb_functions::GrayscalePixel($currentPixel); if ($grayPixel['red'] < $cutoff) { @@ -1045,6 +1104,16 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ } ImageAlphaBlending($gdimg, true); + if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)(@[LCR])?$#i', $alignment, $matches)) { + $originOffsetX = intval($matches[1]); + $originOffsetY = intval($matches[2]); + $alignment = (@$matches[4] ? $matches[4] : 'L'); + $margin = 0; + } else { + $originOffsetX = 0; + $originOffsetY = 0; + } + $metaTextArray = array( '^Fb' => $this->phpThumbObject->getimagesizeinfo['filesize'], '^Fk' => round($this->phpThumbObject->getimagesizeinfo['filesize'] / 1024), @@ -1060,10 +1129,12 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ $text = str_replace("\r\n", "\n", $text); $text = str_replace("\r", "\n", $text); $textlines = explode("\n", $text); + $this->DebugMessage('Processing '.count($textlines).' lines of text', __FILE__, __LINE__); if (@is_readable($ttffont) && is_file($ttffont)) { $opacity = 100 - intval(max(min($opacity, 100), 0)); + $letter_color_text = phpthumb_functions::ImageHexColorAllocate($gdimg, $hex_color, false, $opacity * 1.27); $this->DebugMessage('Using TTF font "'.$ttffont.'"', __FILE__, __LINE__); @@ -1084,68 +1155,73 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ $char_max_y = max($TTFboxChar[1], $TTFboxChar[3], $TTFboxChar[5], $TTFboxChar[7]); $char_height = round($char_max_y - $char_min_y); + if ($alignment == '*') { + + $text_origin_y = $char_height + $margin; + while (($text_origin_y - $text_height) < ImageSY($gdimg)) { + $text_origin_x = $margin; + while ($text_origin_x < ImageSX($gdimg)) { + ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text); + $text_origin_x += ($text_width + $margin); + } + $text_origin_y += ($text_height + $margin); + } + + } else { + + // this block for background color only + switch ($alignment) { + case '*': + // handled separately + break; + case 'T': - $text_origin_x = round((ImageSX($gdimg) - $text_width) / 2); - $text_origin_y = $char_height + $margin; + $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((ImageSX($gdimg) - $text_width) / 2)); + $text_origin_y = $char_height + $margin + $originOffsetY; break; case 'B': - $text_origin_x = round((ImageSX($gdimg) - $text_width) / 2); - $text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin; + $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((ImageSX($gdimg) - $text_width) / 2)); + $text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin + $originOffsetY; break; case 'L': - $text_origin_x = $margin; - $text_origin_y = round((ImageSY($gdimg) - $text_height) / 2) + $char_height; + $text_origin_x = $margin + $originOffsetX; + $text_origin_y = ($originOffsetY ? $originOffsetY : round((ImageSY($gdimg) - $text_height) / 2) + $char_height); break; case 'R': - $text_origin_x = ImageSX($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin; - $text_origin_y = round((ImageSY($gdimg) - $text_height) / 2) + $char_height; + $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : ImageSX($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin); + $text_origin_y = ($originOffsetY ? $originOffsetY : round((ImageSY($gdimg) - $text_height) / 2) + $char_height); break; case 'C': - $text_origin_x = round((ImageSX($gdimg) - $text_width) / 2); - $text_origin_y = round((ImageSY($gdimg) - $text_height) / 2) + $char_height; + $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((ImageSX($gdimg) - $text_width) / 2)); + $text_origin_y = ($originOffsetY ? $originOffsetY : round((ImageSY($gdimg) - $text_height) / 2) + $char_height); break; case 'TL': - $text_origin_x = $margin; - $text_origin_y = $char_height + $margin; + $text_origin_x = $margin + $originOffsetX; + $text_origin_y = $char_height + $margin + $originOffsetY; break; case 'TR': - $text_origin_x = ImageSX($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin; - $text_origin_y = $char_height + $margin; + $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : ImageSX($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin); + $text_origin_y = $char_height + $margin + $originOffsetY; break; case 'BL': - $text_origin_x = $margin; - $text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin; + $text_origin_x = $margin + $originOffsetX; + $text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin + $originOffsetY; break; case 'BR': default: - $text_origin_x = ImageSX($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin; - $text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin; + $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : ImageSX($gdimg) - $text_width + $TTFbox[0] - $min_x + round($size * 0.25) - $margin); + $text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin + $originOffsetY; break; } - $letter_color_text = phpthumb_functions::ImageHexColorAllocate($gdimg, $hex_color, false, $opacity * 1.27); - - if ($alignment == '*') { - - $text_origin_y = $char_height + $margin; - while (($text_origin_y - $text_height) < ImageSY($gdimg)) { - $text_origin_x = $margin; - while ($text_origin_x < ImageSX($gdimg)) { - ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text); - $text_origin_x += ($text_width + $margin); - } - $text_origin_y += ($text_height + $margin); - } - - } else { //ImageRectangle($gdimg, $text_origin_x + $min_x, $text_origin_y + $TTFbox[1], $text_origin_x + $min_x + $text_width, $text_origin_y + $TTFbox[1] - $text_height, $letter_color_text); if (phpthumb_functions::IsHexColor($bg_color)) { @@ -1158,17 +1234,63 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ $y1 = $text_origin_y + $TTFbox[1]; $x2 = $text_origin_x + $min_x + $text_width; $y2 = $text_origin_y + $TTFbox[1] - $text_height; - $x_TL = eregi('x', $fillextend) ? 0 : min($x1, $x2); - $y_TL = eregi('y', $fillextend) ? 0 : min($y1, $y2); - $x_BR = eregi('x', $fillextend) ? ImageSX($gdimg) : max($x1, $x2); - $y_BR = eregi('y', $fillextend) ? ImageSY($gdimg) : max($y1, $y2); + $x_TL = preg_match('#x#i', $fillextend) ? 0 : min($x1, $x2); + $y_TL = preg_match('#y#i', $fillextend) ? 0 : min($y1, $y2); + $x_BR = preg_match('#x#i', $fillextend) ? ImageSX($gdimg) : max($x1, $x2); + $y_BR = preg_match('#y#i', $fillextend) ? ImageSY($gdimg) : max($y1, $y2); //while ($y_BR > ImageSY($gdimg)) { // $y_TL--; // $y_BR--; // $text_origin_y--; //} + $this->DebugMessage('WatermarkText() calling ImageFilledRectangle($gdimg, '.$x_TL.', '.$y_TL.', '.$x_BR.', '.$y_BR.', $text_color_background)', __FILE__, __LINE__); ImageFilledRectangle($gdimg, $x_TL, $y_TL, $x_BR, $y_BR, $text_color_background); - ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text); + + // end block for background color only + + + $y_offset = 0; + foreach ($textlines as $dummy => $line) { + + $TTFboxLine = ImageTTFbBox($size, $angle, $ttffont, $line); + $min_x_line = min($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]); + $max_x_line = max($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]); + //$text_width = round($max_x - $min_x + ($size * 0.5)); + $text_width_line = round($max_x_line - $min_x_line); + + $min_y_line = min($TTFboxLine[1], $TTFboxLine[3], $TTFboxLine[5], $TTFboxLine[7]); + $max_y_line = max($TTFboxLine[1], $TTFboxLine[3], $TTFboxLine[5], $TTFboxLine[7]); + //$text_height = round($max_y - $min_y + ($size * 0.5)); + $text_height_line = round($max_y_line - $min_y_line); + + switch ($alignment) { + // $text_origin_y set above, just re-set $text_origin_x here as needed + + case 'L': + case 'TL': + case 'BL': + // no change neccesary + break; + + case 'C': + case 'T': + case 'B': + $text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width_line / 2) : round((ImageSX($gdimg) - $text_width_line) / 2)); + break; + + case 'R': + case 'TR': + case 'BR': + $text_origin_x = ($originOffsetX ? $originOffsetX - $text_width_line : ImageSX($gdimg) - $text_width_line + $TTFbox[0] - $min_x + round($size * 0.25) - $margin); + break; + } + + //ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text); + $this->DebugMessage('WatermarkText() calling ImageTTFtext($gdimg, '.$size.', '.$angle.', '.$text_origin_x.', '.($text_origin_y + $y_offset).', $letter_color_text, '.$ttffont.', '.$line.')', __FILE__, __LINE__); + ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y + $y_offset, $letter_color_text, $ttffont, $line); + + $y_offset += $char_height; + } } return true; @@ -1192,6 +1314,7 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ } else { $text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, 'FFFFFF', false, 127); } + $this->DebugMessage('WatermarkText() calling ImageFilledRectangle($img_watermark, 0, 0, '.ImageSX($img_watermark).', '.ImageSY($img_watermark).', $text_color_background)', __FILE__, __LINE__); ImageFilledRectangle($img_watermark, 0, 0, ImageSX($img_watermark), ImageSY($img_watermark), $text_color_background); if ($angle && function_exists('ImageRotate')) { @@ -1208,26 +1331,64 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ foreach ($textlines as $key => $line) { switch ($alignment) { case 'C': + $x_offset = round(($text_width - (ImageFontWidth($size) * strlen($line))) / 2); + $originOffsetX = (ImageSX($gdimg) - ImageSX($img_watermark)) / 2; + $originOffsetY = (ImageSY($gdimg) - ImageSY($img_watermark)) / 2; + break; + case 'T': + $x_offset = round(($text_width - (ImageFontWidth($size) * strlen($line))) / 2); + $originOffsetX = (ImageSX($gdimg) - ImageSX($img_watermark)) / 2; + $originOffsetY = $margin; + break; + case 'B': $x_offset = round(($text_width - (ImageFontWidth($size) * strlen($line))) / 2); + $originOffsetX = (ImageSX($gdimg) - ImageSX($img_watermark)) / 2; + $originOffsetY = ImageSY($gdimg) - ImageSY($img_watermark) - $margin; break; case 'L': + $x_offset = 0; + $originOffsetX = $margin; + $originOffsetY = (ImageSY($gdimg) - ImageSY($img_watermark)) / 2; + break; + case 'TL': + $x_offset = 0; + $originOffsetX = $margin; + $originOffsetY = $margin; + break; + case 'BL': $x_offset = 0; + $originOffsetX = $margin; + $originOffsetY = ImageSY($gdimg) - ImageSY($img_watermark) - $margin; break; case 'R': + $x_offset = $text_width - (ImageFontWidth($size) * strlen($line)); + $originOffsetX = ImageSX($gdimg) - ImageSX($img_watermark) - $margin; + $originOffsetY = (ImageSY($gdimg) - ImageSY($img_watermark)) / 2; + break; + case 'TR': + $x_offset = $text_width - (ImageFontWidth($size) * strlen($line)); + $originOffsetX = ImageSX($gdimg) - ImageSX($img_watermark) - $margin; + $originOffsetY = $margin; + break; + case 'BR': default: $x_offset = $text_width - (ImageFontWidth($size) * strlen($line)); + $originOffsetX = ImageSX($gdimg) - ImageSX($img_watermark) - $margin; + $originOffsetY = ImageSY($gdimg) - ImageSY($img_watermark) - $margin; break; } + $this->DebugMessage('WatermarkText() calling ImageString($img_watermark, '.$size.', '.$x_offset.', '.($key * ImageFontHeight($size)).', '.$line.', $text_color_watermark)', __FILE__, __LINE__); ImageString($img_watermark, $size, $x_offset, $key * ImageFontHeight($size), $line, $text_color_watermark); if ($angle && $img_watermark_mask) { + $this->DebugMessage('WatermarkText() calling ImageString($img_watermark_mask, '.$size.', '.$x_offset.', '.($key * ImageFontHeight($size)).', '.$text.', $mask_color_watermark)', __FILE__, __LINE__); ImageString($img_watermark_mask, $size, $x_offset, $key * ImageFontHeight($size), $text, $mask_color_watermark); } } @@ -1236,7 +1397,9 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ $img_watermark_mask = ImageRotate($img_watermark_mask, $angle, $mask_color_background); phpthumb_filters::ApplyMask($img_watermark_mask, $img_watermark); } - phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $alignment, $opacity, $margin); + //phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $alignment, $opacity, $margin); + $this->DebugMessage('WatermarkText() calling phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, '.($originOffsetX.'x'.$originOffsetY).', '.$opacity.', 0)', __FILE__, __LINE__); + phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $originOffsetX.'x'.$originOffsetY, $opacity, 0); ImageDestroy($img_watermark); return true; } @@ -1247,6 +1410,7 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacity=50, $margin_x=5, $margin_y=null) { + if (is_resource($gdimg_dest) && is_resource($img_watermark)) { $watermark_source_x = 0; $watermark_source_y = 0; @@ -1258,6 +1422,10 @@ function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacit $margin_y = (is_null($margin_y) ? $margin_x : $margin_y); $watermark_margin_x = ((($margin_x > 0) && ($margin_x < 1)) ? round((1 - $margin_x) * $img_source_width) : $margin_x); $watermark_margin_y = ((($margin_y > 0) && ($margin_y < 1)) ? round((1 - $margin_y) * $img_source_height) : $margin_y); + if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) { + $watermark_destination_x = intval($matches[1]); + $watermark_destination_y = intval($matches[2]); + } else { switch ($alignment) { case '*': if ($gdimg_tiledwatermark = phpthumb_functions::ImageCreateFunction($img_source_width, $img_source_height)) { @@ -1355,6 +1523,7 @@ function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacit $watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y; break; } + } ImageAlphaBlending($gdimg_dest, false); ImageSaveAlpha($gdimg_dest, true); ImageSaveAlpha($img_watermark, true); diff --git a/assets/snippets/phpthumb/phpthumb.functions.php b/assets/snippets/phpthumb/phpthumb.functions.php index 87b7b36df6..d9218959a9 100644 --- a/assets/snippets/phpthumb/phpthumb.functions.php +++ b/assets/snippets/phpthumb/phpthumb.functions.php @@ -39,7 +39,8 @@ public static function version_compare_replacement_sub($version1, $version2, $op // The possible operators are: <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne respectively. // Using this argument, the function will return 1 if the relationship is the one specified by the operator, 0 otherwise. - // If a part contains special version strings these are handled in the following order: dev < (alpha = a) < (beta = b) < RC < pl + // If a part contains special version strings these are handled in the following order: + // (any string not found in this list) < (dev) < (alpha = a) < (beta = b) < (RC = rc) < (#) < (pl = p) static $versiontype_lookup = array(); if (empty($versiontype_lookup)) { $versiontype_lookup['dev'] = 10001; @@ -48,14 +49,13 @@ public static function version_compare_replacement_sub($version1, $version2, $op $versiontype_lookup['b'] = 10003; $versiontype_lookup['beta'] = 10003; $versiontype_lookup['RC'] = 10004; - $versiontype_lookup['pl'] = 10005; - } - if (isset($versiontype_lookup[$version1])) { - $version1 = $versiontype_lookup[$version1]; - } - if (isset($versiontype_lookup[$version2])) { - $version2 = $versiontype_lookup[$version2]; + $versiontype_lookup['rc'] = 10004; + $versiontype_lookup['#'] = 10005; + $versiontype_lookup['pl'] = 10006; + $versiontype_lookup['p'] = 10006; } + $version1 = (isset($versiontype_lookup[$version1]) ? $versiontype_lookup[$version1] : $version1); + $version2 = (isset($versiontype_lookup[$version2]) ? $versiontype_lookup[$version2] : $version2); switch ($operator) { case '<': @@ -106,8 +106,8 @@ public static function version_compare_replacement($version1, $version2, $operat // and also inserts dots . before and after any non number so that for example '4.3.2RC1' becomes '4.3.2.RC.1'. // Then it splits the results like if you were using explode('.',$ver). Then it compares the parts starting from left to right. - $version1 = preg_replace('/([0-9]+)([A-Z]+)([0-9]+)/i', '\\1.\\2.\\3', $version1); - $version2 = preg_replace('/([0-9]+)([A-Z]+)([0-9]+)/i', '\\1.\\2.\\3', $version2); + $version1 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version1); + $version2 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version2); $parts1 = explode('.', $version1); $parts2 = explode('.', $version1); @@ -416,7 +416,7 @@ public static function ProportionalResize($old_width, $old_height, $new_width=fa // limited by height $new_width = $new_height * $old_aspect_ratio; } - return array(round($new_width), round($new_height)); + return array(intval(round($new_width)), intval(round($new_height))); } @@ -484,6 +484,7 @@ public static function SafeExec($command) { public static function ApacheLookupURIarray($filename) { // apache_lookup_uri() only works when PHP is installed as an Apache module. if (php_sapi_name() == 'apache') { + //$property_exists_exists = function_exists('property_exists'); $keys = array('status', 'the_request', 'status_line', 'method', 'content_type', 'handler', 'uri', 'filename', 'path_info', 'args', 'boundary', 'no_cache', 'no_local_copy', 'allowed', 'send_bodyct', 'bytes_sent', 'byterange', 'clength', 'unparsed_uri', 'mtime', 'request_time'); if ($apacheLookupURIobject = @apache_lookup_uri($filename)) { $apacheLookupURIarray = array(); @@ -511,7 +512,7 @@ public static function gd_version($fullstring=false) { static $cache_gd_version = array(); if (empty($cache_gd_version)) { $gd_info = gd_info(); - if (preg_match('/bundled \((.+)\)$/i', $gd_info['GD Version'], $matches)) { + if (preg_match('#bundled \((.+)\)$#i', $gd_info['GD Version'], $matches)) { $cache_gd_version[1] = $gd_info['GD Version']; // e.g. "bundled (2.0.15 compatible)" $cache_gd_version[0] = (float) $matches[1]; // e.g. "2.0" (not "bundled (2.0.15 compatible)") } else { @@ -533,7 +534,7 @@ public static function filesize_remote($remotefile, $timeout=10) { } while (!feof($fp)) { $headerline = fgets($fp, 4096); - if (preg_match('/^Content\-Length\: (.*)/i', $headerline, $matches)) { + if (preg_match('#^Content-Length: (.*)#i', $headerline, $matches)) { $size = intval($matches[1]); break; } @@ -554,7 +555,7 @@ public static function filedate_remote($remotefile, $timeout=10) { } while (!feof($fp)) { $headerline = fgets($fp, 4096); - if (preg_match('/^Last\-Modified\: (.*)/i', $headerline, $matches)) { + if (preg_match('#^Last-Modified: (.*)#i', $headerline, $matches)) { $date = strtotime($matches[1]) - date('Z'); break; } @@ -632,7 +633,7 @@ public static function URLreadFsock($host, $file, &$errstr, $successonly=true, $ $errstr = 'fsockopen() unavailable'; return false; } - if ($fp = @fsockopen($host, 80, $errno, $errstr, $timeout)) { + if ($fp = @fsockopen($host, $port, $errno, $errstr, $timeout)) { $out = 'GET '.$file.' HTTP/1.0'."\r\n"; $out .= 'Host: '.$host."\r\n"; $out .= 'Connection: Close'."\r\n\r\n"; @@ -649,10 +650,10 @@ public static function URLreadFsock($host, $file, &$errstr, $successonly=true, $ } else { $Data_body .= $line; } - if (preg_match('/^HTTP\/[\\.0-9]+ ([0-9]+) (.+)$/i', rtrim($line), $matches)) { + if (preg_match('#^HTTP/[\\.0-9]+ ([0-9]+) (.+)$#i', rtrim($line), $matches)) { list($dummy, $errno, $errstr) = $matches; $errno = intval($errno); - } elseif (preg_match('/^Location\: (.*)$/i', rtrim($line), $matches)) { + } elseif (preg_match('#^Location: (.*)$#i', rtrim($line), $matches)) { $header_newlocation = $matches[1]; } if ($isHeader && ($line == "\r\n")) { @@ -679,7 +680,7 @@ public static function URLreadFsock($host, $file, &$errstr, $successonly=true, $ } public static function CleanUpURLencoding($url, $queryseperator='&') { - if (!preg_match('/^http/i', $url)) { + if (!preg_match('#^http#i', $url)) { return $url; } $parse_url = phpthumb_functions::ParseURLbetter($url); @@ -695,7 +696,7 @@ public static function CleanUpURLencoding($url, $queryseperator='&') { } } - $queries = explode($queryseperator, @$parse_url['query']); + $queries = explode($queryseperator, (isset($parse_url['query']) ? $parse_url['query'] : '')); $CleanQueries = array(); foreach ($queries as $key => $query) { @list($param, $value) = explode('=', $query); @@ -710,6 +711,7 @@ public static function CleanUpURLencoding($url, $queryseperator='&') { $cleaned_url = $parse_url['scheme'].'://'; $cleaned_url .= (@$parse_url['username'] ? $parse_url['host'].(@$parse_url['password'] ? ':'.$parse_url['password'] : '').'@' : ''); $cleaned_url .= $parse_url['host']; + $cleaned_url .= ((!empty($parse_url['port']) && ($parse_url['port'] != 80)) ? ':'.$parse_url['port'] : ''); $cleaned_url .= '/'.implode('/', $CleanPathElements); $cleaned_url .= (@$CleanQueries ? '?'.implode($queryseperator, $CleanQueries) : ''); return $cleaned_url; @@ -742,7 +744,7 @@ public static function SafeURLread($url, &$error, $timeout=10, $followredirects= while (true) { $tryagain = false; $rawData = phpthumb_functions::URLreadFsock(@$parsed_url['host'], @$parsed_url['path'].'?'.@$parsed_url['query'], $errstr, true, (@$parsed_url['port'] ? @$parsed_url['port'] : 80), $timeout); - if (preg_match('/302 [a-z ]+; Location\\: (http.*)/i', $errstr, $matches)) { + if (preg_match('#302 [a-z ]+; Location\\: (http.*)#i', $errstr, $matches)) { $matches[1] = trim(@$matches[1]); if (!@$alreadyLookedAtURLs[$matches[1]]) { // loop through and examine new URL @@ -819,7 +821,7 @@ public static function SafeURLread($url, &$error, $timeout=10, $followredirects= public static function EnsureDirectoryExists($dirname) { $directory_elements = explode(DIRECTORY_SEPARATOR, $dirname); $startoffset = (!$directory_elements[0] ? 2 : 1); // unix with leading "/" then start with 2nd element; Windows with leading "c:\" then start with 1st element - $open_basedirs = preg_split('/[;:]/', ini_get('open_basedir')); + $open_basedirs = preg_split('#[;:]#', ini_get('open_basedir')); foreach ($open_basedirs as $key => $open_basedir) { if (preg_match('#^'.preg_quote($open_basedir).'#', $dirname) && (strlen($dirname) > strlen($open_basedir))) { $startoffset = count(explode(DIRECTORY_SEPARATOR, $open_basedir)); @@ -994,7 +996,7 @@ function preg_quote($string, $delimiter='\\') { if (!function_exists('file_get_contents')) { // included in PHP v4.3.0+ function file_get_contents($filename) { - if (preg_match('/^(f|ht)tp\:\/\//i', $filename)) { + if (preg_match('#^(f|ht)tp\://#i', $filename)) { return SafeURLread($filename, $error); } if ($fp = @fopen($filename, 'rb')) { From 3354b53a301d55186a7c6ab4d9b243bd8c4276ec Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:12:14 +0300 Subject: [PATCH 359/530] update phpthumb done --- assets/snippets/phpthumb/phpThumb.php | 327 ++++++++++-------- assets/snippets/phpthumb/phpthumb.bmp.php | 6 +- assets/snippets/phpthumb/phpthumb.class.php | 2 +- assets/snippets/phpthumb/phpthumb.gif.php | 7 +- assets/snippets/phpthumb/phpthumb.unsharp.php | 143 ++++---- 5 files changed, 256 insertions(+), 229 deletions(-) diff --git a/assets/snippets/phpthumb/phpThumb.php b/assets/snippets/phpthumb/phpThumb.php index 18f8113ecd..b1712a2fc0 100644 --- a/assets/snippets/phpthumb/phpThumb.php +++ b/assets/snippets/phpthumb/phpThumb.php @@ -11,11 +11,8 @@ error_reporting(E_ALL); ini_set('display_errors', '1'); -if (!@ini_get('safe_mode')) { - set_time_limit(60); // shouldn't take nearly this long in most cases, but with many filter and/or a slow server... -} ini_set('magic_quotes_runtime', '0'); -if (@ini_get('magic_quotes_runtime')) { +if (ini_get('magic_quotes_runtime')) { die('"magic_quotes_runtime" is set in php.ini, cannot run phpThumb with this enabled'); } $starttime = array_sum(explode(' ', microtime())); @@ -26,6 +23,88 @@ $_GET = $HTTP_GET_VARS; } +function SendSaveAsFileHeaderIfNeeded() { + if (headers_sent()) { + return false; + } + global $phpThumb; + $downloadfilename = phpthumb_functions::SanitizeFilename(@$_GET['sia'] ? $_GET['sia'] : (@$_GET['down'] ? $_GET['down'] : 'phpThumb_generated_thumbnail'.(@$_GET['f'] ? $_GET['f'] : 'jpg'))); + if (@$downloadfilename) { + $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__); + header('Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"'); + } + return true; +} + +function PasswordStrength($password) { + $strength = 0; + $strength += strlen(preg_replace('#[^a-z]#', '', $password)) * 0.5; // lowercase characters are weak + $strength += strlen(preg_replace('#[^A-Z]#', '', $password)) * 0.8; // uppercase characters are somewhat better + $strength += strlen(preg_replace('#[^0-9]#', '', $password)) * 1.0; // numbers are somewhat better + $strength += strlen(preg_replace('#[a-zA-Z0-9]#', '', $password)) * 2.0; // other non-alphanumeric characters are best + return $strength; +} + +function RedirectToCachedFile() { + global $phpThumb, $PHPTHUMB_CONFIG; + + $nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename); + $nice_docroot = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($PHPTHUMB_CONFIG['document_root'], '/\\')); + + $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']); + + $nModified = filemtime($phpThumb->cache_filename); + + if ($phpThumb->config_nooffsitelink_enabled && @$_SERVER['HTTP_REFERER'] && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) { + + $phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__); + + } elseif ($phpThumb->phpThumbDebug) { + + $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__); + $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__); + $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__); + if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) { + $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__); + } + if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) { + $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__); + } else { + $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__); + } + + } else { + + if (headers_sent()) { + $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')'); + exit; + } + SendSaveAsFileHeaderIfNeeded(); + + header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT'); + if (@$_SERVER['HTTP_IF_MODIFIED_SINCE'] && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && @$_SERVER['SERVER_PROTOCOL']) { + header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified'); + exit; + } + + if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) { + header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2])); + } elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) { + header('Content-Type: image/x-icon'); + } + if (!@$PHPTHUMB_CONFIG['cache_force_passthru'] && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) { + header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1]))); + } else { + @readfile($phpThumb->cache_filename); + } + exit; + + } + return true; +} + + + // instantiate a new phpThumb() object ob_start(); if (!include_once(dirname(__FILE__).'/phpthumb.class.php')) { @@ -33,10 +112,15 @@ die('failed to include_once("'.realpath(dirname(__FILE__).'/phpthumb.class.php').'")'); } ob_end_clean(); + $phpThumb = new phpThumb(); $phpThumb->DebugTimingMessage('phpThumb.php start', __FILE__, __LINE__, $starttime); $phpThumb->SetParameter('config_error_die_on_error', true); +if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) { + set_time_limit(60); // shouldn't take nearly this long in most cases, but with many filters and/or a slow server... +} + // phpThumbDebug[0] used to be here, but may reveal too much // info when high_security_mode should be enabled (not set yet) @@ -46,28 +130,32 @@ // great } else { ob_end_flush(); + $phpThumb->config_disable_debug = false; // otherwise error message won't print $phpThumb->ErrorImage('failed to include_once('.dirname(__FILE__).'/phpThumb.config.php) - realpath="'.realpath(dirname(__FILE__).'/phpThumb.config.php').'"'); } ob_end_clean(); } elseif (file_exists(dirname(__FILE__).'/phpThumb.config.php.default')) { + $phpThumb->config_disable_debug = false; // otherwise error message won't print $phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"'); } else { + $phpThumb->config_disable_debug = false; // otherwise error message won't print $phpThumb->ErrorImage('failed to include_once('.dirname(__FILE__).'/phpThumb.config.php) - realpath="'.realpath(dirname(__FILE__).'/phpThumb.config.php').'"'); } -if (!@$PHPTHUMB_CONFIG['disable_pathinfo_parsing'] && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) { +if (empty($PHPTHUMB_CONFIG['disable_pathinfo_parsing']) && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) { $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']); $args = explode(';', substr($_SERVER['PATH_INFO'], 1)); $phpThumb->DebugMessage('PATH_INFO.$args set to ('.implode(')(', $args).')', __FILE__, __LINE__); if (!empty($args)) { $_GET['src'] = @$args[count($args) - 1]; - if (eregi('^new\=([a-z0-9]+)', $_GET['src'], $matches)) { + $phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__); + if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) { unset($_GET['src']); $_GET['new'] = $matches[1]; } } - if (eregi('^([0-9]*)x?([0-9]*)$', @$args[count($args) - 2], $matches)) { + if (preg_match('#^([0-9]*)x?([0-9]*)$#i', @$args[count($args) - 2], $matches)) { $_GET['w'] = $matches[1]; $_GET['h'] = $matches[2]; $phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__); @@ -85,16 +173,16 @@ } } -if (@$PHPTHUMB_CONFIG['high_security_enabled']) { - - $ptquery = str_replace('&hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']); - $hash = md5($ptquery.$PHPTHUMB_CONFIG['high_security_password']); - - if (!@$_GET['hash']) { +if (!empty($PHPTHUMB_CONFIG['high_security_enabled'])) { + if (empty($_GET['hash'])) { + $phpThumb->config_disable_debug = false; // otherwise error message won't print $phpThumb->ErrorImage('ERROR: missing hash'); - } elseif (strlen($PHPTHUMB_CONFIG['high_security_password']) < 5) { - $phpThumb->ErrorImage('ERROR: strlen($PHPTHUMB_CONFIG[high_security_password]) < 5'); - } elseif($_GET['hash'] != $hash) { + } elseif (PasswordStrength($PHPTHUMB_CONFIG['high_security_password']) < 20) { + $phpThumb->config_disable_debug = false; // otherwise error message won't print + $phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough'); + } elseif ($_GET['hash'] != md5(str_replace('&hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$PHPTHUMB_CONFIG['high_security_password'])) { + sleep(10); // deliberate delay to discourage password-guessing + $phpThumb->config_disable_debug = false; // otherwise error message won't print $phpThumb->ErrorImage('ERROR: invalid hash'); } } @@ -102,27 +190,33 @@ //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[0]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '0') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '0')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// // returned the fixed string if the evil "magic_quotes_gpc" setting is on if (get_magic_quotes_gpc()) { - $RequestVarsToStripSlashes = array('src', 'wmf', 'file', 'err', 'goto', 'down'); + // deprecated: 'err', 'file', 'goto', + $RequestVarsToStripSlashes = array('src', 'wmf', 'down'); foreach ($RequestVarsToStripSlashes as $key) { if (isset($_GET[$key])) { + if (is_string($_GET[$key])) { $_GET[$key] = stripslashes($_GET[$key]); + } else { + unset($_GET[$key]); + } } } } -if (!@$_SERVER['PATH_INFO'] && !@$_SERVER['QUERY_STRING']) { - $phpThumb->ErrorImage('phpThumb() v'.$phpThumb->phpthumb_version.'
    http://phpthumb.sourceforge.net

    ERROR: no parameters specified'); +if (empty($_SERVER['PATH_INFO']) && empty($_SERVER['QUERY_STRING'])) { + $phpThumb->config_disable_debug = false; // otherwise error message won't print + $phpThumb->ErrorImage('ERROR: no parameters specified'); } if (@$_GET['src'] && isset($_GET['md5s']) && empty($_GET['md5s'])) { - if (eregi('^(f|ht)tps?://', $_GET['src'])) { + if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) { if ($rawImageData = phpthumb_functions::SafeURLread($_GET['src'], $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) { $md5s = md5($rawImageData); } @@ -145,7 +239,7 @@ foreach ($PHPTHUMB_CONFIG as $key => $value) { $keyname = 'config_'.$key; $phpThumb->setParameter($keyname, $value); - if (!eregi('password', $key)) { + if (!preg_match('#(password|mysql)#i', $key)) { $phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__); } } @@ -153,24 +247,24 @@ $phpThumb->DebugMessage('$PHPTHUMB_CONFIG is empty', __FILE__, __LINE__); } -if (@$_GET['src'] && !@$PHPTHUMB_CONFIG['allow_local_http_src'] && eregi('^http://'.@$_SERVER['HTTP_HOST'].'(.+)', @$_GET['src'], $matches)) { +if (@$_GET['src'] && !@$PHPTHUMB_CONFIG['allow_local_http_src'] && preg_match('#^http://'.@$_SERVER['HTTP_HOST'].'(.+)#i', @$_GET['src'], $matches)) { $phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php'); } //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[1]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '1') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '1')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// -$parsed_url_referer = parse_url(@$_SERVER['HTTP_REFERER']); +$parsed_url_referer = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']); if ($phpThumb->config_nooffsitelink_require_refer && !in_array(@$parsed_url_referer['host'], $phpThumb->config_nohotlink_valid_domains)) { $phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists')); } -$parsed_url_src = parse_url(@$_GET['src']); -if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image && eregi('^(f|ht)tps?://', @$_GET['src']) && !in_array(@$parsed_url_src['host'], $phpThumb->config_nohotlink_valid_domains)) { +$parsed_url_src = phpthumb_functions::ParseURLbetter(@$_GET['src']); +if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image && preg_match('#^(f|ht)tps?://#i', @$_GET['src']) && !in_array(@$parsed_url_src['host'], $phpThumb->config_nohotlink_valid_domains)) { $phpThumb->ErrorImage($phpThumb->config_nohotlink_text_message); } @@ -207,29 +301,27 @@ //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[2]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '2') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '2')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// -if (@$PHPTHUMB_CONFIG['cache_default_only_suffix'] && (strpos($PHPTHUMB_CONFIG['cache_default_only_suffix'], '*') !== false)) { - $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = true; -} -// deprecated: 'err', 'file', 'goto', -$allowedGETparameters = array('src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'bgt', 'fltr', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down', 'phpThumbDebug', 'hash', 'md5s', 'sfn', 'dpi', 'sia'); +$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = (bool) (@$PHPTHUMB_CONFIG['cache_default_only_suffix'] && (strpos($PHPTHUMB_CONFIG['cache_default_only_suffix'], '*') !== false)); + if (!empty($PHPTHUMB_DEFAULTS) && is_array($PHPTHUMB_DEFAULTS)) { $phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS['.implode(';', array_keys($PHPTHUMB_DEFAULTS)).']', __FILE__, __LINE__); foreach ($PHPTHUMB_DEFAULTS as $key => $value) { if ($PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE || !isset($_GET[$key])) { $_GET[$key] = $value; $phpThumb->DebugMessage('PHPTHUMB_DEFAULTS assigning ('.$value.') to $_GET['.$key.']', __FILE__, __LINE__); - //$phpThumb->DebugMessage('PHPTHUMB_DEFAULTS.setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__); - //$phpThumb->setParameter($key, $value); } } } + +// deprecated: 'err', 'file', 'goto', +$allowedGETparameters = array('src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'bgt', 'fltr', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down', 'phpThumbDebug', 'hash', 'md5s', 'sfn', 'dpi', 'sia', 'nocache'); foreach ($_GET as $key => $value) { - if (@$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS && ($key != 'src')) { + if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ($key != 'src')) { // disabled, do not set parameter $phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__); } elseif (in_array($key, $allowedGETparameters)) { @@ -243,37 +335,38 @@ //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[3]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '3') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '3')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// -//if (!@$_GET['phpThumbDebug'] && !$phpThumb->sourceFilename && !function_exists('ImageJPEG') && !function_exists('ImagePNG') && !function_exists('ImageGIF')) { -if (!@$_GET['phpThumbDebug'] && !is_file($phpThumb->sourceFilename) && !phpthumb_functions::gd_version()) { - if (!headers_sent()) { - // base64-encoded error image in GIF format - $ERROR_NOGD = 'R0lGODlhIAAgALMAAAAAABQUFCQkJDY2NkZGRldXV2ZmZnJycoaGhpSUlKWlpbe3t8XFxdXV1eTk5P7+/iwAAAAAIAAgAAAE/vDJSau9WILtTAACUinDNijZtAHfCojS4W5H+qxD8xibIDE9h0OwWaRWDIljJSkUJYsN4bihMB8th3IToAKs1VtYM75cyV8sZ8vygtOE5yMKmGbO4jRdICQCjHdlZzwzNW4qZSQmKDaNjhUMBX4BBAlmMywFSRWEmAI6b5gAlhNxokGhooAIK5o/pi9vEw4Lfj4OLTAUpj6IabMtCwlSFw0DCKBoFqwAB04AjI54PyZ+yY3TD0ss2YcVmN/gvpcu4TOyFivWqYJlbAHPpOntvxNAACcmGHjZzAZqzSzcq5fNjxFmAFw9iFRunD1epU6tsIPmFCAJnWYE0FURk7wJDA0MTKpEzoWAAskiAAA7'; - header('Content-Type: image/gif'); - echo base64_decode($ERROR_NOGD); - } else { - echo '*** ERROR: No PHP-GD support available ***'; - } - exit; -} +//if (!@$_GET['phpThumbDebug'] && !is_file($phpThumb->sourceFilename) && !phpthumb_functions::gd_version()) { +// if (!headers_sent()) { +// // base64-encoded error image in GIF format +// $ERROR_NOGD = 'R0lGODlhIAAgALMAAAAAABQUFCQkJDY2NkZGRldXV2ZmZnJycoaGhpSUlKWlpbe3t8XFxdXV1eTk5P7+/iwAAAAAIAAgAAAE/vDJSau9WILtTAACUinDNijZtAHfCojS4W5H+qxD8xibIDE9h0OwWaRWDIljJSkUJYsN4bihMB8th3IToAKs1VtYM75cyV8sZ8vygtOE5yMKmGbO4jRdICQCjHdlZzwzNW4qZSQmKDaNjhUMBX4BBAlmMywFSRWEmAI6b5gAlhNxokGhooAIK5o/pi9vEw4Lfj4OLTAUpj6IabMtCwlSFw0DCKBoFqwAB04AjI54PyZ+yY3TD0ss2YcVmN/gvpcu4TOyFivWqYJlbAHPpOntvxNAACcmGHjZzAZqzSzcq5fNjxFmAFw9iFRunD1epU6tsIPmFCAJnWYE0FURk7wJDA0MTKpEzoWAAskiAAA7'; +// header('Content-Type: image/gif'); +// echo base64_decode($ERROR_NOGD); +// } else { +// echo '*** ERROR: No PHP-GD support available ***'; +// } +// exit; +//} // check to see if file can be output from source with no processing or caching $CanPassThroughDirectly = true; if ($phpThumb->rawImageData) { // data from SQL, should be fine -} elseif (eregi('^(f|ht)tp\://', $phpThumb->src)) { - $phpThumb->DebugMessage('$CanPassThroughDirectly=false because eregi("^(f|ht)tp\://", '.$phpThumb->src.')', __FILE__, __LINE__); - $CanPassThroughDirectly = false; -} elseif (!@is_file($phpThumb->sourceFilename)) { - $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__); +} elseif (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) { + // assume is ok to passthru if no other parameters specified +} elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) { + $phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", '.$phpThumb->src.')', __FILE__, __LINE__); $CanPassThroughDirectly = false; } elseif (!@is_readable($phpThumb->sourceFilename)) { $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__); $CanPassThroughDirectly = false; +} elseif (!@is_file($phpThumb->sourceFilename)) { + $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__); + $CanPassThroughDirectly = false; } foreach ($_GET as $key => $value) { switch ($key) { @@ -284,6 +377,10 @@ case 'w': case 'h': // might be OK if exactly matches original + if (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) { + // assume it is not ok for direct-passthru of remote image + $CanPassThroughDirectly = false; + } break; case 'phpThumbDebug': @@ -305,27 +402,21 @@ //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[4]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '4') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '4')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// -function SendSaveAsFileHeaderIfNeeded() { - if (headers_sent()) { - return false; - } - global $phpThumb; - $downloadfilename = phpthumb_functions::SanitizeFilename(@$_GET['sia'] ? $_GET['sia'] : (@$_GET['down'] ? $_GET['down'] : 'phpThumb_generated_thumbnail'.(@$_GET['f'] ? $_GET['f'] : 'jpg'))); - if (@$downloadfilename) { - $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__); - header('Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"'); - } - return true; -} - $phpThumb->DebugMessage('$CanPassThroughDirectly="'.intval($CanPassThroughDirectly).'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__); while ($CanPassThroughDirectly && $phpThumb->src) { // no parameters set, passthru + + if (preg_match('#^http\://[^\\?&]+\.(jpe?g|gif|png)$#i', $phpThumb->src)) { + $phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__); + header('Location: '.$phpThumb->src); + exit; + } + $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($phpThumb->src); // security and size checks @@ -396,72 +487,14 @@ function SendSaveAsFileHeaderIfNeeded() { //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[5]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '5') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '5')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// -function RedirectToCachedFile() { - global $phpThumb, $PHPTHUMB_CONFIG; - - $nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename); - $nice_docroot = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($PHPTHUMB_CONFIG['document_root'], '/\\')); - - $parsed_url = @parse_url(@$_SERVER['HTTP_REFERER']); - - $nModified = filemtime($phpThumb->cache_filename); - - if ($phpThumb->config_nooffsitelink_enabled && @$_SERVER['HTTP_REFERER'] && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) { - - $phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__); - - } elseif ($phpThumb->phpThumbDebug) { - - $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__); - $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__); - $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__); - if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) { - $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__); - } - if (ereg('^'.preg_quote($nice_docroot).'(.*)$', $nice_cachefile, $matches)) { - $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__); - } else { - $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__); - } - - } else { - - if (headers_sent()) { - $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')'); - exit; - } - SendSaveAsFileHeaderIfNeeded(); - - header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT'); - if (@$_SERVER['HTTP_IF_MODIFIED_SINCE'] && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && @$_SERVER['SERVER_PROTOCOL']) { - header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified'); - exit; - } - - if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) { - header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2])); - } elseif (eregi('\.ico$', $phpThumb->cache_filename)) { - header('Content-Type: image/x-icon'); - } - if (!@$PHPTHUMB_CONFIG['cache_force_passthru'] && ereg('^'.preg_quote($nice_docroot).'(.*)$', $nice_cachefile, $matches)) { - header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1]))); - } else { - @readfile($phpThumb->cache_filename); - } - exit; - - } - return true; -} - // check to see if file already exists in cache, and output it with no processing if it does $phpThumb->SetCacheFilename(); -if (@is_file($phpThumb->cache_filename)) { +if (@is_readable($phpThumb->cache_filename)) { RedirectToCachedFile(); } else { $phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__); @@ -470,7 +503,7 @@ function RedirectToCachedFile() { //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[6]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '6') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '6')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// @@ -479,7 +512,7 @@ function RedirectToCachedFile() { // great -} elseif (@$_GET['new']) { +} elseif (!empty($_GET['new'])) { // generate a blank image resource of the specified size/background color/opacity if (($phpThumb->w <= 0) || ($phpThumb->h <= 0)) { @@ -507,13 +540,20 @@ function RedirectToCachedFile() { $phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details'); -} elseif (eregi('^(f|ht)tp\://', $phpThumb->src)) { +} elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) { + $phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__); if ($phpThumb->config_http_user_agent) { + $phpThumb->DebugMessage('Setting "user_agent" to "'.$phpThumb->config_http_user_agent.'"', __FILE__, __LINE__); ini_set('user_agent', $phpThumb->config_http_user_agent); } - - if ($rawImageData = phpthumb_functions::SafeURLread(phpthumb_functions::CleanUpURLencoding($phpThumb->src), $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) { + $cleanedupurl = phpthumb_functions::CleanUpURLencoding($phpThumb->src); + $phpThumb->DebugMessage('CleanUpURLencoding('.$phpThumb->src.') returned "'.$cleanedupurl.'"', __FILE__, __LINE__); + $phpThumb->src = $cleanedupurl; + unset($cleanedupurl); + if ($rawImageData = phpthumb_functions::SafeURLread($phpThumb->src, $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) { + $phpThumb->DebugMessage('SafeURLread('.$phpThumb->src.') succeeded'.($error ? ' with messsages: "'.$error.'"' : ''), __FILE__, __LINE__); + $phpThumb->DebugMessage('Setting source data from URL "'.$phpThumb->src.'"', __FILE__, __LINE__); $phpThumb->setSourceData($rawImageData, urlencode($phpThumb->src)); } else { $phpThumb->ErrorImage($error); @@ -523,7 +563,7 @@ function RedirectToCachedFile() { //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[7]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '7') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '7')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// @@ -533,28 +573,19 @@ function RedirectToCachedFile() { //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[8]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '8') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '8')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// -if ($phpThumb->config_allow_parameter_file && $phpThumb->file) { - - $phpThumb->RenderToFile($phpThumb->ResolveFilenameToAbsolute($phpThumb->file)); - if ($phpThumb->config_allow_parameter_goto && $phpThumb->goto && eregi('^(f|ht)tps?://', $phpThumb->goto)) { - // redirect to another URL after image has been rendered to file - header('Location: '.$phpThumb->goto); - exit; - } - -} elseif (@$PHPTHUMB_CONFIG['high_security_enabled'] && @$_GET['nocache']) { +if (!empty($PHPTHUMB_CONFIG['high_security_enabled']) && !empty($_GET['nocache'])) { // cache disabled, don't write cachefile } else { phpthumb_functions::EnsureDirectoryExists(dirname($phpThumb->cache_filename)); - if ((file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename)) || is_writable(dirname($phpThumb->cache_filename))) { + if (is_writable(dirname($phpThumb->cache_filename)) || (file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename))) { $phpThumb->CleanUpCacheDirectory(); if ($phpThumb->RenderToFile($phpThumb->cache_filename) && is_readable($phpThumb->cache_filename)) { @@ -575,7 +606,7 @@ function RedirectToCachedFile() { //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[9]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '9') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '9')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// @@ -587,7 +618,7 @@ function RedirectToCachedFile() { //////////////////////////////////////////////////////////////// // Debug output, to try and help me diagnose problems $phpThumb->DebugTimingMessage('phpThumbDebug[10]', __FILE__, __LINE__); -if (@$_GET['phpThumbDebug'] == '10') { +if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '10')) { $phpThumb->phpThumbDebug(); } //////////////////////////////////////////////////////////////// diff --git a/assets/snippets/phpthumb/phpthumb.bmp.php b/assets/snippets/phpthumb/phpthumb.bmp.php index d46ed13f9a..0496622159 100644 --- a/assets/snippets/phpthumb/phpthumb.bmp.php +++ b/assets/snippets/phpthumb/phpthumb.bmp.php @@ -734,7 +734,9 @@ function PlotPixelsGD(&$BMPdata, $truecolor=true) { } foreach ($BMPdata['data'] as $row => $colarray) { - @set_time_limit(30); + if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) { + set_time_limit(30); + } foreach ($colarray as $col => $color) { list($red, $green, $blue) = $this->IntColor2RGB($color); if ($truecolor) { @@ -754,7 +756,9 @@ function PlotBMP(&$BMPinfo) { echo 'ERROR: no pixel data
    '; return false; } + if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) { set_time_limit(intval(round($BMPinfo['resolution_x'] * $BMPinfo['resolution_y'] / 10000))); + } $im = $this->PlotPixelsGD($BMPinfo['bmp']); if (headers_sent()) { echo 'plotted '.($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']).' pixels in '.(time() - $starttime).' seconds
    '; diff --git a/assets/snippets/phpthumb/phpthumb.class.php b/assets/snippets/phpthumb/phpthumb.class.php index a6dd3342de..84d5d6cb1c 100644 --- a/assets/snippets/phpthumb/phpthumb.class.php +++ b/assets/snippets/phpthumb/phpthumb.class.php @@ -4059,7 +4059,7 @@ function ImageResizeFunction(&$dst_im, &$src_im, $dstX, $dstY, $srcX, $srcY, $ds if (phpthumb_functions::gd_version() >= 2.0) { if ($this->config_disable_imagecopyresampled) { return phpthumb_functions::ImageCopyResampleBicubic($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); - } + } return ImageCopyResampled($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); } return ImageCopyResized($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH); diff --git a/assets/snippets/phpthumb/phpthumb.gif.php b/assets/snippets/phpthumb/phpthumb.gif.php index b5a7fb1d9e..ac2d4aabeb 100644 --- a/assets/snippets/phpthumb/phpthumb.gif.php +++ b/assets/snippets/phpthumb/phpthumb.gif.php @@ -37,7 +37,10 @@ function gif_loadFileToGDimageResource($gifFilename, $bgColor = -1) { if ($gif = gif_loadFile($gifFilename)) { - @set_time_limit(300); + if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) { + // shouldn't take nearly this long + set_time_limit(120); + } // general strategy: convert raw data to PNG then convert PNG data to GD image resource $PNGdata = $gif->getPng($bgColor); if ($img = @ImageCreateFromString($PNGdata)) { @@ -1093,7 +1096,9 @@ function getGD_PixelPlotterVersion() $data = $this->m_img->m_data; $nPxl = ($this->m_gfh->m_nHeight - 1) * $this->m_gfh->m_nWidth; for ($y = 0; $y < $this->m_gfh->m_nHeight; $y++) { + if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) { set_time_limit(30); + } for ($x = 0; $x < $this->m_gfh->m_nWidth; $x++, $nPxl++) { if ( ($x >= $this->m_img->m_gih->m_nLeft) && diff --git a/assets/snippets/phpthumb/phpthumb.unsharp.php b/assets/snippets/phpthumb/phpthumb.unsharp.php index ff32838b07..283f3122ee 100644 --- a/assets/snippets/phpthumb/phpthumb.unsharp.php +++ b/assets/snippets/phpthumb/phpthumb.unsharp.php @@ -1,24 +1,27 @@ // // for use in phpThumb() on 3 February 2003. // +// updated to v2.1.1 on 24 April 2011 // // // // phpThumb() is found at http://phpthumb.sourceforge.net /// ////////////////////////////////////////////////////////////// /* -WARNING! Due to a known bug in PHP 4.3.2 this script is not working well in this version. -The sharpened images get too dark. The bug is fixed in version 4.3.3. +New: +- In version 2.1 (February 26 2007) Tom Bishop has done some important speed enhancements. +- From version 2 (July 17 2006) the script uses the imageconvolution function in PHP + version >= 5.1, which improves the performance considerably. Unsharp masking is a traditional darkroom technique that has proven very suitable for digital imaging. The principle of unsharp masking is to create a blurred copy of the image @@ -45,105 +48,70 @@ function applyUnsharpMask(&$img, $amount, $radius, $threshold) { // imgcreatetruecolor. No url! $img must be a truecolor image. // Attempt to calibrate the parameters to Photoshop: - $amount = min($amount, 500); - $amount = $amount * 0.016; - if ($amount == 0) { - return true; - } - - $radius = min($radius, 50); - $radius = $radius * 2; - - $threshold = min($threshold, 255); - - $radius = abs(round($radius)); // Only integers make sense. + $amount = min($amount, 500) * 0.016; + $radius = abs(round(min(50, $radius) * 2)); // Only integers make sense. + $threshold = min(255, $threshold); if ($radius == 0) { return true; } - $w = ImageSX($img); $h = ImageSY($img); $imgCanvas = ImageCreateTrueColor($w, $h); - $imgCanvas2 = ImageCreateTrueColor($w, $h); - ImageCopy($imgCanvas, $img, 0, 0, 0, 0, $w, $h); - ImageCopy($imgCanvas2, $img, 0, 0, 0, 0, $w, $h); - - - $builtinFilterSucceeded = false; - if ($radius == 1) { - if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) { - if (ImageFilter($imgCanvas, IMG_FILTER_GAUSSIAN_BLUR) && ImageFilter($imgCanvas2, IMG_FILTER_GAUSSIAN_BLUR)) { - $builtinFilterSucceeded = true; - } - } - } - - if (!$builtinFilterSucceeded) { $imgBlur = ImageCreateTrueColor($w, $h); - $imgBlur2 = ImageCreateTrueColor($w, $h); - /////////////////////////// + // Gaussian blur matrix: // - // Gaussian blur matrix: // 1 2 1 // 2 4 2 // 1 2 1 // - /////////////////////////// + ////////////////////////////////////////////////// + + if (function_exists('imageconvolution')) { // PHP >= 5.1 + $matrix = array( + array(1, 2, 1), + array(2, 4, 2), + array(1, 2, 1) + ); + ImageCopy($imgBlur, $img, 0, 0, 0, 0, $w, $h); + ImageConvolution($imgBlur, $matrix, 16, 0); + + } else { // Move copies of the image around one pixel at the time and merge them with weight // according to the matrix. The same matrix is simply repeated for higher radii. for ($i = 0; $i < $radius; $i++) { - ImageCopy ($imgBlur, $imgCanvas, 0, 0, 1, 1, $w - 1, $h - 1); // up left - ImageCopyMerge($imgBlur, $imgCanvas, 1, 1, 0, 0, $w, $h, 50); // down right - ImageCopyMerge($imgBlur, $imgCanvas, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left - ImageCopyMerge($imgBlur, $imgCanvas, 1, 0, 0, 1, $w, $h - 1, 25); // up right - ImageCopyMerge($imgBlur, $imgCanvas, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left - ImageCopyMerge($imgBlur, $imgCanvas, 1, 0, 0, 0, $w, $h, 25); // right - ImageCopyMerge($imgBlur, $imgCanvas, 0, 0, 0, 1, $w, $h - 1, 20 ); // up - ImageCopyMerge($imgBlur, $imgCanvas, 0, 1, 0, 0, $w, $h, 16.666667); // down - ImageCopyMerge($imgBlur, $imgCanvas, 0, 0, 0, 0, $w, $h, 50); // center + ImageCopy( $imgBlur, $img, 0, 0, 1, 0, $w - 1, $h); // left + ImageCopyMerge($imgBlur, $img, 1, 0, 0, 0, $w , $h, 50); // right + ImageCopyMerge($imgBlur, $img, 0, 0, 0, 0, $w , $h, 50); // center ImageCopy ($imgCanvas, $imgBlur, 0, 0, 0, 0, $w, $h); - - // During the loop above the blurred copy darkens, possibly due to a roundoff - // error. Therefore the sharp picture has to go through the same loop to - // produce a similar image for comparison. This is not a good thing, as processing - // time increases heavily. - ImageCopy ($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 50); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 33.33333); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 25); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 33.33333); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 25); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 20 ); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 16.666667); - ImageCopyMerge($imgBlur2, $imgCanvas2, 0, 0, 0, 0, $w, $h, 50); - ImageCopy ($imgCanvas2, $imgBlur2, 0, 0, 0, 0, $w, $h); + ImageCopyMerge($imgBlur, $imgCanvas, 0, 0, 0, 1, $w , $h - 1, 33.33333); // up + ImageCopyMerge($imgBlur, $imgCanvas, 0, 1, 0, 0, $w , $h, 25); // down } - ImageDestroy($imgBlur); - ImageDestroy($imgBlur2); } + if ($threshold > 0){ // Calculate the difference between the blurred pixels and the original // and set the pixels - for ($x = 0; $x < $w; $x++) { // each row + for ($x = 0; $x < $w-1; $x++) { // each row for ($y = 0; $y < $h; $y++) { // each pixel - $rgbOrig = ImageColorAt($imgCanvas2, $x, $y); + $rgbOrig = ImageColorAt($img, $x, $y); $rOrig = (($rgbOrig >> 16) & 0xFF); $gOrig = (($rgbOrig >> 8) & 0xFF); $bOrig = ($rgbOrig & 0xFF); - $rgbBlur = ImageColorAt($imgCanvas, $x, $y); + $rgbBlur = ImageColorAt($imgBlur, $x, $y); + $rBlur = (($rgbBlur >> 16) & 0xFF); $gBlur = (($rgbBlur >> 8) & 0xFF); $bBlur = ($rgbBlur & 0xFF); // When the masked pixels differ less from the original // than the threshold specifies, they are set to their original value. - $rNew = (abs($rOrig - $rBlur) >= $threshold) ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig)) : $rOrig; - $gNew = (abs($gOrig - $gBlur) >= $threshold) ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig)) : $gOrig; - $bNew = (abs($bOrig - $bBlur) >= $threshold) ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig)) : $bOrig; + $rNew = ((abs($rOrig - $rBlur) >= $threshold) ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig)) : $rOrig); + $gNew = ((abs($gOrig - $gBlur) >= $threshold) ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig)) : $gOrig); + $bNew = ((abs($bOrig - $bBlur) >= $threshold) ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig)) : $bOrig); if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) { $pixCol = ImageColorAllocate($img, $rNew, $gNew, $bNew); @@ -151,12 +119,31 @@ function applyUnsharpMask(&$img, $amount, $radius, $threshold) { } } } + } else { + for ($x = 0; $x < $w; $x++) { // each row + for ($y = 0; $y < $h; $y++) { // each pixel + $rgbOrig = ImageColorAt($img, $x, $y); + $rOrig = (($rgbOrig >> 16) & 0xFF); + $gOrig = (($rgbOrig >> 8) & 0xFF); + $bOrig = ($rgbOrig & 0xFF); + + $rgbBlur = ImageColorAt($imgBlur, $x, $y); + + $rBlur = (($rgbBlur >> 16) & 0xFF); + $gBlur = (($rgbBlur >> 8) & 0xFF); + $bBlur = ($rgbBlur & 0xFF); + + $rNew = min(255, max(0, ($amount * ($rOrig - $rBlur)) + $rOrig)); + $gNew = min(255, max(0, ($amount * ($gOrig - $gBlur)) + $gOrig)); + $bNew = min(255, max(0, ($amount * ($bOrig - $bBlur)) + $bOrig)); + $rgbNew = ($rNew << 16) + ($gNew <<8) + $bNew; + ImageSetPixel($img, $x, $y, $rgbNew); + } + } + } ImageDestroy($imgCanvas); - ImageDestroy($imgCanvas2); - + ImageDestroy($imgBlur); return true; } - } - ?> \ No newline at end of file From a4b4ec9474f700f10895a6fb13c2803b018f895f Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:14:39 +0300 Subject: [PATCH 360/530] delete sample config in phpthumb --- .../phpthumb/phpThumb.config.php.default | 254 ------------------ 1 file changed, 254 deletions(-) delete mode 100644 assets/snippets/phpthumb/phpThumb.config.php.default diff --git a/assets/snippets/phpthumb/phpThumb.config.php.default b/assets/snippets/phpthumb/phpThumb.config.php.default deleted file mode 100644 index d710cdde94..0000000000 --- a/assets/snippets/phpthumb/phpThumb.config.php.default +++ /dev/null @@ -1,254 +0,0 @@ - // -// available at http://phpthumb.sourceforge.net /// -////////////////////////////////////////////////////////////// -/// // -// See: phpthumb.readme.txt for usage instructions // -// NOTE: THIS FILE HAS NO EFFECT IN OBJECT MODE! // -// THIS CONFIG FILE ONLY APPLIES TO phpThumb.php // -// /// -////////////////////////////////////////////////////////////// - -ob_start(); -if (!file_exists(dirname(__FILE__).'/phpthumb.functions.php') || !include_once(dirname(__FILE__).'/phpthumb.functions.php')) { - ob_end_flush(); - die('failed to include_once(phpthumb.functions.php) - realpath="'.realpath(dirname(__FILE__).'/phpthumb.functions.php').'"'); -} -ob_end_clean(); - -// START USER CONFIGURATION SECTION: - -// * DocumentRoot configuration -// phpThumb() depends on $_SERVER['DOCUMENT_ROOT'] to resolve path/filenames. This value is usually correct, -// but has been known to be broken on some servers. This value allows you to override the default value. -// Do not modify from the auto-detect default value unless you are having problems. -//$PHPTHUMB_CONFIG['document_root'] = '/home/httpd/httpdocs'; -//$PHPTHUMB_CONFIG['document_root'] = 'c:\\webroot\\example.com\\www'; -//$PHPTHUMB_CONFIG['document_root'] = $_SERVER['DOCUMENT_ROOT']; -//$PHPTHUMB_CONFIG['document_root'] = realpath((@$_SERVER['DOCUMENT_ROOT'] && file_exists(@$_SERVER['DOCUMENT_ROOT'].$_SERVER['PHP_SELF'])) ? $_SERVER['DOCUMENT_ROOT'] : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', realpath('.')))); -$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && preg_match('#^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))).'#', realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__)))); - -// * Cache directory configuration (choose only one of these - leave the other lines commented-out): -// Note: this directory must be writable (usually chmod 777 is neccesary) for caching to work. -// If the directory is not writable no error will be generated but caching will be disabled. -$PHPTHUMB_CONFIG['cache_directory'] = dirname(__FILE__).'/cache/'; // set the cache directory relative to the phpThumb() installation -//$PHPTHUMB_CONFIG['cache_directory'] = $PHPTHUMB_CONFIG['document_root'].'/phpthumb/cache/'; // set the cache directory to an absolute directory for all source images -//$PHPTHUMB_CONFIG['cache_directory'] = './cache/'; // set the cache directory relative to the source image - must start with '.' (will not work to cache URL- or database-sourced images, please use an absolute directory name) -//$PHPTHUMB_CONFIG['cache_directory'] = null; // disable thumbnail caching (not recommended) -//if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { -// $PHPTHUMB_CONFIG['cache_directory'] = dirname(__FILE__).'/cache/'; // set the cache directory to an absolute directory for all source images -//} else { -// $PHPTHUMB_CONFIG['cache_directory'] = '/tmp/persistent/phpthumb/cache/'; -//} - -$PHPTHUMB_CONFIG['cache_disable_warning'] = false; // If [cache_directory] is non-existant or not writable, and [cache_disable_warning] is false, an error image will be generated warning to either set the cache directory or disable the warning (to avoid people not knowing about the cache) - -$PHPTHUMB_CONFIG['cache_directory_depth'] = 4; // If this larger than zero, cache structure will be broken into a broad directory structure based on cache filename. For example "cache_src012345..." will be stored in "/0/01/012/0123/cache_src012345..." when (cache_directory_depth = 4) - - -// * Cache culling: phpThumb can automatically limit the contents of the cache directory -// based on last-access date and/or number of files and/or total filesize. - -//$PHPTHUMB_CONFIG['cache_maxage'] = null; // never delete cached thumbnails based on last-access time -$PHPTHUMB_CONFIG['cache_maxage'] = 86400 * 30; // delete cached thumbnails that haven't been accessed in more than [30 days] (value is maximum time since last access in seconds to avoid deletion) - -//$PHPTHUMB_CONFIG['cache_maxsize'] = null; // never delete cached thumbnails based on byte size of cache directory -$PHPTHUMB_CONFIG['cache_maxsize'] = 10 * 1024 * 1024; // delete least-recently-accessed cached thumbnails when more than [10MB] of cached files are present (value is maximum bytesize of all cached files) - -//$PHPTHUMB_CONFIG['cache_maxfiles'] = null; // never delete cached thumbnails based on number of cached files -$PHPTHUMB_CONFIG['cache_maxfiles'] = 200; // delete least-recently-accessed cached thumbnails when more than [200] cached files are present (value is maximum number of cached files to keep) - - -// * Source image cache configuration -$PHPTHUMB_CONFIG['cache_source_enabled'] = false; // if true, source images obtained via HTTP are cached to $PHPTHUMB_CONFIG['cache_source_directory'] -$PHPTHUMB_CONFIG['cache_source_directory'] = dirname(__FILE__).'/cache/source/'; // set the cache directory for unprocessed source images - -// * cache source modification date configuration -$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_local'] = false; // if true, local source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed -$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_remote'] = true; // if true, remote source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed. WARNING: cached performance MUCH slower if this is set to false. - - -// * Simplified cache filename configuration -// Instead of creating unique cache filenames for all parameter combinations, create "simple" cache files (eg: "pic_thumb.jpg") -// If cache_default_only_suffix is non-empty, GETstring parameters (except 'src') are ignored and only $PHPTHUMB_DEFAULTS -// parameters (set at the bottom of phpThumb.config.php) are used for processing. -// The '*' character MUST be used to represent the source image name -$PHPTHUMB_CONFIG['cache_default_only_suffix'] = ''; // cached in normal phpThumb manner -//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb'; // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc) -//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*'; // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc) - -$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain -//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server - -$PHPTHUMB_CONFIG['cache_force_passthru'] = true; // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead - - - -// * Temp directory configuration -// phpThumb() may need to create temp files. Usually the system temp dir is writable and can be used. -// Leave this value as NULL in most cases. If you get errors about "failed to open for writing" -// you should change this to a full pathname to a directory you do have write access to. -//$PHPTHUMB_CONFIG['temp_directory'] = null; // attempt to auto-detect -//$PHPTHUMB_CONFIG['temp_directory'] = '/tmp/persistent/phpthumb/cache/'; // set to absolute path -$PHPTHUMB_CONFIG['temp_directory'] = $PHPTHUMB_CONFIG['cache_directory']; // set to same as cache directory - - -// NOTE: "max_source_pixels" only affects GD-resized thumbnails. If you have ImageMagick -// installed it will bypass most of these limits -// maximum number of pixels in source image to attempt to process entire image in GD mode. -// If this is zero then no limit on source image dimensions. -// If this is nonzero then this is the maximum number of pixels the source image -// can have to be processed normally, otherwise the embedded EXIF thumbnail will -// be used (if available) or an "image too large" notice will be displayed. -// This is to be used for large source images (> 1600x1200) and low PHP memory -// limits. If PHP runs out of memory the script will usually just die with no output. -// To calculate this number, multiply the dimensions of the largest image -// you can process with your memory limitation (e.g. 1600 * 1200 = 1920000) -// As a general guideline, this number will be about 20% of your PHP memory -// configuration, so 8M = 1,677,722; 16M = 3,355,443; 32M = 6,710,886; etc. -if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=') && !defined('memory_get_usage') && !@ini_get('memory_limit')) { - // memory_get_usage() will only be defined if your PHP is compiled with the --enable-memory-limit configuration option. - $PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit -} else { - // calculate default max_source_pixels as 1/6 of memory limit configuration - $PHPTHUMB_CONFIG['max_source_pixels'] = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 / 6); - //$PHPTHUMB_CONFIG['max_source_pixels'] = 0; // no memory limit - //$PHPTHUMB_CONFIG['max_source_pixels'] = 1920000; // allow 1600x1200 images (2Mpx), no larger (about 12MB memory required) - //$PHPTHUMB_CONFIG['max_source_pixels'] = 2795000; // 16MB memory limit - //$PHPTHUMB_CONFIG['max_source_pixels'] = 3871488; // allow 2272x1704 images (4Mpx), no larger (about 24MB memory required) -} - - -// ImageMagick configuration -$PHPTHUMB_CONFIG['prefer_imagemagick'] = true; // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low. -$PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = true; // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info -if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { - // Windows: set absolute pathname - $PHPTHUMB_CONFIG['imagemagick_path'] = 'C:/ImageMagick/convert.exe'; -} else { - // *nix: set absolute pathname to "convert", or leave as null if "convert" is in the path (location detected with `which`) - //$PHPTHUMB_CONFIG['imagemagick_path'] = '/usr/local/bin/convert'; - $PHPTHUMB_CONFIG['imagemagick_path'] = null; -} - - - -// * Default output configuration: -$PHPTHUMB_CONFIG['output_format'] = 'jpeg'; // default output format ('jpeg', 'png' or 'gif') - thumbnail will be output in this format (if available in your version of GD or ImageMagick). This is only used if the "f" parameter is not specified, and if the thumbnail can't be output in the input format. -$PHPTHUMB_CONFIG['output_maxwidth'] = 0; // default maximum thumbnail width. If this is zero then default width is the width of the source image. This is always overridden by ?w=___ GETstring parameter -$PHPTHUMB_CONFIG['output_maxheight'] = 0; // default maximum thumbnail height. If this is zero then default height is the height of the source image. This is always overridden by ?h=___ GETstring parameter -$PHPTHUMB_CONFIG['output_interlace'] = true; // if true: interlaced output for GIF/PNG, progressive output for JPEG; if false: non-interlaced for GIF/PNG, baseline for JPEG. - -// * Error message configuration -$PHPTHUMB_CONFIG['error_image_width'] = 400; // default width for error images -$PHPTHUMB_CONFIG['error_image_height'] = 100; // default height for error images -$PHPTHUMB_CONFIG['error_message_image_default'] = ''; // Set this to the name of a generic error image (e.g. '/images/error.png') that you want displayed in place of any error message that may occur. This setting is overridden by the 'err' parameter, which does the same thing. -$PHPTHUMB_CONFIG['error_bgcolor'] = 'CCCCFF'; // background color of error message images -$PHPTHUMB_CONFIG['error_textcolor'] = 'FF0000'; // color of text in error messages -$PHPTHUMB_CONFIG['error_fontsize'] = 1; // size of text in error messages, from 1 (smallest) to 5 (largest) -$PHPTHUMB_CONFIG['error_die_on_error'] = true; // die with error message on any fatal error (recommended with standalone phpThumb.php) -$PHPTHUMB_CONFIG['error_silent_die_on_error'] = false; // simply die with no output of any kind on fatal errors (not recommended) -$PHPTHUMB_CONFIG['error_die_on_source_failure'] = true; // die with error message if source image cannot be processed by phpThumb() (usually because source image is corrupt in some way). If false the source image will be passed through unprocessed, if true (default) an error message will be displayed. - -// * Off-server Thumbnailing Configuration: -$PHPTHUMB_CONFIG['nohotlink_enabled'] = false; // If false will allow thumbnailing from any source domain -$PHPTHUMB_CONFIG['nohotlink_valid_domains'] = array(@$_SERVER['HTTP_HOST']); // This is the list of domains for which thumbnails are allowed to be created. Note: domain only, do not include port numbers. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format "www.example.com" -$PHPTHUMB_CONFIG['nohotlink_erase_image'] = true; // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail -$PHPTHUMB_CONFIG['nohotlink_text_message'] = 'Off-server thumbnailing is not allowed'; // text of error message - -// * Off-server Linking Configuration: -$PHPTHUMB_CONFIG['nooffsitelink_enabled'] = true; // If false will allow thumbnails to be linked to from any domain, if true only domains listed below in 'nooffsitelink_valid_domains' will be allowed. -$PHPTHUMB_CONFIG['nooffsitelink_valid_domains'] = array(@$_SERVER['HTTP_HOST']); // This is the list of domains for which thumbnails are allowed to be created. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format 'www.example.com' -$PHPTHUMB_CONFIG['nooffsitelink_require_refer'] = false; // If false will allow standalone calls to phpThumb(). If true then only requests with a $_SERVER['HTTP_REFERER'] value in 'nooffsitelink_valid_domains' are allowed. -$PHPTHUMB_CONFIG['nooffsitelink_erase_image'] = false; // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail -$PHPTHUMB_CONFIG['nooffsitelink_watermark_src'] = '/demo/images/watermark.png'; // webroot-relative image to overlay on hotlinked images -$PHPTHUMB_CONFIG['nooffsitelink_text_message'] = 'Image taken from '.@$_SERVER['HTTP_HOST']; // text of error message (used if [nooffsitelink_watermark_src] is not a valid image) - - -// * Border & Background default colors -$PHPTHUMB_CONFIG['border_hexcolor'] = '000000'; // Default border color - usual HTML-style hex color notation (overidden with 'bc' parameter) -$PHPTHUMB_CONFIG['background_hexcolor'] = 'FFFFFF'; // Default background color when thumbnail aspect ratio does not match fixed-dimension box - usual HTML-style hex color notation (overridden with 'bg' parameter) - -// * Watermark configuration -$PHPTHUMB_CONFIG['ttf_directory'] = dirname(__FILE__).'/fonts'; // Base directory for TTF font files -//$PHPTHUMB_CONFIG['ttf_directory'] = 'c:/windows/fonts'; - - -// * MySQL configuration -// You may want to pull data from a database rather than a physical file -// If so, modify the $PHPTHUMB_CONFIG['mysql_query'] line to suit your database structure -// Note: the data retrieved must be the actual binary data of the image, not a URL or filename - -$PHPTHUMB_CONFIG['mysql_query'] = ''; -//$PHPTHUMB_CONFIG['mysql_query'] = 'SELECT `picture` FROM `products` WHERE (`id` = \''.mysql_escape_string(@$_GET['id']).'\')'; - -// These 4 values must be modified if $PHPTHUMB_CONFIG['mysql_query'] is not empty, but may be ignored if $PHPTHUMB_CONFIG['mysql_query'] is blank. -$PHPTHUMB_CONFIG['mysql_hostname'] = 'localhost'; -$PHPTHUMB_CONFIG['mysql_username'] = ''; -$PHPTHUMB_CONFIG['mysql_password'] = ''; -$PHPTHUMB_CONFIG['mysql_database'] = ''; - - -// * Security configuration -$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs -$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password -$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled -$PHPTHUMB_CONFIG['allow_src_above_docroot'] = false; // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root -$PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true; // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation - - -// * HTTP UserAgent configuration -//$PHPTHUMB_CONFIG['http_user_agent'] = ''; // PHP default: none -//$PHPTHUMB_CONFIG['http_user_agent'] = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)'; // Windows XP, Internet Explorer -$PHPTHUMB_CONFIG['http_user_agent'] = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7'; // Windows XP, Firefox - - -// * Compatability settings -$PHPTHUMB_CONFIG['disable_pathinfo_parsing'] = false; // if true, $_SERVER[PATH_INFO] is not parsed. May be needed on some server configurations to allow normal behavior. -$PHPTHUMB_CONFIG['disable_imagecopyresampled'] = false; // if true, ImageCopyResampled is replaced with ImageCopyResampleBicubic. May be needed for buggy versions of PHP-GD. -$PHPTHUMB_CONFIG['disable_onlycreateable_passthru'] = true; // if true, any image that can be parsed by GetImageSize() can be passed through; if false, only images that can be converted to GD by ImageCreateFrom(JPEG|GIF|PNG) functions are allowed - - -// * HTTP remote file opening settings -$PHPTHUMB_CONFIG['http_fopen_timeout'] = 10; // timeout (in seconds) for fopen / curl / fsockopen -$PHPTHUMB_CONFIG['http_follow_redirect'] = true; // if true (default), follow "302 Found" redirects to new URL; if false, return error message - - -// * Speed optimizations configuration -$PHPTHUMB_CONFIG['use_exif_thumbnail_for_speed'] = false; // If true, and EXIF thumbnail is available, and is larger or equal to output image dimensions, use EXIF thumbnail rather than actual source image for generating thumbnail. Benefit is only speed, avoiding resizing large image. -$PHPTHUMB_CONFIG['allow_local_http_src'] = false; // If true, 'src' parameter can be "http:///path/image.ext" instead of just "/path/image.ext"; if false then display warning message to encourage more efficient local-filename calling. - -// END USER CONFIGURATION SECTION - -/////////////////////////////////////////////////////////////////////////////// - -// START DEFAULT PARAMETERS SECTION -// If any parameters are constant across ALL images, you can set them here - -$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE = true; // if true, any parameters in the URL will override the defaults set here; if false, any parameters set here cannot be overridden in the URL -$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = false; // if true, GETstring parameters will be ignored (except for 'src') and only below default parameters will be used; if false, both default and GETstring parameters will be used (depending on $PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE). Will be auto-set true if !empty($PHPTHUMB_CONFIG['cache_default_only_suffix']) - -//$PHPTHUMB_DEFAULTS['w'] = 200; -//$PHPTHUMB_DEFAULTS['fltr'] = array('blur|10'); -//$PHPTHUMB_DEFAULTS['q'] = 90; - - -// END DEFAULT PARAMETERS SECTION - - - -/////////////////////////////////////////////////////////////////////////////// -// Function for generating hashed calls to phpThumb if 'high_security_enabled' -// example: -// require_once($_SERVER['DOCUMENT_ROOT'].'/phpThumb/phpThumb.config.php'); -// echo ''; - -function phpThumbURL($ParameterString) { - global $PHPTHUMB_CONFIG; - return str_replace(@$PHPTHUMB_CONFIG['document_root'], '', dirname(__FILE__)).DIRECTORY_SEPARATOR.'phpThumb.php?'.$ParameterString.'&hash='.md5($ParameterString.@$PHPTHUMB_CONFIG['high_security_password']); -} - -/////////////////////////////////////////////////////////////////////////////// - -?> \ No newline at end of file From 43a0d681688770ed64d6dd9d39d5487332b651fc Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:20:31 +0300 Subject: [PATCH 361/530] fix MODX to MODX Evolution after install --- install/setup.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/setup.sql b/install/setup.sql index 5b384dd305..b2f5e9abaf 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -772,7 +772,7 @@ REPLACE INTO `{PREFIX}site_templates` # Default Site Documents -REPLACE INTO `{PREFIX}site_content` VALUES (1,'document','text/html','MODX CMS Install Success','Welcome to the MODX Content Management System','','minimal-base','',1,0,0,0,0,'','

    Install Successful!

    \r\n

    You have successfully installed MODX.

    \r\n\r\n

    Getting Help

    \r\n

    The MODX Community provides a great starting point to learn all things MODX, or you can also see some great learning resources (books, tutorials, blogs and screencasts).

    \r\n

    Welcome to MODX!

    \r\n',1,3,0,1,1,1,1130304721,1,1130304927,0,0,0,1130304721,1,'Base Install',0,0,0,0,0,0,0); +REPLACE INTO `{PREFIX}site_content` VALUES (1,'document','text/html','MODX CMS Install Success','Welcome to the MODX Content Management System','','minimal-base','',1,0,0,0,0,'','

    Install Successful!

    \r\n

    You have successfully installed MODX Evolution.

    \r\n\r\n

    Getting Help

    \r\n

    The MODX Community provides a great starting point to learn all things MODX Evolution, or you can also see some great learning resources (books, tutorials, blogs and screencasts).

    \r\n

    Welcome to MODX!

    \r\n',1,3,0,1,1,1,1130304721,1,1130304927,0,0,0,1130304721,1,'Base Install',0,0,0,0,0,0,0); REPLACE INTO `{PREFIX}manager_users` From de3bb70b847460965f38292f55f7020ce9717dde Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:23:50 +0300 Subject: [PATCH 362/530] some fix in russian lang --- manager/includes/lang/russian-UTF8.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/lang/russian-UTF8.inc.php b/manager/includes/lang/russian-UTF8.inc.php index 0ad3eb82ba..18c5e1fe37 100755 --- a/manager/includes/lang/russian-UTF8.inc.php +++ b/manager/includes/lang/russian-UTF8.inc.php @@ -91,7 +91,7 @@ $_lang["change_password_confirm"] = 'Подтвердить пароль'; $_lang["change_password_message"] = 'Введите новый пароль, затем введите его еще раз для подтверждения. Длина пароля должна составлять от 6 до 15 символов.'; $_lang["change_password_new"] = 'Новый пароль'; -$_lang["charset_message"] = 'Выберите кодировку страниц сайта. Помните, что MODX тестировался не на всех кодировках. Для большинства языков подходит кодировка ISO-8859-1.'; +$_lang["charset_message"] = 'Выберите кодировку страниц сайта. Помните, что MODX тестировался не на всех кодировках. Для большинства языков подходит кодировка UTF-8.'; $_lang["charset_title"] = 'Кодировка:'; $_lang["chunk"] = 'Чанк (HTML-элемент шаблона)'; $_lang["chunk_code"] = 'Код чанка (HTML)'; From f7058d4931402b5936d2e58bd2b5f3876fcc4466 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:32:49 +0300 Subject: [PATCH 363/530] fix tpl --- assets/templates/modxhost/modxhost.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/templates/modxhost/modxhost.tpl b/assets/templates/modxhost/modxhost.tpl index cc9b610245..40f0ee93f6 100755 --- a/assets/templates/modxhost/modxhost.tpl +++ b/assets/templates/modxhost/modxhost.tpl @@ -1 +1 @@ - [(site_name)] | [*pagetitle*]

    [*longtitle*]

    [*#content*]

    \ No newline at end of file + [(site_name)] | [*pagetitle*]

    [*longtitle*]

    [*#content*]

    \ No newline at end of file From fad2f3dae5f822bd616ee7627813ee6332e68468 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:35:47 +0300 Subject: [PATCH 364/530] small fix --- assets/snippets/breadcrumbs/snippet.breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/snippets/breadcrumbs/snippet.breadcrumbs.php b/assets/snippets/breadcrumbs/snippet.breadcrumbs.php index 0a2046d1dc..74660b2aef 100644 --- a/assets/snippets/breadcrumbs/snippet.breadcrumbs.php +++ b/assets/snippets/breadcrumbs/snippet.breadcrumbs.php @@ -4,7 +4,7 @@ ( isset($pathThruUnPub) ) ? $pathThruUnPub : $pathThruUnPub = 1; ( isset($respectHidemenu) ) ? (int)$respectHidemenu : $respectHidemenu = 1; ( isset($showCurrentCrumb) ) ? $showCurrentCrumb : $showCurrentCrumb = 1; -( $currentAsLink ) ? $currentAsLink : $currentAsLink = 0; +( isset($currentAsLink) ) ? $currentAsLink : $currentAsLink = 0; ( isset($linkTextField) ) ? $linkTextField : $linkTextField = 'menutitle,pagetitle,longtitle'; ( isset($linkDescField) ) ? $linkDescField : $linkDescField = 'description,longtitle,pagetitle,menutitle'; ( isset($showCrumbsAsLinks) ) ? $showCrumbsAsLinks : $showCrumbsAsLinks = 1; From c52fd00005fc171497c2f0183cfa4fa030105989 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:36:43 +0300 Subject: [PATCH 365/530] small fix --- .../snippets/firstchildredirect/snippet.firstchildredirect.php | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/snippets/firstchildredirect/snippet.firstchildredirect.php b/assets/snippets/firstchildredirect/snippet.firstchildredirect.php index f7c8e4e5a3..9cdff123a4 100644 --- a/assets/snippets/firstchildredirect/snippet.firstchildredirect.php +++ b/assets/snippets/firstchildredirect/snippet.firstchildredirect.php @@ -29,6 +29,5 @@ } else { $firstChildUrl= $modx->makeUrl($modx->config['site_start']); } -// return $modx->sendRedirect($firstChildUrl); return $modx->sendRedirect($firstChildUrl,0,'REDIRECT_HEADER','HTTP/1.1 301 Moved Permanently'); ?> \ No newline at end of file From f97cde6e0bf37bdc005def31c1a112f520ad7c8b Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 26 Aug 2013 18:42:18 +0300 Subject: [PATCH 366/530] fix floater in MODxRE --- manager/media/style/MODxRE/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/media/style/MODxRE/style.css b/manager/media/style/MODxRE/style.css index 6ae8cd447f..d11d2570a7 100644 --- a/manager/media/style/MODxRE/style.css +++ b/manager/media/style/MODxRE/style.css @@ -649,10 +649,10 @@ div.treeframebody { #floater { display: none; position: absolute; - width: 200px; + width: auto; padding:5px; top: 25px; - left: 4px; + left: 0px; background: #fff; border: 1px solid #ccc; z-index: 500; From b655f5f781fc4be3b89902ae36a62508aa24d195 Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 09:43:39 +0900 Subject: [PATCH 367/530] Fix - Backup manager --- manager/actions/bkmanager.static.php | 62 ++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/manager/actions/bkmanager.static.php b/manager/actions/bkmanager.static.php index e7444ab43e..2a3d62b346 100644 --- a/manager/actions/bkmanager.static.php +++ b/manager/actions/bkmanager.static.php @@ -63,7 +63,7 @@ $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); $dumper->setDBtables($tables); $dumper->setDroptables((isset($_POST['droptables']) ? true : false)); - $dumpfinished = $dumper->createDump('callBack'); + $dumpfinished = $dumper->createDump('dumpSql'); if($dumpfinished) { exit; @@ -84,7 +84,7 @@ mkdir(rtrim($modx->config['snapshot_path'],'/')); @chmod(rtrim($modx->config['snapshot_path'],'/'), 0777); } - if(!file_exists("{$modx->config['snapshot_path']}.htaccess")) + if(!is_file("{$modx->config['snapshot_path']}.htaccess")) { $htaccess = "order deny,allow\ndeny from all\n"; file_put_contents("{$modx->config['snapshot_path']}.htaccess",$htaccess); @@ -478,6 +478,7 @@ function createDump($callBack) { // Set line feed $lf = "\n"; + $tempfile_path = $modx->config['base_path'] . 'temp/backup/temp.php'; $result = $modx->db->query('SHOW TABLES'); $tables = $this->result2Array(0, $result); @@ -496,6 +497,8 @@ function createDump($callBack) { $output .= "# PHP Version: " . phpversion() . $lf; $output .= "# Database : `{$this->dbname}`{$lf}"; $output .= "#"; + file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX); + $output = ''; // Generate dumptext for the tables. if (isset($this->_dbtables) && count($this->_dbtables)) { @@ -510,6 +513,16 @@ function createDump($callBack) { continue; } } + if($callBack==='snapshot') + { + switch($tblval) + { + case $table_prefix.'event_log': + case $table_prefix.'manager_log': + continue 2; + } + if(!preg_match('@^'.$table_prefix.'@', $tblval)) continue; + } $output .= "{$lf}{$lf}# --------------------------------------------------------{$lf}{$lf}"; $output .= "#{$lf}# Table structure for table `{$tblval}`{$lf}"; $output .= "#{$lf}{$lf}"; @@ -532,14 +545,28 @@ function createDump($callBack) { $insertdump .= "'$value',"; } $output .= rtrim($insertdump,',') . ");"; + if(1048576 < strlen($output)) + { + file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX); + $output = ''; + } } - // invoke callback -- raymond - if ($callBack) { - if (!$callBack($output)) break; - $output = ''; - } + file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX); + $output = ''; } - return ($callBack) ? true: $output; + $output = file_get_contents($tempfile_path); + if(!empty($output)) unlink($tempfile_path); + + switch($callBack) + { + case 'dumpSql': + dumpSql($output); + break; + case 'snapshot': + snapshot($output); + break; + } + return true; } // Private function object2Array. @@ -585,19 +612,18 @@ function import_sql($source,$result_code='import_ok') { global $modx,$e; - $tbl_active_users = $modx->getFullTableName('active_users'); - $rs = $modx->db->select('*',$tbl_active_users,"action='27'"); + $rs = $modx->db->select('*','[+prefix+]active_users',"action='27'"); if(0 < $modx->db->getRecordCount($rs)) { - echo ''. - ''. - ''; + include_once "header.inc.php"; // start normal header + $e->setError(5, 'Resource is edit now by any user'); + $e->dumpError(); exit; } $settings = getSettings(); - $source = str_replace(array("\r\n","\n","\r"),"\n",$source); + if(strpos($source, "\r")!==false) $source = str_replace(array("\r\n","\n","\r"),"\n",$source); $sql_array = preg_split('@;[ \t]*\n@', $source); foreach($sql_array as $sql_entry) { @@ -624,11 +650,13 @@ function callBack(&$dumpstring) { $today = $modx->toDateFormat(time(),'dateOnly'); $today = str_replace('/', '-', $today); $today = strtolower($today); + $size = strlen($dumpstring); if(!headers_sent()) { header('Expires: 0'); header('Cache-Control: private'); header('Pragma: cache'); header('Content-type: application/download'); + header("Content-Length: {$size}"); header("Content-Disposition: attachment; filename={$today}_database_backup.sql"); } echo $dumpstring; @@ -645,8 +673,7 @@ function getSettings() { global $modx; - $tbl_system_settings = $modx->getFullTableName('system_settings'); - $rs = $modx->db->select('setting_name, setting_value',$tbl_system_settings); + $rs = $modx->db->select('setting_name, setting_value','[+prefix+]system_settings'); $settings = array(); while ($row = $modx->db->getRow($rs)) @@ -668,10 +695,9 @@ function restoreSettings($settings) { global $modx; - $tbl_system_settings = $modx->getFullTableName('system_settings'); foreach($settings as $k=>$v) { - $modx->db->update(array('setting_value'=>$v),$tbl_system_settings,"setting_name='{$k}'"); + $modx->db->update(array('setting_value'=>$v),'[+prefix+]system_settings',"setting_name='{$k}'"); } } From 7f025b855c2025cae3055c7ddfba33cbe727cde2 Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 09:43:54 +0900 Subject: [PATCH 368/530] Small fix --- manager/actions/eventlog.dynamic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/eventlog.dynamic.php b/manager/actions/eventlog.dynamic.php index f62c883d4b..432eb1ce6f 100644 --- a/manager/actions/eventlog.dynamic.php +++ b/manager/actions/eventlog.dynamic.php @@ -35,9 +35,9 @@ // context menu include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php"; $cm = new ContextMenu("cntxm", 150); -$cm->addItem($_lang['view_log'],"js:menuAction(1)","media/style/" . $manager_theme ."images/icons/save.png"); +$cm->addItem($_lang['view_log'],"js:menuAction(1)",$_style['icons_save']); $cm->addSeparator(); -$cm->addItem($_lang['delete'], "js:menuAction(2)","media/style/" . $manager_theme ."images/icons/delete.png",(!$modx->hasPermission('delete_eventlog') ? 1:0)); +$cm->addItem($_lang['delete'], "js:menuAction(2)",$_style['icons_delete'],(!$modx->hasPermission('delete_eventlog') ? 1:0)); echo $cm->render(); ?> From e7da9523b93f476003139459782c4867fa5ddfee Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 13:05:46 +0900 Subject: [PATCH 369/530] Missing jquery path --- assets/js/{jquery-1.4.4.min.js => jquery.min.js} | 0 assets/snippets/ajaxSearch/configs/default.config.php | 2 +- install/action.options.php | 4 ++-- install/assets/plugins/mgrmgr.tpl | 2 +- install/assets/plugins/qm.tpl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename assets/js/{jquery-1.4.4.min.js => jquery.min.js} (100%) diff --git a/assets/js/jquery-1.4.4.min.js b/assets/js/jquery.min.js similarity index 100% rename from assets/js/jquery-1.4.4.min.js rename to assets/js/jquery.min.js diff --git a/assets/snippets/ajaxSearch/configs/default.config.php b/assets/snippets/ajaxSearch/configs/default.config.php index 53394a92ec..c46755a286 100755 --- a/assets/snippets/ajaxSearch/configs/default.config.php +++ b/assets/snippets/ajaxSearch/configs/default.config.php @@ -75,7 +75,7 @@ $dcfg['addJscript'] = 1; $dcfg['jsMooTools'] = MODX_MANAGER_URL.'/media/script/mootools/mootools.js'; $dcfg['jsMooTools2'] = AS_SPATH . 'js/mootools2/mootools-1.2.4.js'; -$dcfg['jsJquery'] = 'assets/js/jquery-1.4.4.min.js'; +$dcfg['jsJquery'] = 'assets/js/jquery.min.js'; // For a global parameter initialisation use the following syntax $__param = 'value'; // To overwrite parameter snippet call use $param = 'value'; diff --git a/install/action.options.php b/install/action.options.php index 862090fa20..51054a661d 100644 --- a/install/action.options.php +++ b/install/action.options.php @@ -198,9 +198,9 @@

    - +

    [*longtitle*]

    [*#content*]

    \ No newline at end of file + [(site_name)] | [*pagetitle*]

    [*longtitle*]

    [*#content*]

    \ No newline at end of file From a542502f73b88eae3d467626e3daef2454ad295a Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 13:11:58 +0900 Subject: [PATCH 372/530] Refactor #10131 Update jQuery version (1.4.4 -> 1.8.3) http://tracker.modx.com/issues/10131 --- assets/js/jquery.min.js | 169 +--------------------------------------- 1 file changed, 2 insertions(+), 167 deletions(-) diff --git a/assets/js/jquery.min.js b/assets/js/jquery.min.js index 8f3ca2e2da..3883779527 100644 --- a/assets/js/jquery.min.js +++ b/assets/js/jquery.min.js @@ -1,167 +1,2 @@ -/*! - * jQuery JavaScript Library v1.4.4 - * http://jquery.com/ - * - * Copyright 2010, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2010, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Thu Nov 11 19:04:53 2010 -0500 - */ -(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h= -h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;kd)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La, -"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this, -e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a, -"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+ -a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/, -C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j, -s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this, -j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length}, -toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j=== --1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false; -if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload", -b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&& -!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&& -l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H
    a";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"), -k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false, -scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent= -false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom= -1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="
    ";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="
    t
    ";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display= -"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h= -c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando); -else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one"; -if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true}, -attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&& -b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0}; -c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem, -arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid= -d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+ -c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType=== -8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k=== -"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+ -d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired= -B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type=== -"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]=== -0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}}); -(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3]; -break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr, -q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h= -l;g.sort(w);if(h)for(var i=1;i0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n, -m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled=== -true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"=== -g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return in[3]-0},nth:function(g,i,n){return n[3]- -0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()=== -i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]]; -if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m, -g);else if(typeof g.length==="number")for(var p=g.length;n";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g); -n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&& -function(){var g=k,i=t.createElement("div");i.innerHTML="

    ";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F|| -p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g= -t.createElement("div");g.innerHTML="
    ";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition? -function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n0)for(var h=d;h0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h= -h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context): -c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a, -2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a, -b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&& -e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/\s]+\/)>/g,P={option:[1, -""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div
    ","
    "];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= -c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, -wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, -prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, -this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); -return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null; -else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1>");try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append", -prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument|| -b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]===""&&!x?r.childNodes:[];for(o=k.length- -1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script")))); -d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i, -jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true, -zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b), -h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b); -if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f= -d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left; -e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/)<[^<]*)*<\/script>/gi, -ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b=== -"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("
    ").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&& -!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})}, -getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html", -script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data|| -!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache= -false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset; -A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type", -b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&& -c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d|| -c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]= -encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess", -[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"), -e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}}); -if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show", -3),a,b,d);else{d=0;for(var e=this.length;d=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b, -d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a* -Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)} -var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true; -this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide|| -this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a= -c.timers,b=0;b-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a, -e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&& -c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase(); -c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+ -b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window); +/*! jQuery v1.8.3 jquery.com | jquery.org/license */ +(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write(""),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t
    a",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="
    t
    ",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="
    ",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;ti.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="
    ",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="

    ",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t0)for(i=r;i=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*\s*$/g,Nt={option:[1,""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X
    ","
    "]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]===""&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("
    ").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window); \ No newline at end of file From 77918bd2a7d361d03fbb20301cafd888994e6cac Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 13:13:57 +0900 Subject: [PATCH 373/530] Refactor #10131 Update jQuery version (1.4.4 -> 1.8.3) http://tracker.modx.com/issues/10131 --- install/assets/plugins/mgrmgr.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/plugins/mgrmgr.tpl b/install/assets/plugins/mgrmgr.tpl index d060d9c4a6..674fa37917 100644 --- a/install/assets/plugins/mgrmgr.tpl +++ b/install/assets/plugins/mgrmgr.tpl @@ -16,6 +16,6 @@ $js_default_url_local = $modx->config['site_url']. '/assets/js/jquery.min.js'; -$js_default_url_remote = 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'; +$js_default_url_remote = 'http://ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js'; $asset_path = $modx->config['base_path'] . 'assets/plugins/managermanager/mm.inc.php'; include($asset_path); From f41673041537ac559a7c0406a785ea816db4dedc Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 13:34:57 +0900 Subject: [PATCH 374/530] maybe typo --- manager/includes/lang/english.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/includes/lang/english.inc.php b/manager/includes/lang/english.inc.php index 3e0f12ae35..1f84d2f499 100755 --- a/manager/includes/lang/english.inc.php +++ b/manager/includes/lang/english.inc.php @@ -1191,7 +1191,7 @@ $_lang["setting_resource_tree_node_name_desc"] = 'Specify the Resource field to use when rendering the nodes in the Resource Tree. Defaults to pagetitle, although any Resource field can be used, such as menutitle, alias.'; $_lang['resource_opt_is_published'] = 'Published'; -$_lang["docid_incrmnt_method_title"] = 'Intsrement method Resource ID'; +$_lang["docid_incrmnt_method_title"] = 'Increment method Resource ID'; $_lang["docid_incrmnt_method_0"] = 'DB auto increment'; $_lang["docid_incrmnt_method_1"] = 'Minimum missed ID'; $_lang["docid_incrmnt_method_2"] = 'Maximal ID+1'; From f89de3cc2822fdf3c416f44d0f9102134a9d7970 Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 13:59:35 +0900 Subject: [PATCH 375/530] Fix - restore function --- manager/actions/bkmanager.static.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/bkmanager.static.php b/manager/actions/bkmanager.static.php index 2a3d62b346..793202a051 100644 --- a/manager/actions/bkmanager.static.php +++ b/manager/actions/bkmanager.static.php @@ -478,7 +478,7 @@ function createDump($callBack) { // Set line feed $lf = "\n"; - $tempfile_path = $modx->config['base_path'] . 'temp/backup/temp.php'; + $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php'; $result = $modx->db->query('SHOW TABLES'); $tables = $this->result2Array(0, $result); From c5f800e757cdcc9d4c8d0abda1f9a45f0b70f6fe Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 14:06:35 +0900 Subject: [PATCH 376/530] Fix - Backup manager --- manager/actions/bkmanager.static.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/bkmanager.static.php b/manager/actions/bkmanager.static.php index 793202a051..113c3d1788 100644 --- a/manager/actions/bkmanager.static.php +++ b/manager/actions/bkmanager.static.php @@ -91,7 +91,7 @@ } if(!is_writable(rtrim($modx->config['snapshot_path'],'/'))) { - echo parsePlaceholder($_lang["bkmgr_alert_mkdir"],$modx->config['snapshot_path']); + echo parsePlaceholder($_lang["bkmgr_alert_mkdir"],array('snapshot_path'=>$modx->config['snapshot_path'])); exit; } $escaped_table_prefix = str_replace('_', '\\_', $table_prefix); @@ -645,7 +645,7 @@ function import_sql($source,$result_code='import_ok') $_SESSION['result_msg'] = $result_code; } -function callBack(&$dumpstring) { +function dumpSql(&$dumpstring) { global $modx; $today = $modx->toDateFormat(time(),'dateOnly'); $today = str_replace('/', '-', $today); From 5b4d810551af2efd916deda8f4c276b7112d6a57 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Tue, 27 Aug 2013 08:15:57 +0300 Subject: [PATCH 377/530] fix setting html --- manager/actions/mutate_settings.dynamic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/mutate_settings.dynamic.php b/manager/actions/mutate_settings.dynamic.php index 6f4103aee7..dc69cf94b6 100644 --- a/manager/actions/mutate_settings.dynamic.php +++ b/manager/actions/mutate_settings.dynamic.php @@ -508,7 +508,7 @@ function confirmLangChange(el, lkey, elupd){
    - +
    /> From 13a6142dd6b626552c700dc11a7ba402467de03a Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Tue, 27 Aug 2013 08:16:43 +0300 Subject: [PATCH 378/530] fix setup default value --- install/setup.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install/setup.sql b/install/setup.sql index b2f5e9abaf..741597fa11 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -893,6 +893,7 @@ INSERT IGNORE INTO `{PREFIX}system_settings` ('denyZipDownload', '0'), ('denyExtensionRename', '0'), ('showHiddenFiles', '0'), +('docid_incrmnt_method', '0'), ('make_folders', '0'); From f776daabc4f22d554a62d1769a2f123f50049045 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Tue, 27 Aug 2013 08:22:19 +0300 Subject: [PATCH 379/530] fix modx manager path --- manager/includes/document.parser.class.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index aee0060f16..c7848ccaa8 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -111,14 +111,14 @@ function loadExtension($extname) { // PHPMailer case 'MODxMailer' : - include_once(MODX_BASE_PATH . 'manager/includes/extenders/modxmailer.class.inc.php'); + include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php'); $this->mail= new MODxMailer; if($this->mail) return true; else return false; break; case 'EXPORT_SITE' : - if(include_once(MODX_BASE_PATH . 'manager/includes/extenders/export.class.inc.php')) + if(include_once(MODX_MANAGER_PATH . 'includes/extenders/export.class.inc.php')) { $this->export= new EXPORT_SITE; return true; @@ -127,7 +127,7 @@ function loadExtension($extname) { break; case 'PHPCOMPAT' : if(is_object($this->phpcompat)) return; - include_once(MODX_BASE_PATH . 'manager/includes/extenders/phpcompat.class.inc.php'); + include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php'); $this->phpcompat = new PHPCOMPAT; break; From 959f1d4e1734ad95daa3b5eb15cd0599facfa772 Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 27 Aug 2013 14:43:38 +0900 Subject: [PATCH 380/530] Refactor #10132 QM - Update jQuery ColorBox plugin http://tracker.modx.com/issues/10132 --- assets/plugins/qm/css/colorbox.css | 90 ++++++++++-------- assets/plugins/qm/css/images/controls.png | Bin 1249 -> 2893 bytes .../qm/css/images/internet_explorer/Thumbs.db | Bin 5632 -> 0 bytes assets/plugins/qm/css/images/loading.gif | Bin 0 -> 9427 bytes assets/plugins/qm/css/style.css | 23 ++--- assets/plugins/qm/js/jquery.colorbox-min.js | 11 ++- 6 files changed, 70 insertions(+), 54 deletions(-) delete mode 100755 assets/plugins/qm/css/images/internet_explorer/Thumbs.db create mode 100644 assets/plugins/qm/css/images/loading.gif diff --git a/assets/plugins/qm/css/colorbox.css b/assets/plugins/qm/css/colorbox.css index 518e8d8773..1dedd90f11 100755 --- a/assets/plugins/qm/css/colorbox.css +++ b/assets/plugins/qm/css/colorbox.css @@ -1,57 +1,69 @@ /* - ColorBox Core Style - The following rules are the styles that are consistant between themes. - Avoid changing this area to maintain compatability with future versions of ColorBox. + Colorbox Core Style: + The following CSS is consistent between example themes and should not be altered. */ #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} #cboxOverlay{position:fixed; width:100%; height:100%;} #cboxMiddleLeft, #cboxBottomLeft{clear:left;} -#cboxContent{position:relative; overflow:hidden;} -#cboxLoadedContent{overflow:auto;} -#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;} +#cboxContent{position:relative;} +#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;} #cboxTitle{margin:0;} -#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;} +#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;} #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} +.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;} +.cboxIframe{width:100%; height:100%; display:block; border:0;} +#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;} /* - Example user style - The following rules are ordered and tabbed in a way that represents the - order/nesting of the generated HTML, so that the structure easier to understand. + User Style: + Change the following styles to modify the appearance of Colorbox. They are + ordered & tabbed in a way that represents the nesting of the generated HTML. */ -#cboxOverlay{background:#000;} -#colorbox{} - #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) -100px 0 no-repeat;} - #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) -129px 0 no-repeat;} - #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) -100px -29px no-repeat;} - #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) -129px -29px no-repeat;} +#cboxOverlay{background:url(images/overlay.png) repeat 0 0;} +#colorbox{outline:0;} + #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;} + #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;} + #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px -29px;} + #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px -29px;} #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;} #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;} #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;} #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;} - #cboxContent{background:#fff;} + #cboxContent{background:#fff; overflow:hidden;} + .cboxIframe{background:#fff;} + #cboxError{padding:50px; border:1px solid #ccc;} #cboxLoadedContent{margin-bottom:28px;} - #cboxTitle{position:absolute; bottom:3px; left:0; text-align:center; width:100%; color:#949494;} - #cboxCurrent{position:absolute; bottom:3px; left:58px; color:#949494;} - #cboxSlideshow{position:absolute; bottom:3px; right:30px; color:#0092ef;} - #cboxPrevious{position:absolute; bottom:0; left:0px; background:url(images/controls.png) -75px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxPrevious.hover{background-position:-75px -25px;} - #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) -50px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxNext.hover{background-position:-50px -25px;} - #cboxLoadingOverlay{background:url(images/loading_background.png) center center no-repeat;} - #cboxLoadingGraphic{background:url(images/ajax-loader.gif) center center no-repeat;} - #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) -25px 0px no-repeat; width:25px; height:25px; text-indent:-9999px;} - #cboxClose.hover{background-position:-25px -25px;} + #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;} + #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;} + #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;} + #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;} + + /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */ + #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; } + + /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */ + #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;} + + #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;} + #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;} + #cboxPrevious:hover{background-position:-75px -25px;} + #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;} + #cboxNext:hover{background-position:-50px -25px;} + #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;} + #cboxClose:hover{background-position:-25px -25px;} /* - The following fixes png-transparency for IE6. - It is also necessary for png-transparency in IE7 & IE8 to avoid 'black halos' with the fade transition - - Since this method does not support CSS background-positioning, it is incompatible with CSS sprites. - Colorbox preloads navigation hover classes to account for this. - - !! Important Note: AlphaImageLoader src paths are relative to the HTML document, - while regular CSS background images are relative to the CSS document. - - => Moved to qm.inc.php for friendly url compatibility + The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill + when an alpha filter (opacity change) is set on the element or ancestor element. This style is not applied to or needed in IE9. + See: http://jacklmoore.com/notes/ie-transparency-problems/ */ - +.cboxIE #cboxTopLeft, +.cboxIE #cboxTopCenter, +.cboxIE #cboxTopRight, +.cboxIE #cboxBottomLeft, +.cboxIE #cboxBottomCenter, +.cboxIE #cboxBottomRight, +.cboxIE #cboxMiddleLeft, +.cboxIE #cboxMiddleRight { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF); +} \ No newline at end of file diff --git a/assets/plugins/qm/css/images/controls.png b/assets/plugins/qm/css/images/controls.png index 9257176616c3e0a5c145e381a12ee15fa556dc8e..dcfd6fb9f178454613123d018bf742c8cc905df7 100755 GIT binary patch literal 2893 zcmV-T3$pZyP)_ZK9@9A5hhZ`zJ|^XJp&7A=Y=V7G`@Q^Xk=19M@a5{n88C2urGbw3uPN`H$U$)~*R zDGEm-Oe{b=fr%W&zPaoidK{8ZW&+R7$+5&?)ea32b3ErF@rofuL&nCyXl{)NO9?c& z5Ey{Uhey?FhDDCD(o(}6HC#(hR;g)@MC`aP{9?V42DhOydhL#M>}EP`9b!c^x2QOy zl`aYl$KiM$b82xQ48Xo-M;Wj`j>GZsIBd4V@8W?T$FAK`0i&1By^!d25J#Rod6E@u zbDTbNhJA*=q6g#0^7E;26cm-{cE&DUxDwEt*rWuKM!V(XG0kMn79Al8g`GaY*U zPcb))2!6aChtduaM~@zruKld;HR#w;N$y8w#t9g`ZwxUhn{_m)8#Zoa+qZAurc>{> z(wWnz+5gLzFK0#B%%h1{8*kO(fMDSfd4Xua^~Rw?s-Dsc2Nz>g(;?>JBav_nr;-X=cl`B@5o*7f)K+_H}g~MT0F|A*}o;F6q7%Lo@B8CTVXt+NF zIygA!sVh@M2)>X;L@*enBS#Li?QPq(QDb8x6IxweT}-pfk2lMK=KJZVpOOE+aN*y~ zGv?*xO$#5aa#U4SQ6LbIMO<218pEla=rF=z71DM1q~e#Z$y6*V)x$OE`dg$D@&v2^ zdhTetF+m_!JiO!Hy?fdAvSrJdC!8aB-QP-|L1gIBZ{4~zrsDZDv{4R-3xz`pO<7#J zYuB!6okXh~oTsLyhW1OX2g0G}pZ|gG4WPx52#y^)=9hj$OT$h*t#8A)SlTUBr$r=0T_cSXuSO zy)~b`5h~IUv47?7;DQ92Nwe^eJ3B>q-9K00<@A>-MNu32V zYQo~n9rcb;au{u<6XCGK4lD6%vg^x^bGm*Mf-h4-Yv35N%EONNn4i9N4U=f*8;hu1v z!A$Qb@Zbs9gNKJXgb>F@mEe!WC)#UwBC&}Rc6dl50V@-Nh>1tUju77`8A(Sl9;}vh zq_?-1m1J<(VTXq_6EHj?1Y;&42n0}GUT)Y^8cm*pXYxc2Gm{KX*x@0~1k5YlY(fw; z&o~ZitC1OD2m$&lBr$SQJ~Rxw$!MDV=bxbbqucEfSkNx%x5c{NDg8M_bM_ zvA%QaGM)dphkfRoQ$X`eAH>+jL!YkjKU8{yDOY=WDww&5LW zeZN!p8uU1<0#8sRL&P|T_ehZfJgum5inXGAE^YY63Oau3BI~KwH=UwShCgH9%`JX} zzUyB-ty832@2lj%NPq}^} z+|#`2ol*MrtIc%c+<$5JPoFi+p=Jke60{%?DhF;5*wKAU>hukKN*!9pZB1{_VO!7rad%iH0g+loSbYbo}EwSWks~=@dZ?vpDTa2_AATi zwb~bAyuDctggHOo=BK3V@fH>-b`M4)f=plRGzkVQls9y%Y#XRBepKX#q>*)(oPyd6V zrg(`>)HsxwU06V`{A9DLcoXILj(;^B+4tiZFK?3L8o3{i*pQOMCN?DmiQxeBR(&BX z(V9U^R$>#}bXuLzIEhX07r(Dt)2t$VsEg_(vl5$N6;?75g5W$_Fp@k)OT0#trx>wA zOS}f{Xd(B)v1@mH6apSge6b+STVQA{0V;iPpifQ+qPL36iKHVA*byXmzNyI2JCt23 zU_hA=1VX{oubKc*;gLJT2_-ghB6*5Uc3>jHZ7(`>bn+ynubSoSX?f2c!orING0TOC z0*tjn82m9HD~rIzcowiD=}408@Lo0R76GdXKr7yK!^^(;YiG5f^Lkl50doV!Y*4EZ4OogST zri6rqYJsRyQd08t_V@SqUU#9bt*zwf?~tLsnVFe+kFwX@=UG`+oh~W<+9? z#KpzEy}gQxinG4bHdTvkgR8Z*wRDQE#?IZ~l^To_n@2O}IT3~G6)PQMiWkECPLz3lbBk=|vuW1?-!1MPfMnI7-k<+5D4+u9dB zmBqs*!1`WX^^eNcMJr!PLIM#5ImikCM2QFtu!&5!*FQ47ix$41yk(NoRGKV31w{bT z00~7PN)uuam~M@5V_#6h?wu403Ltp{i3MyzMz?=r zx{Z9j{bnVTaFT4o&?6v~XF->~u+!yjSAg8%Bz7`BuBukl8fm*EyoWnQWFSLX6e6vze7N{Ty7V&(` z013w{f)568-|HJ)$j$ZN`bGpC*d|nVVfcw7FmAqrV&F{aP zAfRO!1jYNWFghE|S5dkD%AoieT(?fR;rE-8)x%mH;NNd-i>~#7T(|MH8c;e7fRb;Z z=p`-S6U_JKknc@PUwdjST0t|wU3eP$GGPzp{xmDGa{g7q0HG}46K;LARAd7PK&#{c z7+@1EeBD34Iq+@#7|bUe`nJ!1)AxU02`UT7WBL+4;r@Q+0V0A|Q;Qs)aP5nw_5!?)*?^0x3>g-<$cLB zU7pQm9~?h#Dm0rIMbY~a>mTSc<)`naIj|E?j~RHs_RrLpETh4iq_}Tp>-+wF8GOiX z37n}fnck7qjP)fy|G56er~EN0gXD+b*EB&nPhaxM_t*57RBMrsgTa8j?itWiave|{ z^nJW9nfd0t1p6WXoOf!pl;OSW(@yK~uB*MGk$ z1Cqb$OGamSAE1%7A6QeQ@CkJIzC}aPD>IDKD8L8Uwp zD8N$+>xvXU;oyBNH_mf>Un0zeaPz*KM@m^&i|`2-zbE+j|6b!y_Ir_OkE~-m00000 LNkvXXu0mjfA+dCQ diff --git a/assets/plugins/qm/css/images/internet_explorer/Thumbs.db b/assets/plugins/qm/css/images/internet_explorer/Thumbs.db deleted file mode 100755 index 97f96690214b991246433154316f208a0ee49a02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5632 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 diff --git a/assets/plugins/qm/css/images/loading.gif b/assets/plugins/qm/css/images/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..b4695d811d4f84ed693eff7b5e6b4d61a3e8c48d GIT binary patch literal 9427 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")}function p(a,b){b=b===m?n.width():n.height();return typeof a==="string"?Math.round(/%/.test(a)?b/100*parseInt(a,10):parseInt(a,10)):a}function U(b){return a.photo||/\.(gif|png|jpg|jpeg|bmp)(?:\?([^#]*))?(?:#(\.*))?$/i.test(b)}function cb(a){for(var c in a)if(b.isFunction(a[c])&&c.substring(0,2)!=="on")a[c]=a[c].call(l);a.rel=a.rel||l.rel||L;a.href=a.href||b(l).attr("href");a.title=a.title||l.title;return a}function w(c,a){a&&a.call(l);b.event.trigger(c)}function jb(){var b,e=i+"Slideshow_",c="click."+i,f,k;if(a.slideshow&&h[1]){f=function(){F.text(a.slideshowStop).unbind(c).bind(V,function(){if(g");c.open=e}a.each(function(){b.data(this,r,b.extend({},b.data(this,r)||gb,c));b(this).addClass(G)});d=c.open;if(b.isFunction(d))d=d.call(a);d&&db(a[0]);return a};d.init=function(){var l="hover",m="clear:left";n=b(ib);j=f().attr({id:r,"class":E?i+"IE":""});x=f("Overlay",X?"position:absolute":"").hide();A=f("Wrapper");s=f("Content").append(k=f(M,"width:0; height:0; overflow:hidden"),K=f("LoadingOverlay").add(f("LoadingGraphic")),Z=f("Title"),Y=f("Current"),I=f("Next"),H=f("Previous"),F=f("Slideshow").bind(fb,jb),ab=f("Close"));A.append(f().append(f("TopLeft"),bb=f("TopCenter"),f("TopRight")),f(c,m).append(T=f("MiddleLeft"),s,R=f("MiddleRight")),f(c,m).append(f("BottomLeft"),S=f("BottomCenter"),f("BottomRight"))).children().children().css({"float":"left"});J=f(c,"position:absolute; width:9999px; visibility:hidden; display:none");b("body").prepend(x,j.append(A,J));s.children().hover(function(){b(this).addClass(l)},function(){b(this).removeClass(l)}).addClass(l);B=bb.height()+S.height()+s.outerHeight(e)-s.height();C=T.width()+R.width()+s.outerWidth(e)-s.width();y=k.outerHeight(e);z=k.outerWidth(e);j.css({"padding-bottom":B,"padding-right":C}).hide();I.click(d.next);H.click(d.prev);ab.click(d.close);s.children().removeClass(l);b("."+G).live("click",function(a){if(!(a.button!==0&&typeof a.button!=="undefined"||a.ctrlKey||a.shiftKey||a.altKey)){a.preventDefault();db(this)}});x.click(function(){a.overlayClose&&d.close()});b(document).bind("keydown",function(b){if(u&&a.escKey&&b.keyCode===27){b.preventDefault();d.close()}if(u&&a.arrowKey&&!D&&h[1])if(b.keyCode===37&&(g||a.loop)){b.preventDefault();H.click()}else if(b.keyCode===39&&(g").children();a.h=b.height();b.replaceWith(b.children())}k.css({height:a.h});d.position(a.transition===t?0:a.speed)}};d.prep=function(m){var c="hidden";function l(s){var p,f,m,c,l=h.length,q=a.loop;d.position(s,function(){function s(){E&&j[0].style.removeAttribute("filter")}if(u){E&&o&&k.fadeIn(100);k.show();w(hb);Z.show().html(a.title);if(l>1){typeof a.current==="string"&&Y.html(a.current.replace(/\{current\}/,g+1).replace(/\{total\}/,l)).show();I[q||g")[0].src=c;if(U(f))b("")[0].src=f}}K.hide();a.transition==="fade"?j.fadeTo(e,1,function(){s()}):s();n.bind(v+i,function(){d.position(0)});w(V,a.onComplete)}})}if(u){var o,e=a.transition===t?0:a.speed;n.unbind(v+i);k.remove();k=f(M).html(m);k.hide().appendTo(J.show()).css({width:function(){a.w=a.w||k.width();a.w=a.mw&&a.mw")[0];c.name=i+ +new Date;c.src=a.href;if(!a.scrolling)c.scrolling="no";if(E)c.allowtransparency="true";b(c).appendTo(k).one(Q,function(){c.src="//about:blank"})});q(" ")}else if(a.html)q(a.html);else if(U(n)){c=new Image;c.onload=function(){var e;c.onload=null;c.id=i+"Photo";b(c).css({border:t,display:"block",cssFloat:"left"});if(a.scalePhotos){s=function(){c.height-=c.height*e;c.width-=c.width*e};if(a.mw&&c.width>a.mw){e=(c.width-a.mw)/c.width;s()}if(a.mh&&c.height>a.mh){e=(c.height-a.mh)/c.height;s()}}if(a.h)c.style.marginTop=Math.max(a.h-c.height,0)/2+"px";h[1]&&(gi?e+i:i}function l(t,e){return Math.round((/%/.test(t)?("x"===e?H.width():n())/100:1)*parseInt(t,10))}function h(t,e){return t.photo||t.photoRegex.test(e)}function s(t,e){return t.retinaUrl&&i.devicePixelRatio>1?e.replace(t.photoRegex,t.retinaSuffix):e}function a(t){"contains"in v[0]&&!v[0].contains(t.target)&&(t.stopPropagation(),v.focus())}function d(){var e,i=t.data(A,Z);null==i?(O=t.extend({},Y),console&&console.log&&console.log("Error: cboxElement missing settings object")):O=t.extend({},i);for(e in O)t.isFunction(O[e])&&"on"!==e.slice(0,2)&&(O[e]=O[e].call(A));O.rel=O.rel||A.rel||t(A).data("rel")||"nofollow",O.href=O.href||t(A).attr("href"),O.title=O.title||A.title,"string"==typeof O.href&&(O.href=t.trim(O.href))}function c(i,o){t(e).trigger(i),se.trigger(i),t.isFunction(o)&&o.call(A)}function u(){var t,e,i,o,n,r=te+"Slideshow_",l="click."+te;O.slideshow&&E[1]?(e=function(){clearTimeout(t)},i=function(){(O.loop||E[j+1])&&(t=setTimeout(J.next,O.slideshowSpeed))},o=function(){R.html(O.slideshowStop).unbind(l).one(l,n),se.bind(ne,i).bind(oe,e).bind(re,n),v.removeClass(r+"off").addClass(r+"on")},n=function(){e(),se.unbind(ne,i).unbind(oe,e).unbind(re,n),R.html(O.slideshowStart).unbind(l).one(l,function(){J.next(),o()}),v.removeClass(r+"on").addClass(r+"off")},O.slideshowAuto?o():n()):v.removeClass(r+"off "+r+"on")}function p(i){G||(A=i,d(),E=t(A),j=0,"nofollow"!==O.rel&&(E=t("."+ee).filter(function(){var e,i=t.data(this,Z);return i&&(e=t(this).data("rel")||i.rel||this.rel),e===O.rel}),j=E.index(A),-1===j&&(E=E.add(A),j=E.length-1)),g.css({opacity:parseFloat(O.opacity),cursor:O.overlayClose?"pointer":"auto",visibility:"visible"}).show(),V&&v.add(g).removeClass(V),O.className&&v.add(g).addClass(O.className),V=O.className,O.closeButton?P.html(O.close).appendTo(x):P.appendTo("
    "),$||($=q=!0,v.css({visibility:"hidden",display:"block"}),W=o(ae,"LoadedContent","width:0; height:0; overflow:hidden"),x.css({width:"",height:""}).append(W),_=b.height()+k.height()+x.outerHeight(!0)-x.height(),D=T.width()+C.width()+x.outerWidth(!0)-x.width(),N=W.outerHeight(!0),z=W.outerWidth(!0),O.w=l(O.initialWidth,"x"),O.h=l(O.initialHeight,"y"),J.position(),u(),c(ie,O.onOpen),B.add(S).hide(),v.focus(),O.trapFocus&&e.addEventListener&&(e.addEventListener("focus",a,!0),se.one(le,function(){e.removeEventListener("focus",a,!0)})),O.returnFocus&&se.one(le,function(){t(A).focus()})),w())}function f(){!v&&e.body&&(X=!1,H=t(i),v=o(ae).attr({id:Z,"class":t.support.opacity===!1?te+"IE":"",role:"dialog",tabindex:"-1"}).hide(),g=o(ae,"Overlay").hide(),L=t([o(ae,"LoadingOverlay")[0],o(ae,"LoadingGraphic")[0]]),y=o(ae,"Wrapper"),x=o(ae,"Content").append(S=o(ae,"Title"),M=o(ae,"Current"),K=t('
    + From 5a84e3affbc569d7c568dcbe605b026de441f63d Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 10:51:20 +0900 Subject: [PATCH 417/530] 1.0.11RC2 --- manager/includes/version.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manager/includes/version.inc.php b/manager/includes/version.inc.php index f53547359c..9a755719bd 100755 --- a/manager/includes/version.inc.php +++ b/manager/includes/version.inc.php @@ -1,5 +1,5 @@ Date: Mon, 2 Sep 2013 11:10:26 +0900 Subject: [PATCH 418/530] Fix - Install language --- install/lang/bulgarian.inc.php | 8 ++++---- install/lang/danish.inc.php | 8 ++++---- install/lang/finnish-utf8.inc.php | 8 ++++---- install/lang/francais-utf8.inc.php | 8 ++++---- install/lang/hebrew.inc.php | 8 ++++---- install/lang/japanese-utf8.inc.php | 10 +++++----- install/lang/norwegian.inc.php | 8 ++++---- install/lang/persian.inc.php | 8 ++++---- install/lang/polish-utf8.inc.php | 10 +++++----- install/lang/russian-UTF8.inc.php | 16 ++++++++-------- install/lang/spanish-utf8.inc.php | 8 ++++---- install/lang/svenska.inc.php | 8 ++++---- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/install/lang/bulgarian.inc.php b/install/lang/bulgarian.inc.php index 37fdf55772..f021797314 100644 --- a/install/lang/bulgarian.inc.php +++ b/install/lang/bulgarian.inc.php @@ -29,13 +29,13 @@ $_lang["btnclose_value"] = 'Затваряне'; $_lang["btnnext_value"] = 'Напред'; $_lang["cant_write_config_file"] = 'MODx не успя да запише конфигурационния файл. Моля, копирайте следното във файла '; -$_lang["cant_write_config_file_note"] = 'След като инсталацията завърши, можете да се логнете в Мениджъра на MODx, като напишете в браузера си YourSiteName.com/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'След като инсталацията завърши, можете да се логнете в Мениджъра на MODx, като напишете в браузера си YourSiteName.com/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'Опции:'; $_lang["checking_if_cache_exist"] = 'Проверка дали съществува директорията assets/cache : '; $_lang["checking_if_cache_file2_writable"] = 'Проверка дали може да се пише във файла assets/cache/sitePublishing.idx.php : '; $_lang["checking_if_cache_file_writable"] = 'Проверка дали може да се пише във файла assets/cache/siteCache.idx.php : '; $_lang["checking_if_cache_writable"] = 'Проверка дали в директорията assets/cache може да се пише: '; -$_lang["checking_if_config_exist_and_writable"] = 'Проверка дали '.MGR_DIR.'/includes/config.inc.php съществува и може да се пише в него: '; +$_lang["checking_if_config_exist_and_writable"] = 'Проверка дали [+MGR_DIR+]/includes/config.inc.php съществува и може да се пише в него: '; $_lang["checking_if_export_exists"] = 'Проверка дали съществува директорията assets/export : '; $_lang["checking_if_export_writable"] = 'Проверка дали в директорията assets/export може да се пише: '; $_lang["checking_if_images_exist"] = 'Проверка дали съществува директорията assets/images : '; @@ -48,7 +48,7 @@ $_lang["checking_sessions"] = 'Проверка дали сесиите са правилно конфигурирани: '; $_lang["checking_table_prefix"] = 'Проверка на префикса на таблицата `'; $_lang["chunks"] = 'Чънкове'; -$_lang["config_permissions_note"] = 'За нови Linux/Unix инсталации, моля, създайте празен файл с име config.inc.php в директорията '.MGR_DIR.'/includes/ и задайте права на файла 0666.'; +$_lang["config_permissions_note"] = 'За нови Linux/Unix инсталации, моля, създайте празен файл с име config.inc.php в директорията [+MGR_DIR+]/includes/ и задайте права на файла 0666.'; $_lang["connection_screen_collation"] = 'Колация:'; $_lang["connection_screen_connection_information"] = 'Информация за връзката'; $_lang["connection_screen_connection_method"] = 'Начин на свързване - метод:'; @@ -156,7 +156,7 @@ $_lang["table_prefix_not_exist"] = ' - Префиксът на таблицата не съществува в тази БД!'; $_lang["table_prefix_not_exist_note"] = 'Инсталаторът не може да инсталира в избраната БД, тъй като тя не съдържа таблици със зададения префикс, които да бъдат обновявени. Моля, изберете съществуващ префикс на таблица и стартирайте Инсталатора отново.'; $_lang["templates"] = 'Шаблони'; -$_lang["to_log_into_content_manager"] = 'За да се логнете в Мениджъра ('.MGR_DIR.'/index.php) кликнете на бутона `Затваряне` .'; +$_lang["to_log_into_content_manager"] = 'За да се логнете в Мениджъра ([+MGR_DIR+]/index.php) кликнете на бутона `Затваряне` .'; $_lang["toggle"] = 'Включване'; $_lang["unable_install_chunk"] = 'Не успя да инсталира Чънк. Файл'; $_lang["unable_install_module"] = 'Не успя да инсталира Модул. Файл'; diff --git a/install/lang/danish.inc.php b/install/lang/danish.inc.php index 44f127effc..36d582bc89 100644 --- a/install/lang/danish.inc.php +++ b/install/lang/danish.inc.php @@ -31,13 +31,13 @@ $_lang["btnclose_value"] = 'Luk'; $_lang["btnnext_value"] = 'Næste'; $_lang["cant_write_config_file"] = 'MODx kunne ikke gemme konfigurationsfilen. Du skal kopiere nedenstående ind i filen '; -$_lang["cant_write_config_file_note"] = 'Når dette er gjort, kan du logge ind i MODx på adressen http://Ditdomænenavn.dk/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'Når dette er gjort, kan du logge ind i MODx på adressen http://Ditdomænenavn.dk/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'Valgmuligheder:'; $_lang["checking_if_cache_exist"] = 'Kontrollerer om /assets/cache og /assets/cache/rss mapperne er oprettet: '; $_lang["checking_if_cache_file_writable"] = 'Kontrollerer om /assets/cache/siteCache.idx.php filen er skrivbar: '; $_lang["checking_if_cache_file2_writable"] = 'Kontrollerer om /assets/cache/sitePublishing.idx.php filen er skrivbar: '; $_lang["checking_if_cache_writable"] = 'Kontrollerer om /assets/cache og /assets/cache/rss mapperne er skrivbare: '; -$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer om /'.MGR_DIR.'/includes/config.inc.php er oprettet og er skrivbar: '; +$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer om /[+MGR_DIR+]/includes/config.inc.php er oprettet og er skrivbar: '; $_lang["checking_if_export_exists"] = 'Kontrollerer om /assets/export mappen er oprettet: '; $_lang["checking_if_export_writable"] = 'Kontrollerer om /assets/export mappen er skrivbar: '; $_lang["checking_if_images_exist"] = 'Kontrollerer om /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup og /assets/.thumbs mapperne er oprettet: '; @@ -50,7 +50,7 @@ $_lang["checking_sessions"] = 'Kontrollerer om sessions er korrekt konfigureret: '; $_lang["checking_table_prefix"] = 'Kontrollerer database tabellernes præfiks `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Ved nyinstallation under Linux eller Unix, skal du oprette en tom fil, med navnet config.inc.php i /'.MGR_DIR.'/includes/ mappen, med filrettighederne indstillet til 0666.'; +$_lang["config_permissions_note"] = 'Ved nyinstallation under Linux eller Unix, skal du oprette en tom fil, med navnet config.inc.php i /[+MGR_DIR+]/includes/ mappen, med filrettighederne indstillet til 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_method"] = 'Connection\'s metode:'; $_lang["connection_screen_database_connection_information"] = 'Database information'; @@ -173,7 +173,7 @@ $_lang["table_prefix_not_exist"] = ' - Tabellens præfiks eksisterer ikke i denne database!'; $_lang["table_prefix_not_exist_note"] = 'Installationsprogrammet kunne ikke installere i den valgte database, da de eksisterende tabeller du har valgt der skal opdateres, ikke indeholder det præfiks du har indtastet. Indtast et eksisterende tabel præfiks og prøv at køre installationsprogrammet igen.'; $_lang["templates"] = 'Skabeloner'; -$_lang["to_log_into_content_manager"] = 'For at logge ind i CMS\'et ('.MGR_DIR.'/index.php) skal du klikke på `Luk` knappen.'; +$_lang["to_log_into_content_manager"] = 'For at logge ind i CMS\'et ([+MGR_DIR+]/index.php) skal du klikke på `Luk` knappen.'; $_lang["toggle"] = 'Byt om på det valgte'; $_lang['tvs'] = 'Skabelon variabler'; $_lang["unable_install_chunk"] = 'Kunne ikke installere chunk. Fil'; diff --git a/install/lang/finnish-utf8.inc.php b/install/lang/finnish-utf8.inc.php index 9f1e155616..9dad470351 100644 --- a/install/lang/finnish-utf8.inc.php +++ b/install/lang/finnish-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Sulje'; $_lang["btnnext_value"] = 'Seuraava'; $_lang["cant_write_config_file"] = 'MODx ei voinut kirjoittaa asetukset tiedostoa. Ole hyvä ja kopioi seuraava asetustiedostoon '; -$_lang["cant_write_config_file_note"] = 'Kun tämä on tehty, voit kirjautua MODx hallintaan osoitteessa sinunosoite.fi/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'Kun tämä on tehty, voit kirjautua MODx hallintaan osoitteessa sinunosoite.fi/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'Valitse valintaruuduista:'; $_lang["checking_if_cache_exist"] = 'Tarkistetaan onko kansiot /assets/cache ja /assets/cache/rss olemassa: '; $_lang["checking_if_cache_file_writable"] = 'Tarkistetaan voiko tiedostoon /assets/cache/siteCache.idx.php kirjoittaa: '; $_lang["checking_if_cache_file2_writable"] = 'Tarkistetaan voiko tiedostoon /assets/cache/sitePublishing.idx.php kirjoittaa: '; $_lang["checking_if_cache_writable"] = 'Tarkistetaan voiko kansioihin /assets/cache ja /assets/cache/rss luoda uusia tiedostoja: '; -$_lang["checking_if_config_exist_and_writable"] = 'Tarkistetaan onko asetustiedosto '.MGR_DIR.'/includes/config.inc.php olemassa ja voiko siihen kirjoittaa: '; +$_lang["checking_if_config_exist_and_writable"] = 'Tarkistetaan onko asetustiedosto [+MGR_DIR+]/includes/config.inc.php olemassa ja voiko siihen kirjoittaa: '; $_lang["checking_if_export_exists"] = 'Tarkistetaan onko kansio /assets/export olemassa: '; $_lang["checking_if_export_writable"] = 'Tarkistetaan voiko kansioon /assets/export luoda uusia tiedostoja: '; $_lang["checking_if_images_exist"] = 'Tarkistetaan onko kansiot /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup ja /assets/.thumbs olemassa: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Tarkistetaan onko palvelinistunnot asetettu toimimaan oikein: '; $_lang["checking_table_prefix"] = 'Tarkistetaan tietokannan taulujen etuliite `'; $_lang["chunks"] = 'HTML-palaset'; -$_lang["config_permissions_note"] = 'Jos olet asentamassa järjestelmää Linux / Unix palvelimeen, luo kansioon '.MGR_DIR.'/includes/ tyhjä tiedosto nimeltä config.inc.php ja aseta tiedostoon 0666 oikeudet.'; +$_lang["config_permissions_note"] = 'Jos olet asentamassa järjestelmää Linux / Unix palvelimeen, luo kansioon [+MGR_DIR+]/includes/ tyhjä tiedosto nimeltä config.inc.php ja aseta tiedostoon 0666 oikeudet.'; $_lang["connection_screen_collation"] = 'Merkistö:'; $_lang["connection_screen_connection_method"] = 'Yhteystyyppi:'; $_lang["connection_screen_database_connection_information"] = 'Tietokannan yhteysasetukset'; @@ -166,7 +166,7 @@ $_lang["table_prefix_not_exist"] = ' - Tietokannan taulujen etuliitettä ei löydetty tästä tietokannasta!'; $_lang["table_prefix_not_exist_note"] = 'Asennusohjelma ei voinut asentaa valittuun tietokantaan, koska se ei sisällä tauluja asetetulla etuliitteellä, jotka asetit päivitystietoihin. Ole hyvä ja valitse uusi etuliite ja yritä uudelleen.'; $_lang["templates"] = 'Sivupohjat'; -$_lang["to_log_into_content_manager"] = 'Kirjautuaksesi sisällönhallintajärjestelmään ('.MGR_DIR.'/index.php) napsauta `Sulje` painiketta.'; +$_lang["to_log_into_content_manager"] = 'Kirjautuaksesi sisällönhallintajärjestelmään ([+MGR_DIR+]/index.php) napsauta `Sulje` painiketta.'; $_lang["toggle"] = 'Vastakkaiset'; $_lang["unable_install_chunk"] = 'HTML-palasta ei voitu asentaa. Tiedosto'; $_lang["unable_install_module"] = 'Moduulia ei voitu asentaa. Tiedosto'; diff --git a/install/lang/francais-utf8.inc.php b/install/lang/francais-utf8.inc.php index 7419b8cb8e..a180ae4122 100644 --- a/install/lang/francais-utf8.inc.php +++ b/install/lang/francais-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Fermer'; $_lang["btnnext_value"] = 'Suivant'; $_lang["cant_write_config_file"] = 'MODx n\'a pas pu écrire le fichier de configuration. Veuillez copier/coller ceci dans le fichier '; -$_lang["cant_write_config_file_note"] = 'Une fois l\'opération effectuée, vous pouvez vous connecter à l\'interface d\'administration de MODx en utilisant l\'adresse VotreSite.com/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'Une fois l\'opération effectuée, vous pouvez vous connecter à l\'interface d\'administration de MODx en utilisant l\'adresse VotreSite.com/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'Cochez pour sélectionner les options:'; $_lang["checking_if_cache_exist"] = 'Vérification de l\'existence du répertoire assets/cache: '; $_lang["checking_if_cache_file2_writable"] = 'Vérification des droits en écriture du fichier assets/cache/sitePublishing.idx.php: '; $_lang["checking_if_cache_file_writable"] = 'Vérification des droits en écriture du fichier assets/cache/siteCache.idx.php: '; $_lang["checking_if_cache_writable"] = 'Vérification des droits en écriture du répertoire assets/cache: '; -$_lang["checking_if_config_exist_and_writable"] = 'Vérification de l\'existence et des droits en écriture du fichier '.MGR_DIR.'/includes/config.inc.php: '; +$_lang["checking_if_config_exist_and_writable"] = 'Vérification de l\'existence et des droits en écriture du fichier [+MGR_DIR+]/includes/config.inc.php: '; $_lang["checking_if_export_exists"] = 'Vérification de l\'existence du répertoire assets/export: '; $_lang["checking_if_export_writable"] = 'Vérification des droits en écriture du répertoire assets/export: '; $_lang["checking_if_images_exist"] = 'Vérification de l\'existence du répertoire assets/images: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Vérifications des paramètres de sessions: '; $_lang["checking_table_prefix"] = 'Vérification du préfixe de table `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Lors des installations Linux/Unix, veuillez créer un nouveau fichier nommé config.inc.php dans le répertoire '.MGR_DIR.'/includes/ avec les droits d\'accès 0666.'; +$_lang["config_permissions_note"] = 'Lors des installations Linux/Unix, veuillez créer un nouveau fichier nommé config.inc.php dans le répertoire [+MGR_DIR+]/includes/ avec les droits d\'accès 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_method"] = 'Méthode de connexion:'; $_lang["connection_screen_database_connection_information"] = 'Informations base de données'; @@ -172,7 +172,7 @@ $_lang["table_prefix_not_exist"] = ' - Le préfixe de table n\'existe pas dans la base de données!'; $_lang["table_prefix_not_exist_note"] = 'Le programme d\'installation n\'a pas pu utiliser la base de données spécifiée parce qu\'elle ne contient pas de tables comportant le préfixe que vous avez choisi pour la mise à jour. Veuillez choisir un préfixe de table existant et recommencer l\'installation.'; $_lang["templates"] = 'Modèles'; -$_lang["to_log_into_content_manager"] = 'Pour vous connecter au Gestionnaire de Contenu ('.MGR_DIR.'/index.php), cliquez sur le bouton «Fermer».'; +$_lang["to_log_into_content_manager"] = 'Pour vous connecter au Gestionnaire de Contenu ([+MGR_DIR+]/index.php), cliquez sur le bouton «Fermer».'; $_lang["toggle"] = 'Intervertir'; $_lang['tvs'] = 'Variables de Template'; $_lang["unable_install_chunk"] = 'Impossible d\'installer le Chunk. Fichier'; diff --git a/install/lang/hebrew.inc.php b/install/lang/hebrew.inc.php index 6bee842090..e6df7fbea2 100755 --- a/install/lang/hebrew.inc.php +++ b/install/lang/hebrew.inc.php @@ -31,13 +31,13 @@ $_lang["btnclose_value"] = 'סגור'; $_lang["btnnext_value"] = 'הבא'; $_lang["cant_write_config_file"] = 'MODx couldn\'t write the config file. Please copy the following into the file '; -$_lang["cant_write_config_file_note"] = 'Once that\'s been done, you can log into MODx Admin by pointing your browser at YourSiteName.com/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'Once that\'s been done, you can log into MODx Admin by pointing your browser at YourSiteName.com/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'אפשרויות שדה סימון:'; $_lang["checking_if_cache_exist"] = 'Checking if assets/cache directory exists: '; $_lang["checking_if_cache_file2_writable"] = 'Checking if assets/cache/sitePublishing.idx.php file is writable: '; $_lang["checking_if_cache_file_writable"] = 'Checking if assets/cache/siteCache.idx.php file is writable: '; $_lang["checking_if_cache_writable"] = 'Checking if assets/cache directory is writable: '; -$_lang["checking_if_config_exist_and_writable"] = 'Checking if '.MGR_DIR.'/includes/config.inc.php exists and is writable: '; +$_lang["checking_if_config_exist_and_writable"] = 'Checking if [+MGR_DIR+]/includes/config.inc.php exists and is writable: '; $_lang["checking_if_export_exists"] = 'Checking if assets/export directory exists: '; $_lang["checking_if_export_writable"] = 'Checking if assets/export directory is writable: '; $_lang["checking_if_images_exist"] = 'Checking if assets/images directory exists: '; @@ -50,7 +50,7 @@ $_lang["checking_sessions"] = 'Checking if sessions are properly configured: '; $_lang["checking_table_prefix"] = 'Checking table prefix '; $_lang["chunks"] = 'מיני תבניות'; -$_lang["config_permissions_note"] = 'For new Linux/Unix installs, please create a blank file named config.inc.php in the '.MGR_DIR.'/includes/ directory with file permissions set to 0666.'; +$_lang["config_permissions_note"] = 'For new Linux/Unix installs, please create a blank file named config.inc.php in the [+MGR_DIR+]/includes/ directory with file permissions set to 0666.'; $_lang["connection_screen_character_set"] = 'חיבור ערכת תווים:'; $_lang["connection_screen_collation"] = 'אוסף נתונים:'; $_lang["connection_screen_connection_information"] = 'מידע התחברות'; @@ -164,7 +164,7 @@ $_lang["table_prefix_not_exist_note"] = 'Setup couldn\'t install into the selected database, as it does not contain existing tables with the prefix you specified to be upgraded. Please choose an existing table prefix, and run Setup again.'; $_lang["templates"] = 'תבניות עיצוב'; $_lang["testing_connection"] = 'בודק חיבור...'; -$_lang["to_log_into_content_manager"] = 'על מנת להתחבר למערכת הניהול ('.MGR_DIR.'/index.php) ניתן ללחוץ על כפתור `סגור`.'; +$_lang["to_log_into_content_manager"] = 'על מנת להתחבר למערכת הניהול ([+MGR_DIR+]/index.php) ניתן ללחוץ על כפתור `סגור`.'; $_lang["toggle"] = 'בחירה הפוכה'; $_lang["unable_install_chunk"] = 'Unable to install chunk. File'; $_lang["unable_install_module"] = 'Unable to install module. File'; diff --git a/install/lang/japanese-utf8.inc.php b/install/lang/japanese-utf8.inc.php index 4fc17970e4..9e05c7da91 100755 --- a/install/lang/japanese-utf8.inc.php +++ b/install/lang/japanese-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'インストール終了'; $_lang["btnnext_value"] = '進む'; $_lang["cant_write_config_file"] = '設定ファイルを生成できませんでした。以下をコピーしてconfig.inc.phpに反映してください '; -$_lang["cant_write_config_file_note"] = '実行後は、サイト名/'.MGR_DIR.'/ にアクセスすることで管理画面にログインできます。'; +$_lang["cant_write_config_file_note"] = '実行後は、サイト名/[+MGR_DIR+]/ にアクセスすることで管理画面にログインできます。'; $_lang["checkbox_select_options"] = '拡張機能の選択:'; $_lang["checking_if_cache_exist"] = '/assets/cacheディレクトリの存在チェック(なければ転送に失敗しています): '; $_lang["checking_if_cache_file_writable"] = 'ファイル/assets/cache/siteCache.idx.phpの書き込み属性(606などに設定): '; $_lang["checking_if_cache_file2_writable"] = 'ファイル/assets/cache/sitePublishing.idx.phpの書き込み属性(606などに設定): '; $_lang["checking_if_cache_writable"] = '/assets/cacheディレクトリの書き込み属性(707などに設定): '; -$_lang["checking_if_config_exist_and_writable"] = 'ファイル/'.MGR_DIR.'/includes/config.inc.phpの存在と書き込み属性: '; +$_lang["checking_if_config_exist_and_writable"] = 'ファイル/[+MGR_DIR+]/includes/config.inc.phpの存在と書き込み属性: '; $_lang["checking_if_export_exists"] = '/assets/exportディレクトリの存在(なければ転送に失敗しています): '; $_lang["checking_if_export_writable"] = '/assets/exportディレクトリの書き込み属性(707などに設定): '; $_lang["checking_if_images_exist"] = '/assets/images,/assets/files,/assets/flash, /assets/media,/assets/backup,/assets/.thumbsディレクトリの存在(なければ転送に失敗しています): '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'セッション情報が正常に構成されるかどうか: '; $_lang["checking_table_prefix"] = 'Tableプリフィックスの設定 `'; $_lang["chunks"] = 'チャンク'; -$_lang["config_permissions_note"] = 'config.inc.phpという名前の空ファイルを作って/'.MGR_DIR.'/includes/ディレクトリに転送するか、すでに転送済みのconfig.inc.php.blankをリネームするなどし、パーミッションを606などに設定してください。'; +$_lang["config_permissions_note"] = 'config.inc.phpという名前の空ファイルを作って/[+MGR_DIR+]/includes/ディレクトリに転送するか、すでに転送済みのconfig.inc.php.blankをリネームするなどし、パーミッションを606などに設定してください。'; $_lang["connection_screen_collation"] = '照合順序(エンコード指定含む):
    ※utf8_general_ciを
    おすすめします'; $_lang["connection_screen_connection_method"] = '接続時の文字セットの扱い:'; $_lang["connection_screen_database_connection_information"] = 'データベース設定'; @@ -102,7 +102,7 @@ $_lang["installation_upgrade_advanced"] = 'カスタムアップデート
    (データベース設定をアップデートできます)'; $_lang["installation_upgrade_advanced_note"] = 'データベース設定の変更を伴うアップデート(MySQL4→MySQL5など)が必要な場合はこちらを選んでください。config.inc.phpのデータベース接続情報一式を更新します。
    '; $_lang["installation_upgrade_existing"] = '通常アップデート'; -$_lang["installation_upgrade_existing_note"] = '通常のアップデートはこのオプションを。コアファイル・リソースファイルの両方とデータベースをアップデートします。
    【注意】データベースのバックアップはお済みですか？まだの場合は今からでも    バックアップマネージャーでどうぞ。'; +$_lang["installation_upgrade_existing_note"] = '通常のアップデートはこのオプションを。コアファイル・リソースファイルの両方とデータベースをアップデートします。
    【注意】データベースのバックアップはお済みですか？まだの場合は今からでもバックアップマネージャーでどうぞ。'; $_lang["installed"] = 'インストールしました'; $_lang["installing_demo_site"] = 'サンプルサイトのインストール: '; $_lang["language_code"] = 'ja'; @@ -172,7 +172,7 @@ $_lang["table_prefix_not_exist"] = ' - 指定されたテーブルプレフィックスがデータベース内に存在していなかったため、インストールが完了しませんでした。正しいテーブルプリフィックスを指定し、再度実行してください。'; $_lang["table_prefix_not_exist_note"] = 'Setup couldn\'t install into the selected database, as it does not contain existing tables with the prefix you specified to be upgraded. Please choose an existing table prefix, and run Setup again.'; $_lang["templates"] = 'テンプレート'; -$_lang["to_log_into_content_manager"] = 'おつかれさまでした。「インストール終了」ボタンをクリックすると、管理画面のログインページ('.MGR_DIR.'/index.php)にアクセスします。'; +$_lang["to_log_into_content_manager"] = 'おつかれさまでした。「インストール終了」ボタンをクリックすると、管理画面のログインページ([+MGR_DIR+]/index.php)にアクセスします。'; $_lang["toggle"] = '選択状態を反転'; $_lang['tvs'] = 'テンプレート変数'; $_lang["unable_install_chunk"] = 'チャンクをインストールできません'; diff --git a/install/lang/norwegian.inc.php b/install/lang/norwegian.inc.php index 44b5f5f36d..353e70748c 100644 --- a/install/lang/norwegian.inc.php +++ b/install/lang/norwegian.inc.php @@ -32,13 +32,13 @@ $_lang["btnclose_value"] = 'Lukk'; $_lang["btnnext_value"] = 'Neste'; $_lang["cant_write_config_file"] = 'MODx kunne ikke skrive konfigurasjonsfilen. Kopier følgende til filen '; -$_lang["cant_write_config_file_note"] = 'Når det er klart kan du logge inn i MODx administrasjonskontoen ved å gå til adressen DittDomene.xx/'.MGR_DIR.'/ i din nettleser.'; +$_lang["cant_write_config_file_note"] = 'Når det er klart kan du logge inn i MODx administrasjonskontoen ved å gå til adressen DittDomene.xx/[+MGR_DIR+]/ i din nettleser.'; $_lang["checkbox_select_options"] = 'Alternativ for kryssbokser:'; $_lang["checking_if_cache_exist"] = 'Kontrollerer at katalogen assets/cache eksisterer: '; $_lang["checking_if_cache_file2_writable"] = 'Kontrollerer at filen assets/cache/sitePublishing.idx.php er skrivbar: '; $_lang["checking_if_cache_file_writable"] = 'Kontrollerer at filen assets/cache/siteCache.idx.php er skrivbar: '; $_lang["checking_if_cache_writable"] = 'Kontrollerer at katalogen assets/cache er skrivbar: '; -$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer at filen '.MGR_DIR.'/includes/config.inc.php eksisterer og er skrivbar: '; +$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerer at filen [+MGR_DIR+]/includes/config.inc.php eksisterer og er skrivbar: '; $_lang["checking_if_export_exists"] = 'Kontrollerer at katalogen assets/export eksisterer: '; $_lang["checking_if_export_writable"] = 'Kontrollerer at katalogen assets/export er skrivbar: '; $_lang["checking_if_images_exist"] = 'Kontrollerer at katalogen assets/images, /assets/media, /assets/backup, /assets/.thumbs eksisterer: '; @@ -51,7 +51,7 @@ $_lang["checking_sessions"] = 'Kontrollerer at sesjoner er korrekt konfigurert: '; $_lang["checking_table_prefix"] = 'Kontrollerer tabellprefixet `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'For nye installasjoner i Linux/Unix-miljø må en tom fil med navnet config.inc.php opprettes i katalogen '.MGR_DIR.'/includes/ med skriverrettighetene satt til 666.'; +$_lang["config_permissions_note"] = 'For nye installasjoner i Linux/Unix-miljø må en tom fil med navnet config.inc.php opprettes i katalogen [+MGR_DIR+]/includes/ med skriverrettighetene satt til 666.'; $_lang["connection_screen_collation"] = 'Kollasjonering:'; $_lang["connection_screen_connection_information"] = 'Tilkoblingsopplysninger'; $_lang["connection_screen_connection_method"] = 'Tilkoblingsmetode:'; @@ -160,7 +160,7 @@ $_lang["table_prefix_not_exist"] = ' - Tabellprefixet finnes ikke i denne databasen!'; $_lang["table_prefix_not_exist_note"] = 'Installasjonsprogrammet kunne ikke installere i den valgte databasen ettersom den ikke inneholder tabeller med det prefixet du oppga før oppgraderingen. Velg et eksisterende prefix og kjør installasjonsprogrammet på nytt.'; $_lang["templates"] = 'Maler'; -$_lang["to_log_into_content_manager"] = 'Du kan logge inn i inneholdshåndtereren ('.MGR_DIR.'/index.php)ved å klikke på \"Lukk\"-knappen.'; +$_lang["to_log_into_content_manager"] = 'Du kan logge inn i inneholdshåndtereren ([+MGR_DIR+]/index.php)ved å klikke på \"Lukk\"-knappen.'; $_lang["toggle"] = 'Skift'; $_lang["unable_install_chunk"] = 'Kunne ikke installere chunk. Fil'; $_lang["unable_install_module"] = 'Kunne ikke installere modul. Fil'; diff --git a/install/lang/persian.inc.php b/install/lang/persian.inc.php index 340f0783d9..29ad6cd29c 100644 --- a/install/lang/persian.inc.php +++ b/install/lang/persian.inc.php @@ -31,13 +31,13 @@ $_lang["btnclose_value"] = 'ببند'; $_lang["btnnext_value"] = 'بعدی'; $_lang["cant_write_config_file"] = 'مد ایکس نتوانست فایل پیکر بندی (config) را بنویسد. لطفا این ها را در فایل پیکر بندی کپی کنید.'; -$_lang["cant_write_config_file_note"] = 'هنگامی که نصب با موفقیت یه اتمام رسید شما می توانید به قسمت مدیریت سایت خود به آدرس YourSiteName.com/'.MGR_DIR.'/ بروید.'; +$_lang["cant_write_config_file_note"] = 'هنگامی که نصب با موفقیت یه اتمام رسید شما می توانید به قسمت مدیریت سایت خود به آدرس YourSiteName.com/[+MGR_DIR+]/ بروید.'; $_lang["checkbox_select_options"] = 'موارد را انتخاب کنید:'; $_lang["checking_if_cache_exist"] = 'مرور اینکه آیا assets/cache موجود است: '; $_lang["checking_if_cache_file2_writable"] = 'ررو اینکه آیا فایل assets/cache/sitePublishing.idx.php قابل نوشتن است: '; $_lang["checking_if_cache_file_writable"] = 'مرور اینکه آیا فایل assets/cache/siteCache.idx.php قابل نوشتن است: '; $_lang["checking_if_cache_writable"] = 'مرور اینکه آیا assets/cache قابل نوشتن است: '; -$_lang["checking_if_config_exist_and_writable"] = 'مرور اینکه آیا فایل '.MGR_DIR.'/includes/config.inc.php موجود است و قابل نوشتن است: '; +$_lang["checking_if_config_exist_and_writable"] = 'مرور اینکه آیا فایل [+MGR_DIR+]/includes/config.inc.php موجود است و قابل نوشتن است: '; $_lang["checking_if_export_exists"] = 'مرور اینکه آیا assets/export موجود است: '; $_lang["checking_if_export_writable"] = 'مرور اینکه آیا assets/export قابل نوشتن است: '; $_lang["checking_if_images_exist"] = 'مرور اینکه آیا assets/images موجود است: '; @@ -50,7 +50,7 @@ $_lang["checking_sessions"] = 'بازخوانی sessions مطابق تنظیمات درست: '; $_lang["checking_table_prefix"] = 'مرور پیشوند جدول `'; $_lang["chunks"] = 'چانکها'; -$_lang["config_permissions_note"] = 'برای نصب جدید روی لینوکس/یونیکس, لطفا یک فایل خالی به نام config.inc.php در دایرکتوری '.MGR_DIR.'/includes/ ایجاد کنید که سطح دسترسی به آن 0666 تنظیم شده باشد.'; +$_lang["config_permissions_note"] = 'برای نصب جدید روی لینوکس/یونیکس, لطفا یک فایل خالی به نام config.inc.php در دایرکتوری [+MGR_DIR+]/includes/ ایجاد کنید که سطح دسترسی به آن 0666 تنظیم شده باشد.'; $_lang["connection_screen_collation"] = 'تطبیق(Collation):'; $_lang["connection_screen_connection_information"] = 'جزییات اتصال به پایگاه داده »'; $_lang["connection_screen_database_connection_information"] = 'اطلاعات پایگاه داده'; @@ -158,7 +158,7 @@ $_lang["table_prefix_not_exist"] = ' - پیشوند جداول موجود نمی باشد'; $_lang["table_prefix_not_exist_note"] = 'صب و بروزرسانی با پیشوند جداولی که انتخاب کردید به علت موجود نبودن یشوند جداول با مشکل روبرو شد. لطف پیشوند جداول را بازرسی و دوباره امتحان کنید.'; $_lang["templates"] = 'قالب ها'; -$_lang["to_log_into_content_manager"] = 'برای ورود به قسمت مدیریت ('.MGR_DIR.'/index.php) شما می توانید بر دکمه "ببند" کلیک کنید.'; +$_lang["to_log_into_content_manager"] = 'برای ورود به قسمت مدیریت ([+MGR_DIR+]/index.php) شما می توانید بر دکمه "ببند" کلیک کنید.'; $_lang["toggle"] = 'دستور'; $_lang["unable_install_chunk"] = 'نصب چانک با مشکل روبرو شد. فایل'; $_lang["unable_install_module"] = 'نصب ماژول با مشکل روبرو شد. فایل'; diff --git a/install/lang/polish-utf8.inc.php b/install/lang/polish-utf8.inc.php index 51a3ab1ed9..95f18a9feb 100644 --- a/install/lang/polish-utf8.inc.php +++ b/install/lang/polish-utf8.inc.php @@ -1,7 +1,7 @@ /assets/cache oraz /assets/cache/rss: '; $_lang["checking_if_cache_file_writable"] = 'Sprawdzanie, czy plik /assets/cache/siteCache.idx.php jest zapisywalny: '; $_lang["checking_if_cache_file2_writable"] = 'Sprawdzanie, czy plik /assets/cache/sitePublishing.idx.php jest zapisywalny: '; $_lang["checking_if_cache_writable"] = 'Sprawdzanie, czy foldery /assets/cache oraz /assets/cache/rss są zapisywalne: '; -$_lang["checking_if_config_exist_and_writable"] = 'Sprawdzanie, czy plik /'.MGR_DIR.'/includes/config.inc.php istnieje i jest zapisywalny: '; +$_lang["checking_if_config_exist_and_writable"] = 'Sprawdzanie, czy plik /[+MGR_DIR+]/includes/config.inc.php istnieje i jest zapisywalny: '; $_lang["checking_if_export_exists"] = 'Sprawdzanie, czy istnieje folder /assets/export: '; $_lang["checking_if_export_writable"] = 'Sprawdzanie, czy folder /assets/export jest zapisywalny: '; $_lang["checking_if_images_exist"] = 'Sprawdzanie, czy istnieją foldery /assets/images, /assets/files, /assets/flash oraz /assets/media: '; @@ -54,7 +54,7 @@ $_lang["checking_sessions"] = 'Sprawdzanie, czy obsługa sesji jest skonfigurowana poprawnie: '; $_lang["checking_table_prefix"] = 'Sprawdzanie prefiksu tabeli `'; $_lang["chunks"] = 'Chunki'; -$_lang["config_permissions_note"] = 'Dla nowych instalacji na systemach Linux/Unix utwórz pusty plik o nazwie config.inc.php w folderze /'.MGR_DIR.'/includes/ i ustaw dla niego prawa dostępu na 0666.'; +$_lang["config_permissions_note"] = 'Dla nowych instalacji na systemach Linux/Unix utwórz pusty plik o nazwie config.inc.php w folderze /[+MGR_DIR+]/includes/ i ustaw dla niego prawa dostępu na 0666.'; $_lang["connection_screen_collation"] = 'System porównań (collation): '; $_lang["connection_screen_connection_method"] = 'Metoda połączenia: '; $_lang["connection_screen_database_connection_information"] = 'Informacje o bazie danych'; @@ -177,7 +177,7 @@ $_lang["table_prefix_not_exist"] = '- Tabele o tym prefiksie nie istnieją w wybranej bazie danych!'; $_lang["table_prefix_not_exist_note"] = 'Nie można zaktualizować MODxa w wybranej bazie danych, ponieważ nie zawiera ona tabel z określonym prefiksem. Wybierz prefiks, który został zastosowany dla istniejących już tabel i uruchom instalatora ponownie.'; $_lang["templates"] = 'Szablony'; -$_lang["to_log_into_content_manager"] = 'Po kliknięciu w przycisk `Zamknij` będziesz mógł zalogować się do Menedżera MODxa ('.MGR_DIR.'/index.php).'; +$_lang["to_log_into_content_manager"] = 'Po kliknięciu w przycisk `Zamknij` będziesz mógł zalogować się do Menedżera MODxa ([+MGR_DIR+]/index.php).'; $_lang["toggle"] = 'Odwróć zaznaczenie'; $_lang['tvs'] = 'Zmienne Szablonów'; $_lang["unable_install_chunk"] = 'Nie można zainstalować chunków. Plik'; diff --git a/install/lang/russian-UTF8.inc.php b/install/lang/russian-UTF8.inc.php index 721a2b8d63..dbd290a0b7 100644 --- a/install/lang/russian-UTF8.inc.php +++ b/install/lang/russian-UTF8.inc.php @@ -33,13 +33,13 @@ $_lang["btnclose_value"] = 'Закрыть'; $_lang["btnnext_value"] = 'Далее'; $_lang["cant_write_config_file"] = 'Программа установки не смогла записать файл конфигурации. Скопируйте вышеперечисленное в файл '; -$_lang["cant_write_config_file_note"] = 'Как только вы это сделаете, вы можете войти в панель управления, перейдя в браузере по адресу Адрес_Вашего_Сайта/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'Как только вы это сделаете, вы можете войти в панель управления, перейдя в браузере по адресу Адрес_Вашего_Сайта/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'Параметры выбора флажков:'; $_lang["checking_if_cache_exist"] = 'Проверка существования папок /assets/cache и /assets/cache/rss: '; $_lang["checking_if_cache_file_writable"] = 'Проверка возможности записи в файл /assets/cache/siteCache.idx.php: '; $_lang["checking_if_cache_file2_writable"] = 'Проверка возможности записи в файл /assets/cache/sitePublishing.idx.php: '; $_lang["checking_if_cache_writable"] = 'Проверка возможности записи в папки /assets/cache и /assets/cache/rss: '; -$_lang["checking_if_config_exist_and_writable"] = 'Проверка существования и возможности записи в файл /'.MGR_DIR.'/includes/config.inc.php: '; +$_lang["checking_if_config_exist_and_writable"] = 'Проверка существования и возможности записи в файл /[+MGR_DIR+]/includes/config.inc.php: '; $_lang["checking_if_export_exists"] = 'Проверка существования папки /assets/export: '; $_lang["checking_if_export_writable"] = 'Проверка возможности записи в папку /assets/export: '; $_lang["checking_if_images_exist"] = 'Проверка существования папок /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup и /assets/.thumbs: '; @@ -52,7 +52,7 @@ $_lang["checking_sessions"] = 'Проверка настроек сессий: '; $_lang["checking_table_prefix"] = 'Проверка префикса таблиц `'; $_lang["chunks"] = 'Чанки'; -$_lang["config_permissions_note"] = 'При новой Linux/Unix установке, создайте пустой файл config.inc.php в папке /'.MGR_DIR.'/includes/ с правами 0666.'; +$_lang["config_permissions_note"] = 'При новой Linux/Unix установке, создайте пустой файл config.inc.php в папке /[+MGR_DIR+]/includes/ с правами 0666.'; $_lang["connection_screen_collation"] = 'Сопоставление:'; $_lang["connection_screen_connection_method"] = 'Метод сопоставления:'; $_lang["connection_screen_database_connection_information"] = 'Параметры базы данных'; @@ -111,10 +111,10 @@ $_lang["language_code"] = 'ru'; $_lang["loading"] = 'Загружается...'; $_lang["modules"] = 'Модули'; -$_lang["MODX_footer1"] = '© 2005-2013 MODX Content Mangement Framework (CMF) project. Все права защищены. MODX лицензирован GNU GPL.'; -$_lang["MODX_footer2"] = 'MODX — свободное программное обеспечение. Мы поощряем вас быть творческими и использовать MODX как вы считаете целесообразным. Если вы внесете изменения и решите распространять ваш измененный вариант MODX, то должны сохранять и распространять исходный код бесплатно.'; -$_lang["MODX_install"] = 'MODX » Установка'; -$_lang["MODX_requires_php"] = ', а MODX необходим PHP 4.2.0 или более поздний'; +$_lang["modx_footer1"] = '© 2005-2013 MODX Content Mangement Framework (CMF) project. Все права защищены. MODX лицензирован GNU GPL.'; +$_lang["modx_footer2"] = 'MODX — свободное программное обеспечение. Мы поощряем вас быть творческими и использовать MODX как вы считаете целесообразным. Если вы внесете изменения и решите распространять ваш измененный вариант MODX, то должны сохранять и распространять исходный код бесплатно.'; +$_lang["modx_install"] = 'MODX » Установка'; +$_lang["modx_requires_php"] = ', а MODX необходим PHP 4.4.9 или более поздний'; $_lang["mysql_5051"] = ' версия MySQL - 5.0.51!'; $_lang["mysql_5051_warning"] = 'Известны проблемы с MySQL 5.0.51. Настоятельно рекомендуем обновить базу данных перед продолжением установки.'; $_lang["mysql_version_is"] = ' Ваша версия MySQL: '; @@ -175,7 +175,7 @@ $_lang["table_prefix_not_exist"] = ' - нет такого префикса таблиц в базе данных!'; $_lang["table_prefix_not_exist_note"] = 'Продолжение установки невозможно, так как нет таблиц с указанным префиксом, измените префикс таблиц и попробуйте снова.'; $_lang["templates"] = 'Шаблоны'; -$_lang["to_log_into_content_manager"] = 'Чтобы войти в панель управления ('.MGR_DIR.'/index.php) нажмите на кнопку `Закрыть`.'; +$_lang["to_log_into_content_manager"] = 'Чтобы войти в панель управления ([+MGR_DIR+]/index.php) нажмите на кнопку `Закрыть`.'; $_lang["toggle"] = 'Переключить'; $_lang["tvs"] = 'Параметры (TV)'; $_lang["unable_install_chunk"] = 'Невозможно установить чанк. Файл'; diff --git a/install/lang/spanish-utf8.inc.php b/install/lang/spanish-utf8.inc.php index d4c0357d5b..614e7d426d 100644 --- a/install/lang/spanish-utf8.inc.php +++ b/install/lang/spanish-utf8.inc.php @@ -30,13 +30,13 @@ $_lang["btnclose_value"] = 'Cerrar'; $_lang["btnnext_value"] = 'Siguiente'; $_lang["cant_write_config_file"] = 'MODx no pudo escribir al archivo de configuración. Por favor copia lo siguiente en el archivo. '; -$_lang["cant_write_config_file_note"] = 'Una vez que se ha hecho eso, puedes entrar al sistema administrativo de MODx al poner en tu navegador la dirección YourSiteName.com/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'Una vez que se ha hecho eso, puedes entrar al sistema administrativo de MODx al poner en tu navegador la dirección YourSiteName.com/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'Lista Múltiple:'; $_lang["checking_if_cache_exist"] = 'Comprobando si el directorio assets/cache existe: '; $_lang["checking_if_cache_file2_writable"] = 'Comprobando que el archivo assets/cache/sitePublishing.idx.php es escribible: '; $_lang["checking_if_cache_file_writable"] = 'Comprobando que el archivo assets/cache/siteCache.idx.php es escribible: '; $_lang["checking_if_cache_writable"] = 'Comprobando que el directorio assets/cache es escribible: '; -$_lang["checking_if_config_exist_and_writable"] = 'Comprobando que el archivo '.MGR_DIR.'/includes/config.inc.php existe y es escribible: '; +$_lang["checking_if_config_exist_and_writable"] = 'Comprobando que el archivo [+MGR_DIR+]/includes/config.inc.php existe y es escribible: '; $_lang["checking_if_export_exists"] = 'Comprobando que el directorio assets/export existe: '; $_lang["checking_if_export_writable"] = 'Comprobando que el directorio assets/export es escribible: '; $_lang["checking_if_images_exist"] = 'Comprobando que los directorios assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup y /assets/.thumbs existan: '; @@ -49,7 +49,7 @@ $_lang["checking_sessions"] = 'Checando si las sesiones están apropiadamente configuradas: '; $_lang["checking_table_prefix"] = 'Checando el prefijo de las tablas `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Para instalaciones nuevas en servidores Linux/Unix, favpr de crear un archivo nuevo en blanco llamado config.inc.php en el directorio '.MGR_DIR.'/includes/ con los permisos de archivo configurados a 0666.'; +$_lang["config_permissions_note"] = 'Para instalaciones nuevas en servidores Linux/Unix, favpr de crear un archivo nuevo en blanco llamado config.inc.php en el directorio [+MGR_DIR+]/includes/ con los permisos de archivo configurados a 0666.'; $_lang["connection_screen_collation"] = 'Compaginación:'; $_lang["connection_screen_connection_method"] = 'Método de Conexión:'; $_lang["connection_screen_database_connection_information"] = 'Información de la base de datos'; @@ -166,7 +166,7 @@ $_lang["table_prefix_not_exist"] = ' - ¡Este prefijo no existe en esta base de datos!'; $_lang["table_prefix_not_exist_note"] = 'El configurador no pudo instalar en la base de datos seleccionada, no contiene tablas existentes con el prefijo que especificaste para ser actualizadas. Por favor escoge un prefijo de tablas existente y corre el configurador otra vez.'; $_lang["templates"] = 'Templates'; -$_lang["to_log_into_content_manager"] = 'Para entrar al sistema de administración de MODx ('.MGR_DIR.'/index.php) dando clic en el botón de `Cerrar`.'; +$_lang["to_log_into_content_manager"] = 'Para entrar al sistema de administración de MODx ([+MGR_DIR+]/index.php) dando clic en el botón de `Cerrar`.'; $_lang["toggle"] = 'Invertir'; $_lang['tvs'] = 'Template Variables'; $_lang["unable_install_chunk"] = 'No se pudo instalar el chunk. Archivo'; diff --git a/install/lang/svenska.inc.php b/install/lang/svenska.inc.php index 11110ce047..e470ca249f 100644 --- a/install/lang/svenska.inc.php +++ b/install/lang/svenska.inc.php @@ -35,13 +35,13 @@ $_lang["btnclose_value"] = 'Stäng'; $_lang["btnnext_value"] = 'Nästa'; $_lang["cant_write_config_file"] = 'MODx kunde inte skriva konfigurationsfilen. Kopiera följande till filen '; -$_lang["cant_write_config_file_note"] = 'När det är klart kan du logga in i MODx administrationsdel genom att ange adressen DinWebbplats.se/'.MGR_DIR.'/ i din webbläsare.'; +$_lang["cant_write_config_file_note"] = 'När det är klart kan du logga in i MODx administrationsdel genom att ange adressen DinWebbplats.se/[+MGR_DIR+]/ i din webbläsare.'; $_lang["checkbox_select_options"] = 'Välj flera element:'; $_lang["checking_if_cache_exist"] = 'Kontrollerar att katalogerna /assets/cache och /assets/cache/rss existerar: '; $_lang["checking_if_cache_file_writable"] = 'Kontrollerar att filen /assets/cache/siteCache.idx.php är skrivbar: '; $_lang["checking_if_cache_file2_writable"] = 'Kontrollerar att filen /assets/cache/sitePublishing.idx.php är skrivbar: '; $_lang["checking_if_cache_writable"] = 'Kontrollerar att katalogerna /assets/cache och /assets/cache/rss är skrivbara: '; -$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerar att filen /'.MGR_DIR.'/includes/config.inc.php existerar och är skrivbar: '; +$_lang["checking_if_config_exist_and_writable"] = 'Kontrollerar att filen /[+MGR_DIR+]/includes/config.inc.php existerar och är skrivbar: '; $_lang["checking_if_export_exists"] = 'Kontrollerar att katalogen /assets/export existerar: '; $_lang["checking_if_export_writable"] = 'Kontrollerar att katalogen /assets/export är skrivbar: '; $_lang["checking_if_images_exist"] = 'Kontrollerar att katalogerna /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup och /assets/.thumbs existerar: '; @@ -54,7 +54,7 @@ $_lang["checking_sessions"] = 'Kontrollerar att sessioner är korrekt konfigurerade: '; $_lang["checking_table_prefix"] = 'Kontrollerar tabellprefixet `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'För nya installationer i Linux/Unix-miljö måste en tom fil med namnet config.inc.php skapas i katalogen /'.MGR_DIR.'/includes/ med åtkomsträttigheterna satta till 0666.'; +$_lang["config_permissions_note"] = 'För nya installationer i Linux/Unix-miljö måste en tom fil med namnet config.inc.php skapas i katalogen /[+MGR_DIR+]/includes/ med åtkomsträttigheterna satta till 0666.'; $_lang["connection_screen_collation"] = 'Kollationering:'; $_lang["connection_screen_connection_method"] = 'Anslutningsmetod:'; $_lang["connection_screen_database_connection_information"] = 'Databasuppgifter'; @@ -177,7 +177,7 @@ $_lang["table_prefix_not_exist"] = ' - Tabellprefixet finns inte i den här databasen!'; $_lang["table_prefix_not_exist_note"] = 'Installationsprogrammet kunde inte installera i den valda databasen eftersom den inte innehåller tabeller med det prefix du angav för uppgradering. Välj ett existerande prefix och kör sedan installationsprogrammet igen.'; $_lang["templates"] = 'Mallar'; -$_lang["to_log_into_content_manager"] = 'Du kan logga in i innehållshanteraren ('.MGR_DIR.'/index.php) genom att klicka på "Stäng"-knappen.'; +$_lang["to_log_into_content_manager"] = 'Du kan logga in i innehållshanteraren ([+MGR_DIR+]/index.php) genom att klicka på "Stäng"-knappen.'; $_lang["toggle"] = 'Växla'; $_lang['tvs'] = 'Mallvariabler'; $_lang["unable_install_chunk"] = 'Kunde inte installera chunk. Fil'; From 309f1bf083c5287d287e8880683e50c14b8919a9 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 11:10:47 +0900 Subject: [PATCH 419/530] Fix - MODxRE/style.css --- manager/media/style/MODxRE/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/manager/media/style/MODxRE/style.css b/manager/media/style/MODxRE/style.css index 07b2ea219d..bc7a99d5a4 100644 --- a/manager/media/style/MODxRE/style.css +++ b/manager/media/style/MODxRE/style.css @@ -1791,5 +1791,4 @@ strong[style*='color:#EF1D1D'] { color: red !important; } -span.unpublish{color:gray;} #tabEvents table, #tabEvents td {padding:2px;} From 41aaf7b9924a859520282268f64c465ea28f793d Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 11:14:09 +0900 Subject: [PATCH 420/530] Fix - Install language --- install/lang/portuguese-br.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/lang/portuguese-br.inc.php b/install/lang/portuguese-br.inc.php index 47d599d26d..364ca135f3 100755 --- a/install/lang/portuguese-br.inc.php +++ b/install/lang/portuguese-br.inc.php @@ -29,13 +29,13 @@ $_lang["btnclose_value"] = 'Fechar'; $_lang["btnnext_value"] = 'Prximo'; $_lang["cant_write_config_file"] = 'MODx no pode escrever o arquivo de configurao. Por favor copie no arquivo as seguintes informaes '; -$_lang["cant_write_config_file_note"] = 'Assim que isto for feito, voc pode acessar o MODx Admin por apontar seu navegador para NomeDoSeuSite.com/'.MGR_DIR.'/.'; +$_lang["cant_write_config_file_note"] = 'Assim que isto for feito, voc pode acessar o MODx Admin por apontar seu navegador para NomeDoSeuSite.com/[+MGR_DIR+]/.'; $_lang["checkbox_select_options"] = 'Selecionar:'; $_lang["checking_if_cache_exist"] = 'Checando se o diretrio assets/cache existe: '; $_lang["checking_if_cache_file2_writable"] = 'Checando se o arquivo assets/cache/sitePublishing.idx.php est liberado pra escrita: '; $_lang["checking_if_cache_file_writable"] = 'Checando se o arquivo assets/cache/siteCache.idx.php est liberado pra escrita: '; $_lang["checking_if_cache_writable"] = 'Checando se o diretrio assets/cache est liberado pra escrita: '; -$_lang["checking_if_config_exist_and_writable"] = 'Checando se o arquivo '.MGR_DIR.'/includes/config.inc.php existe e est liberado pra escrita: '; +$_lang["checking_if_config_exist_and_writable"] = 'Checando se o arquivo [+MGR_DIR+]/includes/config.inc.php existe e est liberado pra escrita: '; $_lang["checking_if_export_exists"] = 'Checando se o diretrio assets/export directory exists: '; $_lang["checking_if_export_writable"] = 'Checando se o diretrio assets/export est liberado pra escrita: '; $_lang["checking_if_images_exist"] = 'Checando se o diretrio assets/images existe: '; @@ -46,7 +46,7 @@ $_lang["checking_sessions"] = 'Checando se as sees esto configuradas apropiadamente: '; $_lang["checking_table_prefix"] = 'Verificando Prefixo de Tabela `'; $_lang["chunks"] = 'Chunks'; -$_lang["config_permissions_note"] = 'Para novas instalaes de Linux/Unix, crie um arquivo vazio chamado config.inc.php no diretrio '.MGR_DIR.'/includes/ com as permisses de 0666.'; +$_lang["config_permissions_note"] = 'Para novas instalaes de Linux/Unix, crie um arquivo vazio chamado config.inc.php no diretrio [+MGR_DIR+]/includes/ com as permisses de 0666.'; $_lang["connection_screen_collation"] = 'Collation:'; $_lang["connection_screen_connection_information"] = 'Informao de Conexo'; $_lang["connection_screen_database_connection_information"] = 'Informao da Base de Dados.'; @@ -149,7 +149,7 @@ $_lang["table_prefix_not_exist"] = ' - Prefixo de Table no existe nesta Base de Dados!'; $_lang["table_prefix_not_exist_note"] = 'No foi possvel instalar na base de dados selecionada, como no h tabelas com o prefixo que voc inseriu. Por favor, escolha outro prefixo de tabela e re-comee a atualizao.'; $_lang["templates"] = 'Templates'; -$_lang["to_log_into_content_manager"] = 'Para logar no gerenciador de contedo ('.MGR_DIR.'/index.php) voc pode clicar no boto Fechar.'; +$_lang["to_log_into_content_manager"] = 'Para logar no gerenciador de contedo ([+MGR_DIR+]/index.php) voc pode clicar no boto Fechar.'; $_lang["toggle"] = 'Detalhar'; $_lang["unable_install_chunk"] = 'No foi possivel instalar o chunk. Arquivo'; $_lang["unable_install_module"] = 'No foi possivel instalar o module. Arquivo'; From 3dd5464825c4e65d93ed3c10517dc0ef729e3e9e Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 11:18:37 +0900 Subject: [PATCH 421/530] Add install/nederlands-utf8.inc.php --- install/lang/nederlands-utf8.inc.php | 194 +++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 install/lang/nederlands-utf8.inc.php diff --git a/install/lang/nederlands-utf8.inc.php b/install/lang/nederlands-utf8.inc.php new file mode 100644 index 0000000000..c3c5318a76 --- /dev/null +++ b/install/lang/nederlands-utf8.inc.php @@ -0,0 +1,194 @@ +/assets/cache en /assets/cache/rss mappen bestaan: '; +$_lang["checking_if_cache_file_writable"] = 'Nakijken of /assets/cache/siteCache.idx.php bestand schrijfbaar is:'; +$_lang["checking_if_cache_file2_writable"] = 'Nakijken of /assets/cache/sitePublishing.idx.php bestand schrijfbaar is: '; +$_lang["checking_if_cache_writable"] = 'Checking if /assets/cache and /assets/cache/rss directories are writable: '; +$_lang["checking_if_config_exist_and_writable"] = 'Checking if /[+MGR_DIR+]/includes/config.inc.php exists and is writable: '; +$_lang["checking_if_export_exists"] = 'Checking if /assets/export directory exists: '; +$_lang["checking_if_export_writable"] = 'Checking if /assets/export directory is writable: '; +$_lang["checking_if_images_exist"] = 'Checking if /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup and /assets/.thumbs directories exists: '; +$_lang["checking_if_images_writable"] = 'Checking if /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup and /assets/.thumbs directories are writable: '; +$_lang["checking_mysql_strict_mode"] = 'Checking MySQL for strict sql_mode: '; +$_lang["checking_mysql_version"] = 'Versie van MYSQL nakijken:'; +$_lang["checking_php_version"] = 'PHP versie nakijken:'; +$_lang["checking_registerglobals"] = 'Kijken of Register_Globals uit staat geschakeld:'; +$_lang["checking_registerglobals_note"] = 'This configuration makes your site much more susceptible to Cross Site Scripting (XSS) attacks. You should speak to your host about disabling this setting, usually by one of three ways: modifying the global php.ini file, adding rules to a .htaccess file in the root of your MODX install, or adding custom php.ini override files in every directory on your install (and there\'s a lot of them). You will still be able to install MODX, but consider yourself warned.'; //Look at changing this to provide a solution. +$_lang["checking_sessions"] = 'Checking if sessions are properly configured: '; +$_lang["checking_table_prefix"] = 'Checking table prefix `'; +$_lang["chunks"] = 'Chunks'; +$_lang["config_permissions_note"] = 'For new Linux/Unix installs, please create a blank file named config.inc.php in the /[+MGR_DIR+]/includes/ directory with file permissions set to 0666.'; +$_lang["connection_screen_collation"] = 'Collation:'; +$_lang["connection_screen_connection_method"] = 'Connection method:'; +$_lang["connection_screen_database_connection_information"] = 'Database informatie'; +$_lang["connection_screen_database_connection_note"] = 'Enter the database name to use or which you wish to create for this MODX install. If no database exists, the installer will attempt to create one. This may fail depending on the MySQL user permissions.'; +$_lang["connection_screen_database_host"] = 'Database host:'; +$_lang["connection_screen_database_info"] = 'Database Information'; +$_lang["connection_screen_database_login"] = 'Database login name:'; +$_lang["connection_screen_database_name"] = 'Database name:'; +$_lang["connection_screen_database_pass"] = 'Database password:'; +$_lang["connection_screen_database_test_connection"] = 'Create or test selection of your database.'; +$_lang["connection_screen_default_admin_email"] = 'Administrator email:'; +$_lang["connection_screen_default_admin_login"] = 'Administrator username:'; +$_lang["connection_screen_default_admin_note"] = 'Now you\'ll need to enter some details for the main administrator account. You can fill in your own name here, and a password you\'re not likely to forget. You\'ll need these to log into Admin once setup is complete.'; +$_lang["connection_screen_default_admin_password"] = 'Administrator password:'; +$_lang["connection_screen_default_admin_password_confirm"] = 'Confirm password:'; +$_lang["connection_screen_default_admin_user"] = 'Default Admin User'; +$_lang["connection_screen_defaults"] = 'Default Manager Settings'; +$_lang["connection_screen_server_connection_information"] = 'Server connection and login information'; +$_lang["connection_screen_server_connection_note"] = 'Enter the database host (server name or IP address), the username and password before testing the connection.'; +$_lang["connection_screen_server_test_connection"] = 'Test database server connection and view collations.'; +$_lang["connection_screen_table_prefix"] = 'Table prefix:'; +$_lang["creating_database_connection"] = 'Creating connection to the database: '; +$_lang["database_alerts"] = 'Database Alerts!'; +$_lang["database_connection_failed"] = 'Database connection failed!'; +$_lang["database_connection_failed_note"] = 'Please check the database login details and try again.'; +$_lang["database_use_failed"] = 'Database could not be selected!'; +$_lang["database_use_failed_note"] = 'Please check the database permissions for the specified user and try again.'; +$_lang["default_language"] = 'Default Manager Language'; +$_lang["default_language_description"] = 'This is the default language that will be used in the MODX Manager back end control panel.'; +$_lang["during_execution_of_sql"] = ' during the execution of SQL statement '; +$_lang["encoding"] = 'iso-8859-1'; //charset encoding for html header +$_lang["error"] = 'error'; +$_lang["errors"] = 'errors'; +$_lang["failed"] = 'FAILED!'; +$_lang["help"] = 'Help!'; +$_lang["help_link"] = 'http://forums.modx.com/'; +$_lang["help_title"] = 'Installation assistance in the MODX forums'; +$_lang["iagree_box"] = 'I agree to the terms of the MODX license. For translations of the GPL version 2 license, please visit the GNU Operating System website.'; +$_lang["install"] = 'Install'; +$_lang["install_overwrite"] = 'Install/Overwrite'; +$_lang["install_results"] = 'Install results'; +$_lang["install_update"] = 'Install/Update'; +$_lang["installation_error_occured"] = 'The following errors had occurred during installation'; +$_lang["installation_install_new_copy"] = 'Install a new copy of '; +$_lang["installation_install_new_note"] = 'Please note this option may overwrite any data inside your database.'; +$_lang["installation_mode"] = 'Installation Mode'; +$_lang["installation_new_installation"] = 'New Installation'; +$_lang["installation_note"] = 'Note: After logging into the manager you should edit and save your System Configuration settings before browsing the site by choosing Tools -> System Configuration in the MODX Manager.'; +$_lang["installation_successful"] = 'Installation was successful!'; +$_lang["installation_upgrade_advanced"] = 'Advanced Upgrade'; +$_lang["installation_upgrade_advanced_note"] = 'For advanced database admins or moving to servers with a different database connection character set.
    You will need to know your full database name, user, password and connection/collation details.'; +$_lang["installation_upgrade_existing"] = 'Upgrade Existing Install'; +$_lang["installation_upgrade_existing_note"] = 'Upgrade your current files and database.'; +$_lang["installed"] = 'Installed'; +$_lang["installing_demo_site"] = 'Installing demo site: '; +$_lang["language_code"] = 'en'; // for html element e.g. +$_lang["loading"] = 'Loading...'; +$_lang["modules"] = 'Modules'; +$_lang["modx_footer1"] = '© 2005-2013 the MODX Content Management Framework (CMF) project. All rights reserved. MODX is licensed under the GNU GPL.'; +$_lang["modx_footer2"] = 'MODX is free software. We encourage you to be creative and make use of MODX in any way you see fit. Just make sure that if you do make changes and decide to redistribute your modified MODX, that you keep the source code free!'; +$_lang["modx_install"] = 'MODX » Install'; +$_lang["modx_requires_php"] = ', and MODX requires PHP 4.2.0 or later'; +$_lang["mysql_5051"] = ' MySQL server version is 5.0.51!'; +$_lang["mysql_5051_warning"] = 'There are known issues with MySQL 5.0.51. It is recommended that you upgrade before continuing.'; +$_lang["mysql_version_is"] = ' Your MySQL version is: '; +$_lang["no"] = 'No'; +$_lang["none"] = 'None'; +$_lang["not_found"] = 'not found'; +$_lang["ok"] = 'OK!'; +$_lang["optional_items"] = 'Optional Items'; +$_lang["optional_items_note"] = 'Please choose your installation options and click Install:'; +$_lang["php_security_notice"] = 'Security notice

    While MODX will work on your PHP version, usage of MODX on this version is not recommended. Your version of PHP is vulnerable to numerous security holes. Please upgrade to PHP version is 4.3.8 or higher, which patches these holes. It is recommended you upgrade to this version for the security of your own website.

    '; +$_lang["please_correct_error"] = '. Please correct the error'; +$_lang["please_correct_errors"] = '. Please correct the errors'; +$_lang["plugins"] = 'Plugins'; +$_lang["preinstall_validation"] = 'Pre-install validation'; +$_lang["recommend_setting_change_title"] = 'Recommended Setting Change'; +$_lang["recommend_setting_change_validate_referer_confirmation"] = 'Setting change: Validate HTTP_REFERER headers?'; +$_lang["recommend_setting_change_validate_referer_description"] = 'Your site is not configured to validate the HTTP_REFERER of incoming requests to the Manager. We strongly recommend enabling this setting to reduce the risk of a CSRF (Cross Site Request Forgery) attack.'; +$_lang["remove_install_folder_auto"] = 'Remove the install folder and files from my website
     (This operation requires delete permission to the granted to the install folder).'; +$_lang["remove_install_folder_manual"] = 'Please remember to remove the "install" folder before you log into the Content Manager.'; +$_lang["retry"] = 'Retry'; +$_lang["running_database_updates"] = 'Running database updates: '; +$_lang["sample_web_site"] = 'Sample Web Site'; +$_lang["sample_web_site_note"] = 'Please note that this will overwrite existing documents and resources.'; +$_lang["session_problem"] = 'A problem was detected with your server sessions. Please consult your server admin to correct this problem.'; +$_lang["session_problem_try_again"] = 'Try again?'; +$_lang["setup_cannot_continue"] = 'Unfortunately, Setup cannot continue at the moment, due to the above '; +$_lang["setup_couldnt_install"] = 'MODX setup couldn\'t install/alter some tables inside the selected database.'; +$_lang["setup_database"] = 'Setup will now attempt to setup the database:
    '; +$_lang["setup_database_create_connection"] = 'Creating connection to the database: '; +$_lang["setup_database_create_connection_failed"] = 'Database connection failed!'; +$_lang["setup_database_create_connection_failed_note"] = 'Please check the database login details and try again.'; +$_lang["setup_database_creating_tables"] = 'Creating database tables: '; +$_lang["setup_database_creation"] = 'Creating database `'; +$_lang["setup_database_creation_failed"] = 'Database creation failed!'; +$_lang["setup_database_creation_failed_note"] = ' - Setup could not create the database!'; +$_lang["setup_database_creation_failed_note2"] = 'Setup could not create the database, and no existing database with the same name was found. It is likely that your hosting provider\'s security does not allow external scripts to create a database. Please create a database according to your hosting provider\'s procedure, and run Setup again.'; +$_lang["setup_database_selection"] = 'Selecting database `'; +$_lang["setup_database_selection_failed"] = 'Database selection failed...'; +$_lang["setup_database_selection_failed_note"] = 'The database does not exist. Setup will attempt to create it.'; +$_lang["snippets"] = 'Snippets'; +$_lang["some_tables_not_updated"] = 'Some tables were not updated. This might be due to previous modifications.'; +$_lang["status_checking_database"] = 'Checking database: '; +$_lang["status_connecting"] = ' Connection to host: '; +$_lang["status_failed"] = 'failed!'; +$_lang["status_failed_could_not_create_database"] = 'failed - could not create database'; +$_lang["status_failed_database_collation_does_not_match"] = 'failed - database collation mismatch; use SET NAMES or choose %s'; +$_lang["status_failed_table_prefix_already_in_use"] = 'failed - table prefix already in use!'; +$_lang["status_passed"] = 'passed - database selected'; +$_lang["status_passed_database_created"] = 'passed - database created'; +$_lang["status_passed_server"] = 'passed - collations now available'; +$_lang["strict_mode"] = ' MySQL server strict sql_mode is enabled!'; +$_lang["strict_mode_error"] = 'Certain features of MODX may not work properly unless the STRICT_TRANS_TABLES sql_mode is disabled. You can set the MySQL mode by editing the my.cnf file or contact your server administrator.'; +$_lang["summary_setup_check"] = 'Setup has carried out a number of checks to see if everything\'s ready to start the setup.'; +$_lang["system_configuration"] = 'System Configuration'; +$_lang["system_configuration_validate_referer_description"] = 'The Validate HTTP_REFERER headers setting is recommended and can protect your site from CSRF attacks, but in some server configurations, can make your manager inaccessible.'; +$_lang["table_prefix_already_inuse"] = ' - Table prefix is already in use in this database!'; +$_lang["table_prefix_already_inuse_note"] = 'Setup couldn\'t install into the selected database, as it already contains tables with the prefix you specified. Please choose a new table prefix, and run Setup again.'; +$_lang["table_prefix_not_exist"] = ' - Table prefix does not exist in this database!'; +$_lang["table_prefix_not_exist_note"] = 'Setup couldn\'t install into the selected database, as it does not contain existing tables with the prefix you specified to be upgraded. Please choose an existing table prefix, and run Setup again.'; +$_lang["templates"] = 'Templates'; +$_lang["to_log_into_content_manager"] = 'To log into the Content Manager ([+MGR_DIR+]/index.php) you can click on the `Close` button.'; +$_lang["toggle"] = 'Toggle'; +$_lang['tvs'] = 'Template Variables'; +$_lang["unable_install_chunk"] = 'Unable to install chunk. File'; +$_lang["unable_install_module"] = 'Unable to install module. File'; +$_lang["unable_install_plugin"] = 'Unable to install plugin. File'; +$_lang["unable_install_snippet"] = 'Unable to install snippet. File'; +$_lang["unable_install_template"] = 'Unable to install template. File'; +$_lang["upgrade_note"] = 'Note: Before browsing your site you should log into the manager with an administrative account, then review and save your System Configuration settings.'; +$_lang["upgraded"] = 'Upgraded'; +$_lang["validate_referer_title"] = 'Validate HTTP_REFERER headers?'; +$_lang["visit_forum"] = ', visit the MODX Forums.'; +$_lang["warning"] = 'WARNING!'; +$_lang["welcome_message_start"] = 'First, choose the type of installation to perform:'; +$_lang["welcome_message_text"] = 'This program will guide you through the rest of the installation.'; +$_lang["welcome_message_welcome"] = 'Welcome to the MODX installation program.'; +$_lang["writing_config_file"] = 'Writing configuration file: '; +$_lang["yes"] = 'Yes'; +$_lang["you_running_php"] = ' - You are running on PHP '; +?> \ No newline at end of file From af83cab13aecaff59496f3a364d9105992a590f0 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 11:28:57 +0900 Subject: [PATCH 422/530] Replace [[ListIndexer]] to [[Ditto]] --- install/assets/templates/modx_host.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/templates/modx_host.tpl b/install/assets/templates/modx_host.tpl index bad13f0056..6908630307 100644 --- a/install/assets/templates/modx_host.tpl +++ b/install/assets/templates/modx_host.tpl @@ -39,7 +39,7 @@ [[Ditto? &parents=`2` &display=`2` &total=`20` &removeChunk=`Comments` &tpl=`nl_sidebar`]]

    Most Recent:

    - [[ListIndexer?LIn_root=0]]
    +
      [[Ditto?parents=0&display=5&tpl='@CODE:
    • [+pagetitle+] [+date+]
      • ']]

    Login:

    [!WebLogin? &tpl=`WebLoginSideBar` &loginhomeid=`[(site_start)]`!]

    Meta:

    From c9e18f2bf02ca280318dc67dd0fe64248b733629 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 11:29:54 +0900 Subject: [PATCH 423/530] Fix modxcms.com -> modx.com --- install/assets/templates/modx_host.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/templates/modx_host.tpl b/install/assets/templates/modx_host.tpl index 6908630307..de5f81eec6 100644 --- a/install/assets/templates/modx_host.tpl +++ b/install/assets/templates/modx_host.tpl @@ -45,7 +45,7 @@

    Meta:

    Valid XHTML

    Valid css

    -

    MODx

    +

    MODX

    From e599f490d38242c85b758a85d3522b846936d4a9 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 12:13:42 +0900 Subject: [PATCH 424/530] Fix Ditto DebugConsole --- .../snippets/ditto/debug/debug.templates.php | 19 +++++++------------ .../ditto/debug/modxDebugConsole.class.php | 5 +++-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/assets/snippets/ditto/debug/debug.templates.php b/assets/snippets/ditto/debug/debug.templates.php index 579ead9084..ecac661b6a 100644 --- a/assets/snippets/ditto/debug/debug.templates.php +++ b/assets/snippets/ditto/debug/debug.templates.php @@ -6,19 +6,16 @@ [+title+] - - - - - + + + -
     [+title+]
    -
    +
    [+content+] @@ -26,7 +23,7 @@ TPL; $dbg_templates["links"] = << [+open_dbg_console+]
    + [+open_dbg_console+]
    [+save_dbg_console+]

    TPL; @@ -37,9 +34,7 @@ $dbg_templates["tab"] = <<

    [+title+]

    - + [+tab_content+]
    TPL; - -?> \ No newline at end of file diff --git a/assets/snippets/ditto/debug/modxDebugConsole.class.php b/assets/snippets/ditto/debug/modxDebugConsole.class.php index 1bf3093726..fe9429fbea 100644 --- a/assets/snippets/ditto/debug/modxDebugConsole.class.php +++ b/assets/snippets/ditto/debug/modxDebugConsole.class.php @@ -27,7 +27,7 @@ function render($cTabs,$title,$base_path) { } $placeholders = array( "[+ditto_base_url+]" => $base_path, - "[+base_url+]" => MODX_MANAGER_URL, + "[+base_url+]" => $modx->config["site_url"].MGR_DIR . '/', "[+theme+]" => $modx->config["manager_theme"], "[+title+]" => $title, "[+content+]" => $content, @@ -116,7 +116,8 @@ function makeTab($title,$content) { // Make all MODx tags safe for the output // --------------------------------------------------- function makeMODxSafe($value) { - $value = (strpos($value,"<") !== FALSE) ? "
    ".htmlentities($value)."
    " : $value; + global $modx; + $value = (strpos($value,"<") !== FALSE) ? "
    ".htmlentities($value,ENT_NOQUOTES,$modx->config["modx_charset"])."
    " : $value; $value = str_replace("[","[",$value); $value = str_replace("]","]",$value); $value = str_replace("{","{",$value); From 0b669950c017be8dbf03a212d1b2d94bf7b22118 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 12:15:20 +0900 Subject: [PATCH 425/530] Fix - Sample contents --- install/setup.data.sql | 56 ++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/install/setup.data.sql b/install/setup.data.sql index 3bee75733f..5e8cc1fd8b 100644 --- a/install/setup.data.sql +++ b/install/setup.data.sql @@ -30,61 +30,47 @@ REPLACE INTO `{PREFIX}documentgroup_names` VALUES ('1','Site Admin Pages','0','0 # -REPLACE INTO `{PREFIX}site_content` VALUES (1, 'document', 'text/html', 'Home', 'Welcome to MODX', 'Introduction to MODX', 'index', '', 1, 0, 0, 0, 0, 'Create and do amazing things with MODX', '

    Install Successful!

    \r\n

    You have successfully installed and configured MODX. We hope you find this site an adequate starting configuration for many small business, organization or personal websites; just change the template and content, and you''ll be good to go! This site is preconfigured with a variety of options we hope are helpful, relevant and just plain cool for many marketing or personal sites:

    \r\n
      \r\n
    • Simple Blog. When logged into your site, you''ll be able to create new entries from the front end. This can also be turned into a News publishing or PR publishing system. View example blog
      • \r\n
    • Easy Comments. When logged into your site, your registered site users can comment on your posts. View example
      • \r\n
    • RSS Feeds. Your site visitors can stay up to date using your site feeds. View RSS feed
      • \r\n
    • Automatic User Registration. Those that wish to comment on blogs must first create an account. This comes pre-configured with a "Captcha" anti-robot registration feature. View registration form
      • \r\n
    • QuickEdit. When you''re logged into the manager, you can edit a page directly from the front end! More about CMS features
      • \r\n
    • Integrated Site Search. Allows visitors to search only the pages you wish them to search. Uses Ajax to display results without loading a new page.
      • \r\n
    • Powerful Navigation Builder. Duplicate or build virtually any navigation system with our dynamic menu builder code. The menu above, for example. More about menu features
      • \r\n
    • Mootools enabled. You''re on your way to Web 2.0 and AJAX goodness. More about Ajax features
      • \r\n
    • Custom "page not found (404)" page. Help visitors who go astray to find what they''re looking for. View 404 page
      • \r\n
    • Contact Us form. A highly configurable contact form you should customize to point to the right email address. Comes pre-configured to prevent mail-form-injection so your site does not become a source for spam. View form
      • \r\n
    • Newest documents list. Shows your visitor the most recently added pages (configurable).
      • \r\n
    • Customizable Content Manager. Preview uploaded images, hide or rename fields and lots more. See ManagerManager''s documentation for details and instructions. Quick start: ManagerManager by default will look for "rules" in a Chunk named "mm_rules". Simply copy or rename the Chunk named "mm_demo_rules" to "mm_rules" and try it out!
      • \r\n
    \r\n

    To log into the MODX Control Panel and start customizing this site, point your browser to [(site_manager_url)].

    ', 1, 4, 1, 1, 1, 1, 1144904400, 1, 1160262629, 0, 0, 0, 0, 0, 'Home', 0, 0, 0, 0, 0, 0, 0); - - -REPLACE INTO `{PREFIX}site_content` VALUES (2, 'document', 'text/html', 'Blog', 'My Blog', '', 'blog', '', 1, 0, 0, 0, 1, '', '[[Ditto? &parents=`2` &display=`2` &removeChunk=`Comments` &tpl=`ditto_blog` &paginate=`1` &extenders=`summary,dateFilter` &paginateAlwaysShowLinks=`1` &tagData=`documentTags`]]\r\n\r\n

    Showing [+start+] - [+stop+] of [+total+] Articles

    \r\n\r\n
    [+previous+] [+pages+] [+next+]
    \r\n\r\n
     
    \r\n\r\n[[Reflect? &config=`wordpress` &dittoSnippetParameters=`parents:2` &id=`wp` &getDocuments=`1`]]', 1, 4, 2, 0, 0, 1, 1144904400, 1, 1159818696, 0, 0, 0, 0, 0, 'Blog', 0, 0, 0, 0, 0, 0, 0); - - -REPLACE INTO `{PREFIX}site_content` VALUES (4, 'document', 'text/html', '[*loginName*]', 'Login to Enable to Comments', '', 'login', '', 1, 0, 0, 0, 0, '', '

    In order to comment on blog entries, you must be a registered user of [(site_name)]. If you haven''t already registered, you can request an account.

    \r\n
    [!WebLogin? &tpl=`WebLoginSideBar` &loginhomeid=`2`!]
    ', 1, 4, 11, 0, 0, 1, 1144904400, 1, 1144904400, 0, 0, 0, 0, 0, '[*loginName*]', 0, 0, 0, 0, 0, 0, 1); - - -REPLACE INTO `{PREFIX}site_content` VALUES (5, 'document', 'text/html', 'Request an Account', 'Sign Up for Full Site Privileges', '', 'request-an-account', '', 1, 0, 0, 0, 0, '', '[[WebSignup? &tpl=`FormSignup` &groups=`Registered Users`]]', 1, 4, 3, 0, 0, 1, 1144904400, 1, 1158320704, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); - - -REPLACE INTO `{PREFIX}site_content` VALUES (6, 'document', 'text/html', 'Contact Us', 'Contact [(site_name)]', '', 'contact-us', '', 1, 0, 0, 0, 0, '', '[!eForm? &formid=`ContactForm` &subject=`[+subject+]` &to=`[(emailsender)]` &ccsender=`1` &tpl=`ContactForm` &report=`ContactFormReport` &invalidClass=`invalidValue` &requiredClass=`requiredValue` &cssStyle=`ContactStyles` &gotoid=`46` !]\r\n', 0, 4, 14, 1, 0, 1, 1144904400, 1, 1159303922, 0, 0, 0, 0, 0, 'Contact us', 0, 0, 0, 0, 0, 0, 0); - - -REPLACE INTO `{PREFIX}site_content` VALUES (7, 'document', 'text/html', '404 - Document Not Found', 'Uh oh ... it''s a 404! (Page Not Found)', '', 'doc-not-found', '', 1, 0, 0, 0, 0, '', '

    Looks like you tried to go somewhere that does not exist... perhaps you need to login or you''d like one of the following pages instead:

    \r\n\r\n[[Wayfinder? &startId=`0` &showDescription=`1`]]\r\n\r\n

    Want to find it the old fashioned way? Use the site search at the top of this site to find what you seek.

    \r\n\r\n', 1, 4, 4, 0, 1, 1, 1144904400, 1, 1159301173, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); - - -REPLACE INTO `{PREFIX}site_content` VALUES (8, 'document', 'text/html', 'Search Results', 'Your Search Results', '', 'search-results', '', 1, 0, 0, 0, 0, '', '[!AjaxSearch? &showInputForm=`0` &ajaxSearch=`0`!]', 0, 4, 5, 0, 0, 1, 1144904400, 1, 1158613055, 0, 0, 0, 0, 0, '', 1, 0, 0, 0, 0, 0, 1); - - -REPLACE INTO `{PREFIX}site_content` VALUES (9, 'document', 'text/html', 'Mini-Blog HOWTO', 'How to Start Posting with MODX Mini-Blogs', '', 'article-1126081344', '', 1, 0, 0, 2, 1, '', '

    Setting up a mini-blog is relatively simple. Here''s what you need to do to get started with making new posts:

    \r\n
      \r\n
    1. Login to the MODX Control Panel.
      2. \r\n
    2. Press the plus-sign next to the Blog(2) container resource to see the blog entries posted there.
      3. \r\n
    3. To make a new Blog entry, simply right-click the Blog container document and choose the "Create Resource here" menu option. To edit an existing blog article, right click the entry and choose the "Edit Resource" menu option.
      4. \r\n \r\n
    4. Write or edit the content and press save, making sure the document is published.
      5. \r\n
    5. Everything else is automatic; you''re done!
      6. \r\n
    \r\n{{Comments}}', 1, 4, 0, 1, 1, -1, 1144904400, 1, 1160171764, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); - - -REPLACE INTO `{PREFIX}site_content` VALUES (11, 'document', 'text/xml', 'RSS Feed', '[(site_name)] RSS Feed', '', 'feed.rss', '', 1, 0, 0, 0, 0, '', '[[Ditto? &parents=`2` &format=`rss` &display=`20` &total=`20` &removeChunk=`Comments`]]', 0, 0, 6, 0, 0, 1, 1144904400, 1, 1160062859, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); +# Dumping data for table `modx_site_content` +# -REPLACE INTO `{PREFIX}site_content` VALUES (14, 'document', 'text/html', 'Content Management', 'Ways to manage content', '', 'cms', '', 1, 0, 0, 15, 0, '', '

    Manage your content in the backend

    \r\n

    The Manager is a skinnable feature-packed tool for admin users. You can add extra users and limit what functions they can access. MODX''s Manager makes creating content and managing templates and reusable elements easy. Modules can be added to work with other datasets or make management tasks easier.

    \r\n

    Manage your content in the frontend

    \r\n

    The QuickEdit bar lets manager users edit content whilst browsing the site. Most content fields and template variables can be edited quickly and easily.

    \r\n

    Enable web users to add content

    \r\n

    Custom data entry is easy to code using the MODX API - so you can design forms and collect whatever information you need.

    ', 0, 4, 3, 1, 1, 1, 1144904400, 1, 1158331927, 0, 0, 0, 0, 0, 'Manage Content', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES ('1','document','text/html','Home','Welcome to MODX','Introduction to MODX','index','','1','0','0','0','0','Create and do amazing things with MODX','

    Install Successful!

    \n

    You have successfully installed and configured MODX. We hope you find this site an adequate starting configuration for many small business, organization or personal websites; just change the template and content, and you\'ll be good to go! This site is preconfigured with a variety of options we hope are helpful, relevant and just plain cool for many marketing or personal sites:

    \n
      \n
    • Simple Blog. When logged into your site, you\'ll be able to create new entries from the front end. This can also be turned into a News publishing or PR publishing system. View example blog
      • \n
    • Easy Comments. When logged into your site, your registered site users can comment on your posts. View example
      • \n
    • RSS Feeds. Your site visitors can stay up to date using your site feeds. View RSS feed
      • \n
    • Automatic User Registration. Those that wish to comment on blogs must first create an account. This comes pre-configured with a \"Captcha\" anti-robot registration feature. View registration form
      • \n
    • QuickEdit. When you\'re logged into the manager, you can edit a page directly from the front end! More about CMS features
      • \n
    • Integrated Site Search. Allows visitors to search only the pages you wish them to search. Uses Ajax to display results without loading a new page.
      • \n
    • Powerful Navigation Builder. Duplicate or build virtually any navigation system with our dynamic menu builder code. The menu above, for example. More about menu features
      • \n
    • Mootools enabled. You\'re on your way to Web 2.0 and AJAX goodness. More about Ajax features
      • \n
    • Custom \"page not found (404)\" page. Help visitors who go astray to find what they\'re looking for. View 404 page
      • \n
    • Contact Us form. A highly configurable contact form you should customize to point to the right email address. Comes pre-configured to prevent mail-form-injection so your site does not become a source for spam. View form
      • \n
    • Newest documents list. Shows your visitor the most recently added pages (configurable).
      • \n
    • Customizable Content Manager. Preview uploaded images, hide or rename fields and lots more. See ManagerManager\'s documentation for details and instructions. Quick start: ManagerManager by default will look for \"rules\" in a Chunk named \"mm_rules\". Simply copy or rename the Chunk named \"mm_demo_rules\" to \"mm_rules\" and try it out!
      • \n
    \n

    To log into the MODX Control Panel and start customizing this site, point your browser to [(site_manager_url)].

    ','1','4','0','1','1','1','1144904400','1','1378084284','0','0','0','0','0','Home','0','0','0','0','0','0','0'); +REPLACE INTO `{PREFIX}site_content` VALUES ('2','document','text/html','Blog','My Blog','','blog','','1','0','0','0','1','','[[Ditto? &parents=`2` &display=`2` &removeChunk=`Comments` &tpl=`ditto_blog` &paginate=`1` &extenders=`summary,dateFilter` &paginateAlwaysShowLinks=`1` &tagData=`documentTags`]]\n\n

    Showing [+start+] - [+stop+] of [+total+] Articles

    \n\n
    [+previous+] [+pages+] [+next+]
    \n\n
     
    \n\n[[Reflect? &config=`wordpress` &dittoSnippetParameters=`parents:2` &id=`wp` &getDocuments=`1`]]','1','4','1','0','0','1','1144904400','1','1159818696','0','0','0','0','0','Blog','0','0','0','0','0','0','0'); -REPLACE INTO `{PREFIX}site_content` VALUES (15, 'document', 'text/html', 'MODX Features', 'MODX Features', '', 'features', '', 1, 0, 0, 0, 1, '', '[[Wayfinder?startId=`[*id*]` &outerClass=`topnav`]]', 1, 4, 7, 1, 1, 1, 1144904400, 1, 1158452722, 0, 0, 0, 1144777367, 1, 'Features', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES ('4','document','text/html','[*loginName*]','Login to Enable to Comments','','login','','1','0','0','0','0','','

    In order to comment on blog entries, you must be a registered user of [(site_name)]. If you haven\'t already registered, you can request an account.

    \n
    [!WebLogin? &tpl=`WebLoginSideBar` &loginhomeid=`2`!]
    ','1','4','9','0','0','1','1144904400','1','1144904400','0','0','0','0','0','[*loginName*]','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('5','document','text/html','Request an Account','Sign Up for Full Site Privileges','','request-an-account','','1','0','0','0','0','','[[WebSignup? &tpl=`FormSignup` &groups=`Registered Users`]]','1','4','7','0','0','1','1144904400','1','1158320704','0','0','0','0','0','','0','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES (16, 'document', 'text/html', 'Ajax', 'Ajax and Web 2.0 ready', '', 'ajax', '', 1, 1159264800, 0, 15, 0, '', 'Ajax ready out-of-the-box\r\n

    MODX empowers users to build engaging sites today, with its pre-integrated Mootools javascript library.

    \r\n\r\n

    Check out the Ajax-powered search in this example site. The libraries are also used with QuickEdit, our front-end editing tool.

    \r\n\r\n

    Smart integration means the scripts are only included in the document head when needed - no unnecessary bloat on simple pages!

    \r\n\r\nWeb 2.0 today\r\n

    MODX makes child''s play of building content managed sites with validating, accessible CSS layouts - so web standards compliance is easy. (You can create a site with excessively nested tables too, if you really want to).

    \r\n', 1, 4, 1, 1, 1, 1, 1144904400, 1, 1159307504, 0, 0, 0, 0, 0, 'Ajax', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES ('6','document','text/html','Contact Us','Contact [(site_name)]','','contact-us','','1','0','0','0','0','','[!eForm? &formid=`ContactForm` &subject=`[+subject+]` &to=`[(emailsender)]` &ccsender=`1` &tpl=`ContactForm` &report=`ContactFormReport` &invalidClass=`invalidValue` &requiredClass=`requiredValue` &cssStyle=`ContactStyles` &gotoid=`46` !]\n','0','4','5','1','0','1','1144904400','1','1159303922','0','0','0','0','0','Contact us','0','0','0','0','0','0','0'); +REPLACE INTO `{PREFIX}site_content` VALUES ('7','document','text/html','404 - Document Not Found','Uh oh ... it\'s a 404! (Page Not Found)','','doc-not-found','','1','0','0','0','0','','

    Looks like you tried to go somewhere that does not exist... perhaps you need to login or you\'d like one of the following pages instead:

    \n\n[[Wayfinder? &startId=`0` &showDescription=`1`]]\n\n

    Want to find it the old fashioned way? Use the site search at the top of this site to find what you seek.

    \n\n','1','4','12','0','1','1','1144904400','1','1159301173','0','0','0','0','0','','0','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES (18, 'document', 'text/html', 'Just a pretend, older post', 'This post should in fact be archived', '', 'article-1128398162', '', 1, 0, 0, 2, 0, '', '

    Not so exciting, after all, eh?

    \r\n', 1, 4, 2, 1, 1, -1, 1144904400, 1, 1159306886, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); +REPLACE INTO `{PREFIX}site_content` VALUES ('8','document','text/html','Search Results','Your Search Results','','search-results','','1','0','0','0','0','','[!AjaxSearch? &showInputForm=`0` &ajaxSearch=`0`!]','0','4','10','0','0','1','1144904400','1','1158613055','0','0','0','0','0','','1','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('9','document','text/html','Mini-Blog HOWTO','How to Start Posting with MODX Mini-Blogs','','article-1126081344','','1','0','0','2','0','','

    Setting up a mini-blog is relatively simple. Here\'s what you need to do to get started with making new posts:

    \n
      \n
    1. Login to the MODX Control Panel.
      2. \n
    2. Press the plus-sign next to the Blog(2) container resource to see the blog entries posted there.
      3. \n
    3. To make a new Blog entry, simply right-click the Blog container document and choose the \"Create Resource here\" menu option. To edit an existing blog article, right click the entry and choose the \"Edit Resource\" menu option.
      4. \n\n
    4. Write or edit the content and press save, making sure the document is published.
      5. \n
    5. Everything else is automatic; you\'re done!
      6. \n
    \n{{Comments}}','1','4','0','1','1','-1','1144904400','1','1378084370','0','0','0','0','0','','0','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES (22, 'document', 'text/html', 'Menus and Lists', 'Flexible Menus and Lists', '', 'menus', '', 1, 1159178400, 0, 15, 0, '', '

    Your documents - listed how you want them

    \r\n

    MODX''s document data structure has been designed to allow many different routines to redisplay the information in ways that suit your needs, such as a dynamic menu in your template.

    \r\n

    Since the last release of MODX, the community has produced many great snippets - reusable functions that you can call in your content or template. Two of the most widely useful are Ditto and Wayfinder.

    \r\n

    Wayfinder - the menu builder

    \r\n

    Allows you to template every part of the menu. On this site, Wayfinder is being used to generate the drop-down menus, but many types of menus and sitemaps are possible.

    \r\n

    Ditto - the document lister

    \r\n

    Uses include listing the most recent blog posts, producing a site map, listing related documents (using a TV filter) and generating an RSS feed. You could even write a menu with it. On this site, Ditto is being used for the blog posts list on the Blog page, and the list on the right of some templates.

    \r\n

    Unlimited Customization

    \r\n

    If you can''t quite get your desired effect using templating and the many options of Ditto and Wayfinder, you can write your own routine, or look for other snippets in the MODX repository. MODX''s fields for Menu Title, summaries, menu position etc can be used via the API to produce anything you can imagine.

    ', 1, 4, 2, 1, 1, 1, 1144904400, 1, 1160148522, 0, 0, 0, 0, 0, 'Menus and Lists', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES ('11','document','text/xml','RSS Feed','[(site_name)] RSS Feed','','feed.rss','','1','0','0','0','0','','[[Ditto? &parents=`2` &format=`rss` &display=`20` &total=`20` &removeChunk=`Comments`]]','0','0','11','0','0','1','1144904400','1','1160062859','0','0','0','0','0','','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('14','document','text/html','Content Management','Ways to manage content','','cms','','1','0','0','15','0','','

    Manage your content in the backend

    \n

    The Manager is a skinnable feature-packed tool for admin users. You can add extra users and limit what functions they can access. MODX\'s Manager makes creating content and managing templates and reusable elements easy. Modules can be added to work with other datasets or make management tasks easier.

    \n

    Manage your content in the frontend

    \n

    The QuickEdit bar lets manager users edit content whilst browsing the site. Most content fields and template variables can be edited quickly and easily.

    \n

    Enable web users to add content

    \n

    Custom data entry is easy to code using the MODX API - so you can design forms and collect whatever information you need.

    ','0','4','3','1','1','1','1144904400','1','1378086298','0','0','0','1378086298','1','Manage Content','0','0','0','0','0','0','0'); -REPLACE INTO `{PREFIX}site_content` VALUES (24, 'document', 'text/html', 'Extendable by design', 'Extendable by design', '', 'extendable', '', 1, 1159092732, 0, 15, 0, '', '

    The MODX community has created many add-ons which can be found in the Repository, from image galleries and e-commerce to smaller utilities.

    \r\n\r\n

    Template Variables with Bindings

    \r\n

    TVs - Template Variables - are powerful extra fields that you can use with your documents. As an example of an advanced template element that returns a different thing dependent on code or data, we created an @BINDING for the name of the Login menu item. This changes the menu name from Login to Logout based on your logged in state. The @BINDING as follows was placed in the default value as:\r\n@EVAL if ($modx->getLoginUserID()) return ''Logout''; else return ''Login'';

    \r\n\r\n

    Using Scriptaculous

    \r\n

    We used some simple effects to highlight various things on the front/home page to demonstrate how easy it is to create a useful way to draw attention to things. To see them in action on the home page, click the Integrated Site Search, Related Links or Newest Documents headers.

    \r\n\r\n

    Custom Forms

    \r\n

    To demonstrate how to link to custom forms, we customized the calls to the Webuser Registration system and the Login system.

    \r\n\r\n

    And more

    \r\n

    Rich Text Editor for blog entries. To make it easier to format blog posts with simple text formatting, we modified the blog to use a custom RTE-enabled Template Variable (TV).

    \r\n\r\n

    Smart-Summary logic. When splitting the full blog/news posts you simply insert a "<!-- splitter -->" where you want the break to occur. In addition, if that leaves any important tags open, it will try to match them and close them so it doesn''t mess up your site layout with unclosed OL, UL or DIV tags.

    ', 1, 4, 4, 1, 1, 2, 1144904400, 1, 1159309971, 0, 0, 0, 0, 0, 'Extendability', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES ('15','document','text/html','MODX Features','MODX Features','','features','','1','0','0','0','1','','[[Wayfinder?startId=`[*id*]` &outerClass=`topnav`]]','1','4','2','1','1','1','1144904400','1','1158452722','0','0','0','1144777367','1','Features','0','0','0','0','0','0','0'); +REPLACE INTO `{PREFIX}site_content` VALUES ('16','document','text/html','Ajax','Ajax and Web 2.0 ready','','ajax','','1','1159264800','0','15','0','','Ajax ready out-of-the-box\n

    MODX empowers users to build engaging sites today, with its pre-integrated Mootools javascript library.

    \n\n

    Check out the Ajax-powered search in this example site. The libraries are also used with QuickEdit, our front-end editing tool.

    \n\n

    Smart integration means the scripts are only included in the document head when needed - no unnecessary bloat on simple pages!

    \n\nWeb 2.0 today\n

    MODX makes child\'s play of building content managed sites with validating, accessible CSS layouts - so web standards compliance is easy. (You can create a site with excessively nested tables too, if you really want to).

    \n','1','4','1','1','1','1','1144904400','1','1159307504','0','0','0','0','0','Ajax','0','0','0','0','0','0','0'); -REPLACE INTO `{PREFIX}site_content` VALUES (32, 'document', 'text/html', 'Design', 'Site Design', '', 'design', '', 1, 0, 0, 0, 0, '', '

    Credits

    \r\n

    The default site''s themes are based off of validating XHTML/CSS designs by Andreas Viklund, ziworks | Web Solutions and MODxHost.

    ', 1, 4, 10, 1, 1, 2, 1144904400, 1, 1160112322, 0, 0, 0, 1144912754, 1, 'Design', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES ('18','document','text/html','Just a pretend, older post','This post should in fact be archived','','article-1128398162','','1','0','0','2','0','','

    Not so exciting, after all, eh?

    \n','1','4','2','1','1','-1','1144904400','1','1159306886','0','0','0','0','0','','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('22','document','text/html','Menus and Lists','Flexible Menus and Lists','','menus','','1','1159178400','0','15','0','','

    Your documents - listed how you want them

    \n

    MODX\'s document data structure has been designed to allow many different routines to redisplay the information in ways that suit your needs, such as a dynamic menu in your template.

    \n

    Since the last release of MODX, the community has produced many great snippets - reusable functions that you can call in your content or template. Two of the most widely useful are Ditto and Wayfinder.

    \n

    Wayfinder - the menu builder

    \n

    Allows you to template every part of the menu. On this site, Wayfinder is being used to generate the drop-down menus, but many types of menus and sitemaps are possible.

    \n

    Ditto - the document lister

    \n

    Uses include listing the most recent blog posts, producing a site map, listing related documents (using a TV filter) and generating an RSS feed. You could even write a menu with it. On this site, Ditto is being used for the blog posts list on the Blog page, and the list on the right of some templates.

    \n

    Unlimited Customization

    \n

    If you can\'t quite get your desired effect using templating and the many options of Ditto and Wayfinder, you can write your own routine, or look for other snippets in the MODX repository. MODX\'s fields for Menu Title, summaries, menu position etc can be used via the API to produce anything you can imagine.

    ','1','4','2','1','1','1','1144904400','1','1160148522','0','0','0','0','0','Menus and Lists','0','0','0','0','0','0','0'); -REPLACE INTO `{PREFIX}site_content` VALUES (33, 'document', 'text/html', 'Getting Help', 'Getting Help with MODX', '', 'geting-help', '', 1, 0, 0, 0, 0, '', '

    The team behind MODX strives to constantly add to and refine the documentation to help you get up to speed with MODX:

    \r\n
      \r\n
    • For basic instructions on integrating custom templates into MODX, please see the Designer''s Guide.
      • \r\n
    • For an introduction to working in MODX from the content editors perspectve, see the Content Editor''s Guide.
      • \r\n
    • For a detailed overview of the backend "manager" and setting up Users and Groups, please peruse the Administration Guide.
      • \r\n
    • For developers, architecture and API documentation can be found in the Developer''s Guide.
      • \r\n
    • And if someone has installed this site for you, but you''re curious as to the steps they went through, please see the Getting Started Guide.
      • \r\n
    \r\n\r\n

    And don''t forget, you can always learn and ask questions at the MODX forums. \r\n', 1, 4, 8, 1, 1, 2, 1144904400, 2, 1144904400, 0, 0, 0, 0, 0, 'Getting Help', 0, 0, 0, 0, 0, 0, 0); +REPLACE INTO `{PREFIX}site_content` VALUES ('24','document','text/html','Extendable by design','Extendable by design','','extendable','','1','1159092732','0','15','0','','

    The MODX community has created many add-ons which can be found in the Repository, from image galleries and e-commerce to smaller utilities.

    \n\n

    Template Variables with Bindings

    \n

    TVs - Template Variables - are powerful extra fields that you can use with your documents. As an example of an advanced template element that returns a different thing dependent on code or data, we created an @BINDING for the name of the Login menu item. This changes the menu name from Login to Logout based on your logged in state. The @BINDING as follows was placed in the default value as:\n@EVAL if ($modx->getLoginUserID()) return \'Logout\'; else return \'Login\';

    \n\n

    Using Scriptaculous

    \n

    We used some simple effects to highlight various things on the front/home page to demonstrate how easy it is to create a useful way to draw attention to things. To see them in action on the home page, click the Integrated Site Search, Related Links or Newest Documents headers.

    \n\n

    Custom Forms

    \n

    To demonstrate how to link to custom forms, we customized the calls to the Webuser Registration system and the Login system.

    \n\n

    And more

    \n

    Rich Text Editor for blog entries. To make it easier to format blog posts with simple text formatting, we modified the blog to use a custom RTE-enabled Template Variable (TV).

    \n\n

    Smart-Summary logic. When splitting the full blog/news posts you simply insert a \"<!-- splitter -->\" where you want the break to occur. In addition, if that leaves any important tags open, it will try to match them and close them so it doesn\'t mess up your site layout with unclosed OL, UL or DIV tags.

    ','1','4','4','1','1','2','1144904400','1','1159309971','0','0','0','0','0','Extendability','0','0','0','0','0','0','0'); +REPLACE INTO `{PREFIX}site_content` VALUES ('32','document','text/html','Design','Site Design','','design','','1','0','0','0','0','','

    Credits

    \n

    The default site\'s themes are based off of validating XHTML/CSS designs by Andreas Viklund, ziworks | Web Solutions and MODxHost.

    ','1','4','4','1','1','2','1144904400','1','1160112322','0','0','0','1144912754','1','Design','0','0','0','0','0','0','0'); -REPLACE INTO `{PREFIX}site_content` VALUES (37, 'document', 'text/html', '[*loginName*]', 'The page you''re trying to reach requires a login', '', 'blog-login', '', 1, 0, 0, 0, 0, '', '

    In order to add a blog entry, you must be logged in as a Site Admin webuser. Also, commenting on posts requires a login. Contact the site owner for permissions to create new post, or create a web user account to automatically receive commenting privileges. If you already have an account, please login below.

    \r\n\r\n[!WebLogin? &tpl=`WebLoginSideBar` &loginhomeid=`3`!]', 1, 4, 12, 0, 0, 1, 1144904400, 1, 1158599931, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 1); +REPLACE INTO `{PREFIX}site_content` VALUES ('33','document','text/html','Getting Help','Getting Help with MODX','','geting-help','','1','0','0','0','0','','

    The team behind MODX strives to constantly add to and refine the documentation to help you get up to speed with MODX:

    \n
      \n
    • For basic instructions on integrating custom templates into MODX, please see the Designer\'s Guide.
      • \n
    • For an introduction to working in MODX from the content editors perspectve, see the Content Editor\'s Guide.
      • \n
    • For a detailed overview of the backend "manager" and setting up Users and Groups, please peruse the Administration Guide.
      • \n
    • For developers, architecture and API documentation can be found in the Developer\'s Guide.
      • \n
    • And if someone has installed this site for you, but you\'re curious as to the steps they went through, please see the Getting Started Guide.
      • \n
    \n\n

    And don\'t forget, you can always learn and ask questions at the MODX forums. \n','1','4','3','1','1','2','1144904400','2','1144904400','0','0','0','0','0','Getting Help','0','0','0','0','0','0','0'); +REPLACE INTO `{PREFIX}site_content` VALUES ('37','document','text/html','[*loginName*]','The page you\'re trying to reach requires a login','','blog-login','','1','0','0','0','0','','

    In order to add a blog entry, you must be logged in as a Site Admin webuser. Also, commenting on posts requires a login. Contact the site owner for permissions to create new post, or create a web user account to automatically receive commenting privileges. If you already have an account, please login below.

    \n\n[!WebLogin? &tpl=`WebLoginSideBar` &loginhomeid=`3`!]','1','4','8','0','0','1','1144904400','1','1158599931','0','0','0','0','0','','0','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES (46, 'document', 'text/html', 'Thank You', '', '', 'thank-you', '', 1, 0, 0, 0, 0, '', '

    Thank You!

    \r\n

    We do appreciate your feedback. Your comments have been submitted to our office and hopefully someone will bother to actually read it. You should also receive a copy of the message in your inbox.

    \r\n

    Please be assured that we will do our best not to ignore you, but if today is a Monday please try again in a few days.

    \r\n', 1, 4, 13, 1, 1, 1, 1159302141, 1, 1159302892, 0, 0, 0, 1159302182, 1, '', 0, 0, 0, 0, 0, 0, 1); +REPLACE INTO `{PREFIX}site_content` VALUES ('46','document','text/html','Thank You','','','thank-you','','1','0','0','0','0','','

    Thank You!

    \n

    We do appreciate your feedback. Your comments have been submitted to our office and hopefully someone will bother to actually read it. You should also receive a copy of the message in your inbox.

    \n

    Please be assured that we will do our best not to ignore you, but if today is a Monday please try again in a few days.

    \n','1','4','6','1','1','1','1159302141','1','1159302892','0','0','0','1159302182','1','','0','0','0','0','0','0','1'); # From d92512469ae8000d45618ac16439b67a808dcaba Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 13:31:11 +0900 Subject: [PATCH 426/530] Bug #10153 Can not update block user status when login http://tracker.modx.com/issues/10153 --- manager/processors/login.processor.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manager/processors/login.processor.php b/manager/processors/login.processor.php index 7d05f4be71..3dbf0aa471 100755 --- a/manager/processors/login.processor.php +++ b/manager/processors/login.processor.php @@ -93,10 +93,11 @@ } // blocked due to number of login errors. if($failedlogins>=$failed_allowed && $blockeduntildate>time()) { - @session_destroy(); - session_unset(); - jsAlert($e->errors[902]); - return; + $modx->db->update('blocked=1','[+prefix+]user_attributes',"internalKey='{$internalKey}'"); + @session_destroy(); + session_unset(); + jsAlert($e->errors[902]); + return; } // blocked due to number of login errors, but get to try again From 97b592665c70ee0fa74ffa631abf3134ad8da59e Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 14:44:11 +0900 Subject: [PATCH 427/530] Fix - Generate base_url in config.inc.php --- install/instprocessor.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/install/instprocessor.php b/install/instprocessor.php index e212c1ab14..0bd8afc33b 100755 --- a/install/instprocessor.php +++ b/install/instprocessor.php @@ -242,10 +242,19 @@ function parseProperties($propertyString) { } else { $script_name= $_SERVER[\'SCRIPT_NAME\']; } - $a= explode("/".MGR_DIR, str_replace("\\\\", "/", dirname($script_name))); + $script_name = str_replace("\\\\", "/", dirname($script_name)); + if(strpos($script_name,MGR_DIR)!==false) + $separator = MGR_DIR; + elseif(strpos($script_name,\'/assets/\')!==false) + $separator = \'assets\'; + else $separator = \'\'; + + if($separator!==\'\') $a= explode(\'/\'.$separator, $script_name); + else $a = array($script_name); + if (count($a) > 1) array_pop($a); - $url= implode(MGR_DIR, $a); + $url= implode($separator, $a); reset($a); $a= explode(MGR_DIR, str_replace("\\\\", "/", dirname(__FILE__))); if (count($a) > 1) From 26b991620e42f0d6bc65df0b16b8a78e7df8f485 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 14:44:52 +0900 Subject: [PATCH 428/530] Refactor #10156 Improvement $modx->getDocuments() parameter value http://tracker.modx.com/issues/10156 --- manager/includes/document.parser.class.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 7d2c333b14..f0930709f2 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -2050,6 +2050,13 @@ function getDocumentChildren($parentid= 0, $published= 1, $deleted= 0, $fields= * @return array|boolean Result array with documents, or false */ function getDocuments($ids= array (), $published= 1, $deleted= 0, $fields= "*", $where= '', $sort= "menuindex", $dir= "ASC", $limit= "") { + if(is_string($ids)) + { + if(strpos($ids,',')!==false) + $ids = explode(',', $ids); + else + $ids = array($ids); + } if (count($ids) == 0) { return false; } else { From 61cae46bcc319c850868262442f46bd46cd77f7b Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 14:45:53 +0900 Subject: [PATCH 429/530] Fix - TinyMCE template button in toolbar --- assets/plugins/tinymce/functions.php | 2 +- assets/plugins/tinymce/js/get_template.php | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index ea347e1184..d6f00c2da7 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -108,7 +108,7 @@ function checked($cond = false) function get_mce_settings() { - global $modx, $_lang; + global $modx, $_lang, $settings, $usersettings; $params = $this->params; $mce_path = $params['mce_path']; diff --git a/assets/plugins/tinymce/js/get_template.php b/assets/plugins/tinymce/js/get_template.php index dc2baa4d4e..9cedf7e898 100644 --- a/assets/plugins/tinymce/js/get_template.php +++ b/assets/plugins/tinymce/js/get_template.php @@ -52,7 +52,7 @@ { $tbl_site_htmlsnippets = $modx->getFullTableName('site_htmlsnippets'); $cid = $_GET['chunk']; - $rs = $modx->db->select('snippet', $tbl_site_htmlsnippets, "`id`='{$cid}' AND published=1"); + $rs = $modx->db->select('snippet', $tbl_site_htmlsnippets, "`id`='{$cid}'"); $content = $modx->db->getValue($rs); if($content) $output = $content; } @@ -60,18 +60,17 @@ { $list = array(); $tpl = "['[+title+]', '[+site_url+]assets/plugins/tinymce/js/get_template.php?[+target+]', '[+description+]']"; - $ph['site_url'] = $modx->config['site_url']; + $ph['site_url'] = MODX_SITE_URL; if(isset($ids) && !empty($ids)) { $docs = $modx->getDocuments($ids, 1, 0, $fields= 'id,pagetitle,menutitle,description,content'); - foreach($docs as $i=>$a) { $ph['title'] = ($docs[$i]['menutitle']!=='') ? $docs[$i]['menutitle'] : $docs[$i]['pagetitle']; $ph['target'] = 'docid=' . $docs[$i]['id']; $ph['description'] = $docs[$i]['description']; - $list[] = $modx->parsePlaceholder($tpl,$ph); + $list[] = parsePlaceholder($tpl,$ph); } } @@ -102,7 +101,7 @@ $ph['title'] = $row['name']; $ph['target'] = 'chunk=' . $row['id']; $ph['description'] = $row['description']; - $list[] = $modx->parsePlaceholder($tpl,$ph); + $list[] = parsePlaceholder($tpl,$ph); } } @@ -116,3 +115,12 @@ header('expires: 0'); echo $output; } + +function parsePlaceholder($tpl,$ph) { + foreach($ph as $k=>$v) { + $k = "[+{$k}+]"; + if(strpos($tpl,$k)!==false) + $tpl = str_replace($k,$v,$tpl); + } + return $tpl; +} \ No newline at end of file From 727186bcfccaa79ac445ec3a91ce29ee702886c8 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 2 Sep 2013 09:07:29 +0300 Subject: [PATCH 430/530] fix css warning --- manager/media/style/MODxRE/login.tpl | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/manager/media/style/MODxRE/login.tpl b/manager/media/style/MODxRE/login.tpl index 31f705864f..236ec0ca6f 100644 --- a/manager/media/style/MODxRE/login.tpl +++ b/manager/media/style/MODxRE/login.tpl @@ -19,9 +19,9 @@ background: #FEFEFE; padding: 25px 0 0 20px; overflow: hidden; - -webkit-box-shadow: 0px 0px 5px rgba(50, 50, 50, 0.2); - -moz-box-shadow: 0px 0px 5px rgba(50, 50, 50, 0.2); - box-shadow: 0px 0px 5px rgba(50, 50, 50, 0.2); + -webkit-box-shadow: 0 0 5px rgba(50, 50, 50, 0.2); + -moz-box-shadow: 0 0 5px rgba(50, 50, 50, 0.2); + box-shadow: 0 0 5px rgba(50, 50, 50, 0.2); -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -49,15 +49,15 @@ -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; - -webkit-box-shadow: 0px 0px 5px rgba(188, 188, 188, 0.2); - -moz-box-shadow: 0px 0px 5px rgba(188, 188, 188, 0.2); - box-shadow: 0px 0px 5px rgba(188, 188, 188, 0.2); + -webkit-box-shadow: 0 0 5px rgba(188, 188, 188, 0.2); + -moz-box-shadow: 0 0 5px rgba(188, 188, 188, 0.2); + box-shadow: 0 0 5px rgba(188, 188, 188, 0.2); } .sectionBody .text:focus { border: 1px solid #DECBA5; - -webkit-box-shadow: 0px 0px 5px rgba(222, 203, 165, 0.5); - -moz-box-shadow: 0px 0px 5px rgba(222, 203, 165, 0.5); - box-shadow: 0px 0px 5px rgba(222, 203, 165, 0.5); + -webkit-box-shadow: 0 0 5px rgba(222, 203, 165, 0.5); + -moz-box-shadow: 0 0 5px rgba(222, 203, 165, 0.5); + box-shadow: 0 0 5px rgba(222, 203, 165, 0.5); } #rememberme { float: left; @@ -102,15 +102,15 @@ -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; - -webkit-box-shadow: 0px 0px 5px rgba(188, 188, 188, 0.2); - -moz-box-shadow: 0px 0px 5px rgba(188, 188, 188, 0.2); - box-shadow: 0px 0px 5px rgba(188, 188, 188, 0.2); + -webkit-box-shadow: 0 0 5px rgba(188, 188, 188, 0.2); + -moz-box-shadow: 0 0 5px rgba(188, 188, 188, 0.2); + box-shadow: 0 0 5px rgba(188, 188, 188, 0.2); } #FMP-email:focus { border: 1px solid #DECBA5; - -webkit-box-shadow: 0px 0px 5px rgba(222, 203, 165, 0.5); - -moz-box-shadow: 0px 0px 5px rgba(222, 203, 165, 0.5); - box-shadow: 0px 0px 5px rgba(222, 203, 165, 0.5); + -webkit-box-shadow: 0 0 5px rgba(222, 203, 165, 0.5); + -moz-box-shadow: 0 0 5px rgba(222, 203, 165, 0.5); + box-shadow: 0 0 5px rgba(222, 203, 165, 0.5); } #FMP-email_button { border: 0 none; From be123c71a87684c8debd5dcc7e8039ed586d7ab7 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 2 Sep 2013 10:42:31 +0300 Subject: [PATCH 431/530] fix category for phpthumb --- install/assets/snippets/phpthumb.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/snippets/phpthumb.tpl b/install/assets/snippets/phpthumb.tpl index e4bade1492..8a235c0410 100644 --- a/install/assets/snippets/phpthumb.tpl +++ b/install/assets/snippets/phpthumb.tpl @@ -8,7 +8,7 @@ * @version 1.1 * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) * @internal @properties - * @internal @modx_category add + * @internal @modx_category Content * @internal @installset base, sample * @author Bumkaka */ From 20b6cc110a99a8492c7f57a05e388cb0b97dac09 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 2 Sep 2013 12:04:47 +0300 Subject: [PATCH 432/530] fix % in KCFinder translate --- manager/media/browser/mcpuk/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/media/browser/mcpuk/config.php b/manager/media/browser/mcpuk/config.php index 4d2a924cbf..ecb6169c04 100644 --- a/manager/media/browser/mcpuk/config.php +++ b/manager/media/browser/mcpuk/config.php @@ -68,11 +68,11 @@ 'filenameChangeChars' => array("а"=>"a","б"=>"b","в"=>"v","г"=>"g","д"=>"d","е"=>"e","ё"=>"yo","ж"=>"zh","з"=>"z","и"=>"i","й"=>"j","к"=>"k","л"=>"l","м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r","с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h","ц"=>"c","ч"=>"ch","ш"=>"sh","щ"=>"shh","ы"=>"i","э"=>"e","ю"=>"yu","я"=>"ya", "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G","Д"=>"D","Е"=>"E","Ё"=>"Yo","Ж"=>"Zh", "З"=>"Z","И"=>"I","Й"=>"J","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N","О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T","У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"C","Ч"=>"Ch","Ш"=>"Sh","Щ"=>"Shh","Ы"=>"I","Э"=>"E","Ю"=>"Yu","Я"=>"Ya", - "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-", "[" =>"(", "]" =>")"), + "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-", "[" =>"(", "]" =>")", "%" => ""), 'dirnameChangeChars' => array("а"=>"a","б"=>"b","в"=>"v","г"=>"g","д"=>"d","е"=>"e","ё"=>"yo","ж"=>"zh","з"=>"z","и"=>"i","й"=>"j","к"=>"k","л"=>"l","м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r","с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h","ц"=>"c","ч"=>"ch","ш"=>"sh","щ"=>"shh","ы"=>"i","э"=>"e","ю"=>"yu","я"=>"ya", "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G","Д"=>"D","Е"=>"E","Ё"=>"Yo","Ж"=>"Zh", "З"=>"Z","И"=>"I","Й"=>"J","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N","О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T","У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"C","Ч"=>"Ch","Ш"=>"Sh","Щ"=>"Shh","Ы"=>"I","Э"=>"E","Ю"=>"Yu","Я"=>"Ya", - "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-", "[" =>"(", "]" =>")"), + "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-", "[" =>"(", "]" =>")", "%" => ""), 'mime_magic' => "", From 65373d6eb13d883ea5168828ff8755bd0b58ee3f Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 19:52:42 +0900 Subject: [PATCH 433/530] Small fix - MODxRE/style.css --- manager/media/style/MODxRE/style.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manager/media/style/MODxRE/style.css b/manager/media/style/MODxRE/style.css index bc7a99d5a4..c2299a74ad 100644 --- a/manager/media/style/MODxRE/style.css +++ b/manager/media/style/MODxRE/style.css @@ -274,7 +274,7 @@ optgroup option { } form select { - background: #FFF; + background: #F9F9F9; border-color: #AAAAAA #DEDEDE #DEDEDE #AAAAAA; border-style: solid; border-width: 1px; @@ -1780,8 +1780,10 @@ input:focus.DatePicker, #mutate input:focus.DatePicker, #userPane input:focus.Da /* Custom */ /* normalize some td paddings */ #tabTemplate tbody td, -.sectionBody td { +.sectionBody td, +.sectionBody th { padding: 1px 5px; + text-align:left; } /* replace warning red color in tabs */ strong[style*='color:#EF1D1D'] { @@ -1792,3 +1794,5 @@ strong[style*='color:#EF1D1D'] { } #tabEvents table, #tabEvents td {padding:2px;} + +code {font-size:inherit;font-family: 'Courier New','Courier', monospace;background-color:#eee;border:1px solid #ccc;padding:1px 2px;} From 9ad3afeb2aea15e693d82b6cdeec8e77450f6acf Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 19:54:44 +0900 Subject: [PATCH 434/530] Fix - Elements edit screen tab fields (Templates and TVs) --- manager/actions/mutate_templates.dynamic.php | 64 +++++++------- manager/actions/mutate_tmplvars.dynamic.php | 91 ++++++++++---------- 2 files changed, 75 insertions(+), 80 deletions(-) diff --git a/manager/actions/mutate_templates.dynamic.php b/manager/actions/mutate_templates.dynamic.php index 71ecdc917f..ed28c7e350 100644 --- a/manager/actions/mutate_templates.dynamic.php +++ b/manager/actions/mutate_templates.dynamic.php @@ -132,9 +132,36 @@ function deletedocument() { ' . $_lang['template_msg'] . '
    '; ?> - - + + + + + + + + + + + + + + +hasPermission('save_role')):?> + + + +
    ::
    :
    : +
    :
    @@ -181,40 +208,11 @@ function deletedocument() { } echo $tvList; ?>
    -
    -

    - - - - - - - - - - - - - - - - - -
    :
    : -
    :
    class="inputBox">
    invokeEvent("OnTempFormRender",array("id" => $id)); if(is_array($evtOut)) echo implode("",$evtOut); ?> -
    +
    + diff --git a/manager/actions/mutate_tmplvars.dynamic.php b/manager/actions/mutate_tmplvars.dynamic.php index b202d60a7d..219531f821 100644 --- a/manager/actions/mutate_tmplvars.dynamic.php +++ b/manager/actions/mutate_tmplvars.dynamic.php @@ -294,17 +294,44 @@ function decode(s){

    - - + + - - + + + + + + + + + + + +hasPermission('save_role')):?> + + + + + + + - - + - - + + - - + + - - + - - + + - - + +
    :[* *]   :[* *]   
    ::
    : +
    :
    :
    :  :  
    : " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />: " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />
    :  " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />:  " onmouseover="this.src='';" onmouseout="this.src='';" alt="" onclick="alert(this.alt);" style="cursor:help" />
    :   + :  
    <?php echo $_lang['tmplvars_reset_params']; ?>
    		 
    <?php echo $_lang['tmplvars_reset_params']; ?>
    		 
    :  :  
    @@ -376,43 +403,13 @@ function decode(s){

    -
    - - - - - - - - - - - - - - - - -
    :
    : -
    :
    -
    -

    - +
    db->select('id,templatename,tmplvarid',$from); From b04cdc0066a340abd420d3e3036b96d1fa325c36 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 21:30:52 +0900 Subject: [PATCH 435/530] Fix - Elements edit screen tab fields (remain) --- .../actions/mutate_htmlsnippet.dynamic.php | 68 +++++++-------- manager/actions/mutate_plugin.dynamic.php | 86 +++++++++---------- manager/actions/mutate_snippet.dynamic.php | 72 ++++++++-------- 3 files changed, 107 insertions(+), 119 deletions(-) diff --git a/manager/actions/mutate_htmlsnippet.dynamic.php b/manager/actions/mutate_htmlsnippet.dynamic.php index 23dc1f1388..045c497659 100644 --- a/manager/actions/mutate_htmlsnippet.dynamic.php +++ b/manager/actions/mutate_htmlsnippet.dynamic.php @@ -163,8 +163,36 @@ function deletedocument() {

    - - + + + + + + + + + + + + + +hasPermission('save_role')):?> + + +
    {{ }} 
    {{ }} 
    +
    +
    @@ -191,42 +219,6 @@ function deletedocument() {
    - -
    -

    - -
    - - - - - - - - - - - - - - -
    -
    class="inputBox" value="on" /> -
    -
    -
    -

    - +
    + + + + + + + + + + + + + + + + +hasPermission('save_role')):?> - - + +
    : 
    :  
    :   +
    :
    : 
    @@ -331,9 +358,12 @@ function decode(s){

    + + + - - + - + - - + + - - + +
    ":$_lang['plugin_disabled']; ?>
    :  :  
     
    :
    		:
        
    @@ -435,42 +465,6 @@ function echoEventRows(&$evtnames) {
    - -
    -

    - - - - - - - - - - - - - - - - - - - - -
    ":$_lang['plugin_disabled']; ?>
    :  
    :   -
    :
    value="on" class="inputBox">
    -
    -
    diff --git a/manager/actions/mutate_snippet.dynamic.php b/manager/actions/mutate_snippet.dynamic.php index 0ae491a2c2..5ce2d6a75e 100644 --- a/manager/actions/mutate_snippet.dynamic.php +++ b/manager/actions/mutate_snippet.dynamic.php @@ -307,11 +307,38 @@ function decode(s){

    - +
    + + + + + + + + + + + + + + + + +hasPermission('save_role')):?> - - + +
    :[[  ]] 
    +
    :
    :[[  ]] 
    @@ -332,33 +359,8 @@ function decode(s){ - - - - - - - - - - - - - - - - - + - + - - + + - - + +
    class="inputBox">
    -
    :
     
    ::
        
    From b07f40cbd8362fe94cb14001236a1fab2285db12 Mon Sep 17 00:00:00 2001 From: yama Date: Mon, 2 Sep 2013 21:31:12 +0900 Subject: [PATCH 436/530] Fix - tinymce/functions.php --- assets/plugins/tinymce/functions.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index d6f00c2da7..b0a4b5b3b6 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -50,7 +50,7 @@ function get_lang($lang) function get_skin_names() { - global $modx,$_lang; + global $modx, $_lang, $usersettings, $settings; $params = $this->params; $mce_path = $params['mce_path']; @@ -108,8 +108,8 @@ function checked($cond = false) function get_mce_settings() { - global $modx, $_lang, $settings, $usersettings; - $params = $this->params; + global $modx, $_lang, $usersettings, $settings; + $params = & $this->params; $mce_path = $params['mce_path']; switch ($modx->manager->action) @@ -132,7 +132,6 @@ function get_mce_settings() $mce_settings = $settings; break; } - $params['theme'] = $mce_settings['tinymce_editor_theme']; $params['mce_editor_skin'] = $mce_settings['mce_editor_skin']; $params['mce_entermode'] = $mce_settings['mce_entermode']; @@ -232,7 +231,7 @@ function get_mce_settings() function get_mce_script() { global $modx, $_lang; - $params = $this->params; + $params = & $this->params; $mce_path = $params['mce_path']; $mce_url = $params['mce_url']; From 57da0cfe8d27890c28664bffe529542ceff01544 Mon Sep 17 00:00:00 2001 From: Dmi3yy Date: Mon, 2 Sep 2013 16:22:15 +0300 Subject: [PATCH 437/530] fix translit in kcfinder --- manager/media/browser/mcpuk/config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manager/media/browser/mcpuk/config.php b/manager/media/browser/mcpuk/config.php index ecb6169c04..e41817674a 100644 --- a/manager/media/browser/mcpuk/config.php +++ b/manager/media/browser/mcpuk/config.php @@ -67,12 +67,12 @@ ), 'filenameChangeChars' => array("а"=>"a","б"=>"b","в"=>"v","г"=>"g","д"=>"d","е"=>"e","ё"=>"yo","ж"=>"zh","з"=>"z","и"=>"i","й"=>"j","к"=>"k","л"=>"l","м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r","с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h","ц"=>"c","ч"=>"ch","ш"=>"sh","щ"=>"shh","ы"=>"i","э"=>"e","ю"=>"yu","я"=>"ya", - "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G","Д"=>"D","Е"=>"E","Ё"=>"Yo","Ж"=>"Zh", "З"=>"Z","И"=>"I","Й"=>"J","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N","О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T","У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"C","Ч"=>"Ch","Ш"=>"Sh","Щ"=>"Shh","Ы"=>"I","Э"=>"E","Ю"=>"Yu","Я"=>"Ya", - "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-", "[" =>"(", "]" =>")", "%" => ""), + "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G","Д"=>"D","Е"=>"E","Ё"=>"Yo","Ж"=>"Zh", "З"=>"Z","И"=>"I","Й"=>"J","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N","О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T","У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"C","Ч"=>"Ch","Ш"=>"Sh","Щ"=>"Shh","Ы"=>"I","Э"=>"E","Ю"=>"Yu","Я"=>"Ya", + "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-","%"=>'-',"ї"=>"yi","Ї"=>"yi","є"=>"ye","Є"=>"ye","і"=>"i","І"=>"i","ґ"=>"g","Ґ"=>"g"), 'dirnameChangeChars' => array("а"=>"a","б"=>"b","в"=>"v","г"=>"g","д"=>"d","е"=>"e","ё"=>"yo","ж"=>"zh","з"=>"z","и"=>"i","й"=>"j","к"=>"k","л"=>"l","м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r","с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h","ц"=>"c","ч"=>"ch","ш"=>"sh","щ"=>"shh","ы"=>"i","э"=>"e","ю"=>"yu","я"=>"ya", - "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G","Д"=>"D","Е"=>"E","Ё"=>"Yo","Ж"=>"Zh", "З"=>"Z","И"=>"I","Й"=>"J","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N","О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T","У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"C","Ч"=>"Ch","Ш"=>"Sh","Щ"=>"Shh","Ы"=>"I","Э"=>"E","Ю"=>"Yu","Я"=>"Ya", - "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-", "[" =>"(", "]" =>")", "%" => ""), + "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G","Д"=>"D","Е"=>"E","Ё"=>"Yo","Ж"=>"Zh", "З"=>"Z","И"=>"I","Й"=>"J","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N","О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T","У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"C","Ч"=>"Ch","Ш"=>"Sh","Щ"=>"Shh","Ы"=>"I","Э"=>"E","Ю"=>"Yu","Я"=>"Ya", + "ь"=>"","Ь"=>"","ъ"=>"","Ъ"=>""," "=>"-","№"=>"N","+"=>"-",":"=>"-",";"=>"-","!"=>"-","?"=>"-","&"=>"and","\'" =>"", "=" =>"-","%"=>'-',"ї"=>"yi","Ї"=>"yi","є"=>"ye","Є"=>"ye","і"=>"i","І"=>"i","ґ"=>"g","Ґ"=>"g"), 'mime_magic' => "", From 0db04252af34c7296b8adcb5eb18be763762f8ab Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 3 Sep 2013 00:48:35 +0900 Subject: [PATCH 438/530] Feature #10160 email notifies of system error http://tracker.modx.com/issues/10160 --- manager/actions/mutate_settings.dynamic.php | 24 ++++++++++++++++ .../includes/document.parser.class.inc.php | 19 ++++++++----- .../extenders/dbapi.mysql.class.inc.php | 28 ++++++++++++++++++- manager/includes/lang/english.inc.php | 4 +++ manager/includes/lang/japanese-utf8.inc.php | 4 +++ 5 files changed, 71 insertions(+), 8 deletions(-) diff --git a/manager/actions/mutate_settings.dynamic.php b/manager/actions/mutate_settings.dynamic.php index b97834eb16..8720688ea6 100644 --- a/manager/actions/mutate_settings.dynamic.php +++ b/manager/actions/mutate_settings.dynamic.php @@ -853,6 +853,18 @@ function confirmLangChange(el, lkey, elupd){
    +
    + + + + +
    +
    +
    +
    +$modx->config['emailsender']));?> + +
      @@ -1794,3 +1806,15 @@ function form_radio($name,$value,$checked=false,$add='',$disabled=false) { function wrap_label($str='',$object) { return ""; } + +function parsePlaceholder($tpl='', $ph=array()) +{ + if(empty($ph) || empty($tpl)) return $tpl; + + foreach($ph as $k=>$v) + { + $k = "[+{$k}+]"; + $tpl = str_replace($k, $v, $tpl); + } + return $tpl; +} \ No newline at end of file diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index f0930709f2..06476a1abf 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -1774,16 +1774,21 @@ function logEvent($evtid, $type, $msg, $source= 'Parser') { $LoginUserID = $this->getLoginUserID(); if ($LoginUserID == '') $LoginUserID = 0; $evtid= intval($evtid); - $type=(int)$type; - if ($type < 1) { - $type= 1; - } - elseif ($type > 3) { - $type= 3; // Types: 1 = information, 2 = warning, 3 = error - } + $type = intval($type); + if ($type < 1) $type= 1; // Types: 1 = information, 2 = warning, 3 = error + if (3 < $type) $type= 3; $sql= "INSERT INTO " . $this->getFullTableName("event_log") . " (eventid,type,createdon,source,description,user) " . "VALUES($evtid,$type," . time() . ",'$source','$msg','" . $LoginUserID . "')"; $ds= @$this->db->query($sql); + if(!$this->db->conn) $source = 'DB connect error'; + if(isset($this->config['send_errormail']) && $this->config['send_errormail'] !== '0') + { + if($this->config['send_errormail'] <= $type) + { + $subject = 'Error mail from ' . $this->config['site_name']; + $this->sendmail($subject,$source); + } + } if (!$ds) { echo "Error while inserting event log into database."; exit(); diff --git a/manager/includes/extenders/dbapi.mysql.class.inc.php b/manager/includes/extenders/dbapi.mysql.class.inc.php index 5c6cad63cc..13fa51d32a 100644 --- a/manager/includes/extenders/dbapi.mysql.class.inc.php +++ b/manager/includes/extenders/dbapi.mysql.class.inc.php @@ -86,7 +86,33 @@ function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) { $charset = $this->config['charset']; $connection_method = $this->config['connection_method']; $tstart = $modx->getMicroTime(); - if (!$this->conn = ($persist ? mysql_pconnect($host, $uid, $pwd) : mysql_connect($host, $uid, $pwd, true))) { + $safe_count = 0; + while(!$this->conn && $safe_count<3) + { + if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd); + else $this->conn = mysql_connect($host, $uid, $pwd, true); + + if(!$this->conn) + { + if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0') + { + if($modx->config['send_errormail'] <= 2) + { + $logtitle = 'Failed to create the database connection!'; + $request_uri = $_SERVER['REQUEST_URI']; + $request_uri = htmlspecialchars($request_uri, ENT_QUOTES); + $ua = htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES); + $referer = htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES); + $subject = 'Missing to create the database connection! from ' . $modx->config['site_name']; + $msg = "{$logtitle}
    {$request_uri}
    {$ua}
    {$referer}"; + $modx->sendmail($subject,$msg); + } + } + sleep(1); + $safe_count++; + } + } + if (!$this->conn) { $modx->messageQuit("Failed to create the database connection!"); exit; } else { diff --git a/manager/includes/lang/english.inc.php b/manager/includes/lang/english.inc.php index 1f84d2f499..20c8f93481 100755 --- a/manager/includes/lang/english.inc.php +++ b/manager/includes/lang/english.inc.php @@ -1223,3 +1223,7 @@ $_lang["export_site.static.php5"] = 'Replace string (after)'; $_lang["export_site.static.php6"] = 'Target'; $_lang["export_site.static.php7"] = 'Files cannot be outputted to [+rb_base_url+]'; + +$_lang["mutate_settings.dynamic.php6"] = 'email notifies system error.'; +$_lang["mutate_settings.dynamic.php7"] = 'not notify'; +$_lang["mutate_settings.dynamic.php8"] = 'It notifies to [(emailsender)]([+emailsender+]) at the time of error generating. The details of the contents of the error should check an event log.'; diff --git a/manager/includes/lang/japanese-utf8.inc.php b/manager/includes/lang/japanese-utf8.inc.php index c8ee537fc7..aff5e49873 100755 --- a/manager/includes/lang/japanese-utf8.inc.php +++ b/manager/includes/lang/japanese-utf8.inc.php @@ -1200,3 +1200,7 @@ $_lang["user_street"] = '番地'; $_lang["user_city"] = '市区町村'; $_lang["user_other"] = 'その他'; + +$_lang["mutate_settings.dynamic.php6"] = 'システムエラーを
    メールで通知する'; +$_lang["mutate_settings.dynamic.php7"] = '通知しない'; +$_lang["mutate_settings.dynamic.php8"] = 'エラー発生時に[(emailsender)]([+emailsender+])に通知します。エラーの内容の詳細はイベントログを確認してください。'; From 796c1b8c9331e792f752fca6a7ebf1f786a07a2e Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 3 Sep 2013 01:00:29 +0900 Subject: [PATCH 439/530] Fix --- manager/actions/mutate_settings.dynamic.php | 2 +- manager/includes/config_check.inc.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manager/actions/mutate_settings.dynamic.php b/manager/actions/mutate_settings.dynamic.php index 8720688ea6..638fda21bc 100644 --- a/manager/actions/mutate_settings.dynamic.php +++ b/manager/actions/mutate_settings.dynamic.php @@ -854,7 +854,7 @@ function confirmLangChange(el, lkey, elupd){
    - + diff --git a/manager/includes/config_check.inc.php b/manager/includes/config_check.inc.php index 0043e2bc41..1be9a81ad1 100755 --- a/manager/includes/config_check.inc.php +++ b/manager/includes/config_check.inc.php @@ -143,17 +143,18 @@ function checkSiteCache() { if ($warningspresent==1) { +if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3'; $config_check_results = "

    ".$_lang['configcheck_notok']."

    "; for ($i=0;$ilogEvent(0,2,$warnings[$i][1],$_lang['configcheck_configinc']); + if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']); break; case $_lang['configcheck_installer'] : $warnings[$i][1] = $_lang['configcheck_installer_msg']; - if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_installer']); + if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']); break; case $_lang['configcheck_cache'] : $warnings[$i][1] = $_lang['configcheck_cache_msg']; @@ -165,7 +166,7 @@ function checkSiteCache() { break; case $_lang['configcheck_sysfiles_mod']: $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"]; - if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_sysfiles_mod']); + if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_sysfiles_mod']); break; case $_lang['configcheck_lang_difference'] : $warnings[$i][1] = $_lang['configcheck_lang_difference_msg']; From c471867d9bb107d04f9b719eb424fa33b2104570 Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 3 Sep 2013 14:56:38 +0900 Subject: [PATCH 440/530] Fix - TinyMCE documentDirty check --- assets/plugins/tinymce/functions.php | 2 +- assets/plugins/tinymce/settings/toolbar.settings.inc.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/plugins/tinymce/functions.php b/assets/plugins/tinymce/functions.php index b0a4b5b3b6..ad24aa956e 100644 --- a/assets/plugins/tinymce/functions.php +++ b/assets/plugins/tinymce/functions.php @@ -435,7 +435,7 @@ function build_mce_init($plugins,$buttons1,$buttons2,$buttons3,$buttons4) $ph['date_format'] = $modx->toDateFormat(null, 'formatOnly'); $ph['time_format'] = '%H:%M:%S'; $ph['entity_encoding'] = $params['entity_encoding']; - $ph['onchange_callback'] = "'OnChangeHandler'"; + $ph['onchange_callback'] = 'false'; $ph['terminate'] = (!empty($params['customparams'])) ? ',' : ''; $ph['customparams'] = rtrim($params['customparams'], ','); $content_css[] = "{$mce_url}style/content.css"; diff --git a/assets/plugins/tinymce/settings/toolbar.settings.inc.php b/assets/plugins/tinymce/settings/toolbar.settings.inc.php index cf62c9f172..d06578d1ce 100644 --- a/assets/plugins/tinymce/settings/toolbar.settings.inc.php +++ b/assets/plugins/tinymce/settings/toolbar.settings.inc.php @@ -5,18 +5,18 @@ $set['simple']['b4'] = ''; $set['simple']['b4'] = ''; -$set['creative']['p'] = 'autolink,inlinepopups,autosave,advlist,layer,style,fullscreen,advimage,advhr,paste,advlink,media,contextmenu,table,youtubeIframe'; +$set['creative']['p'] = 'save,autolink,inlinepopups,autosave,advlist,layer,style,fullscreen,advimage,advhr,paste,advlink,media,contextmenu,table,youtubeIframe'; $set['creative']['b1'] = 'undo,undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,styleselect,fontsizeselect,code'; $set['creative']['b2'] = 'image,media,youtubeIframe,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,advhr,|,styleprops,removeformat,|,pastetext,pasteword'; $set['creative']['b3'] = 'insertlayer,absolute,moveforward,movebackward,|,tablecontrols,|,fullscreen,help'; $set['creative']['b4'] = ''; -$set['logic']['p'] = 'autolink,inlinepopups,autosave,advlist,xhtmlxtras,style,fullscreen,advimage,paste,advlink,media,contextmenu,table,youtubeIframe'; +$set['logic']['p'] = 'save,autolink,inlinepopups,autosave,advlist,xhtmlxtras,style,fullscreen,advimage,paste,advlink,media,contextmenu,table,youtubeIframe'; $set['logic']['b1'] = 'undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,styleselect,fontsizeselect,code,|,fullscreen,help'; $set['logic']['b2'] = 'image,media,youtubeIframe,link,unlink,anchor,|,bullist,numlist,|,blockquote,outdent,indent,|,justifyleft,justifycenter,justifyright,|,table,|,hr,|,styleprops,removeformat,|,pastetext,pasteword'; $set['logic']['b3'] = 'charmap,sup,sub,|,cite,ins,del,abbr,acronym,attribs'; -$set['legacy']['p'] = 'autosave,advlist,style,advimage,advlink,searchreplace,print,contextmenu,paste,fullscreen,nonbreaking,xhtmlxtras,visualchars,media,youtubeIframe'; +$set['legacy']['p'] = 'save,autosave,advlist,style,advimage,advlink,searchreplace,print,contextmenu,paste,fullscreen,nonbreaking,xhtmlxtras,visualchars,media,youtubeIframe'; $set['legacy']['b1'] = 'undo,redo,selectall,|,pastetext,pasteword,|,search,replace,|,nonbreaking,hr,charmap,|,image,link,unlink,anchor,media,youtubeIframe,|,cleanup,removeformat,|,fullscreen,print,code,help'; $set['legacy']['b2'] = 'bold,italic,underline,strikethrough,sub,sup,|,blockquote,|,bullist,numlist,outdent,indent,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,|,styleprops'; $set['legacy']['b3'] = ''; @@ -34,7 +34,7 @@ $set['full']['b3'] = 'tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen'; $set['full']['b4'] = 'insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft'; -$set['default']['p'] = 'template,visualblocks,autolink,inlinepopups,autosave,save,advlist,style,fullscreen,advimage,paste,advlink,media,contextmenu,table,youtubeIframe'; +$set['default']['p'] = 'visualblocks,template,autolink,inlinepopups,autosave,save,advlist,style,fullscreen,advimage,paste,advlink,media,contextmenu,table,youtubeIframe'; $set['default']['b1'] = 'undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,fontsizeselect,pastetext,pasteword,code,template,|,fullscreen,help'; $set['default']['b2'] = 'image,media,youtubeIframe,link,unlink,anchor,|,justifyleft,justifycenter,justifyright,|,bullist,numlist,|,blockquote,outdent,indent,|,table,hr,|,visualblocks,styleprops,removeformat'; $set['default']['b3'] = ''; From af0c5a4556e35ae31f0fde53b1d357a3821e350b Mon Sep 17 00:00:00 2001 From: yama Date: Tue, 3 Sep 2013 14:57:44 +0900 Subject: [PATCH 441/530] Fix - Login box width issue for example, German language --- manager/media/style/MODxRE/login.tpl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/manager/media/style/MODxRE/login.tpl b/manager/media/style/MODxRE/login.tpl index 236ec0ca6f..9eedb12eef 100644 --- a/manager/media/style/MODxRE/login.tpl +++ b/manager/media/style/MODxRE/login.tpl @@ -6,6 +6,7 @@