diff -Naurw webform_old/CHANGELOG.txt webform/CHANGELOG.txt --- webform_old/CHANGELOG.txt 1970-01-01 01:00:00.000000000 +0100 +++ webform/CHANGELOG.txt 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,37 @@ +Webform 2.x Changelog +--------------------- + +2.x to 3.0 +---------- +- Module directory structure moved around. +- Webform configuration moved to an entirely separate tab. +- E-mail templates are now editable by administrators. +- Conditional fields. +- Submissions may be saved as a draft and resumed later. +- Webform may now be attached to any content type. +- Public API for allowing other modules to provide components. +- Public API for interacting with submission save, insert, update, and delete. +- New rendering capabilities for HTML presentation of submissions and e-mails. +- Print module support. +- Basic Views module support. +- Popup calendar support on Date components (with Date Popup module). +- New Mollom module integration. + +1.x to 2.0 +---------- +- Redirect POST option removed. +- Webform components moved to the "Form components" tab when editing. +- Webform node structure changed. All webform additions to the node are placed in $node->webform. +- Clone option added to components. +- Database storage improved to be more consistent and efficient. +- Additional e-mails may be sent by modifying the $node->webform['additional_emails'] variable in the Additional Validation field. +- The values of select and hidden fields may receive e-mails by using the option in Conditional e-mail recipients field. +- E-mail from name, from address, and from subject may be entered in a text field. +- The complete webform may be shown in the teaser view of a node. +- Submit button text may be changed. +- Theme function theme_webform_create_mailmessage() has been renamed to theme_webform_mail_message(). +- $cid parameter added to theme_webform_mail_message() to create unique e-mails depending on a particular recipient or component. +- Theme function theme_webform_mail_headers added. +- Component descriptions are textareas rather than textfields. +- _webform_filtervalues() has been renamed to _webform_filter_values. + diff -Naurw webform_old/LICENSE.txt webform/LICENSE.txt --- webform_old/LICENSE.txt 1970-01-01 01:00:00.000000000 +0100 +++ webform/LICENSE.txt 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser 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 + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Naurw webform_old/README.txt webform/README.txt --- webform_old/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ webform/README.txt 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,41 @@ +Description +----------- +This module adds a webform content type to your Drupal site. +A webform can be a questionnaire, contact or request form. These can be used +by visitor to make contact or to enable a more complex survey than polls +provide. Submissions from a webform are saved in a database table and +can optionally be mailed to e-mail addresses upon submission. + +Requirements +------------ +Drupal 7.x + +Installation +------------ +1. Copy the entire webform directory the Drupal sites/all/modules directory. + +2. Login as an administrator. Enable the module in the "Administer" -> "Modules" + +3. (Optional) Edit the settings under "Administer" -> "Configuration" -> + "Content authoring" -> "Webform settings" + +4. Create a webform node at node/add/webform. + +Upgrading from previous versions +-------------------------------- +Note that if you are upgrading from a Drupal 6 installation of Webform, you MUST +have been running Webform 3.x on your Drupal 6 site before upgrading to Drupal +7 and Webform 3.x. You cannot upgrade directly from Webform 6.x-2.x to Webform +7.x-3.x. + +1. Copy the entire webform directory the Drupal modules directory. + +2. Login as the FIRST user or change the $access_check in update.php to FALSE + +3. Run update.php (at http://www.example.com/update.php) + +Support +------- +Please use the issue queue for filing bugs with this module at +http://drupal.org/project/issues/webform + diff -Naurw webform_old/THEMING.txt webform/THEMING.txt --- webform_old/THEMING.txt 1970-01-01 01:00:00.000000000 +0100 +++ webform/THEMING.txt 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,115 @@ +Overview +-------- +Webform supports theming similar to the CCK or Views modules. Any webform +may be themed on the server side, though doing so may require a reasonable +amount of knowledge about the Drupal Form API. More information about the Form +API may be found at http://api.drupal.org/api/file/developer/topics/forms_api.html + +Theme submission e-mails +----------------------- +The default e-mails sent by webform are fairly basic. If you like, you may +customize the display of e-mails sent by each individual webform. + +- Open the Webform module directory. + +- Copy (do not move!) the "webform-mail.tpl.php" file to your theme directory. + +- Open up the new file and edit it to your liking. The webform-mail.tpl.php file + contains further instructions on how to get started with theming the e-mail. + +- If you want to edit the e-mail sent by only one particular webform, rename the + file "webform-mail-[node id here].tpl.php", replacing [node id here] with the + node ID of the webform. + +- Clear the theme cache! Visit admin/settings/performance and click the + "Clear cached data" button at the bottom of the page. You may also find + using devel module will speed up this process a bit. This needs to be done + every time you create or rename a .tpl.php file, but isn't necessary once + these files already exist. + +- To get a better idea of what variables are available to you, you can include + the print_r function in your email. Simply include the line: + + + + to get a listing of all the available fields you can use in your mail. + +- Advanced Webform e-mail Theming: Theming the e-mail headers may also be done + by overriding the theme_webform_mail_headers() function from webform.module. + Just copy the code out of webform.module and change as necessary in your + template.php file. This allows you to customize the e-mail headers. + +Theme the confirmation page +--------------------------- + +After a user submits a webform, they are directed to a page that contains the +confirmation message set in the webform node settings (assuming the form doesn't +direct to a complete URL). These instructions let you customize the format of +the confirmation page of a single node or all webforms on your site. + +- Open the Webform module directory. + +- Copy (do not move!) the "webform-confirmation.tpl.php" file to your theme + directory. + +- Open the new file and change it's contents to the your liking. Here's an + example that inserts some additional HTML around the confirmation message and + gives links to edit the submission. + + + +
+ +
+ + + + + +- You may edit the webform-confirmation.tpl.php file in your theme directory, + this will affect all the webform mails sent by your entire site. Or, if you + want to edit the e-mail sent by only one particular webform, rename the file + "webform-confirmation-[node id here].tpl.php", replacing [node id here] with + the node ID of the webform. + +- Visit admin/settings/performance and click the "Clear cached data" button. + +Theme display of an entire webform +---------------------------------- + +Theming a webform can be useful for rearranging elements or customizing the +appearance of multiple components at once. This tutorial assumes usage +of the phptemplate engine. + +- Copy the "webform-form.tpl.php" file from the webform directory to your + theme directory. You may rename this file + "webform-form-[node id here].tpl.php" if you want to theme one particular + webform on your site. Replace [node id here] with the node ID of the webform. + +- Open up your new file and customize the webform however you like. + +- Visit admin/settings/performance and click the "Clear cached data" button. + +- All Webform forms have 2 main fieldsets: "submitted", and "details". Although + you may move things around as you wish, keep all your components within the + "submitted" fieldset. Only the "submitted" fieldset is displayed and Webform + depends on the other two to operate properly, so don't mess with them unless + you have good reason to do so (like you're forwarding your webform to a custom + PHP or PERL script). + +Theme display of a webform submission display +--------------------------------------------- + +Theming the display of a webform submission works the same way as theming a +webform form. Webform uses Drupal "renderable" style arrays for the display of +submissions, just like most forms in Drupal. + +The template file for theming submissions is webform-submission.tpl.php. You can +use webform-submission-[node id here].tpl.php for individual nodes if desired. +Note that the contents of this template are used not only for display of +submissions in the Webform interface but also in e-mails when printing out +the %email_values token. + diff -Naurw webform_old/components/date.inc webform/components/date.inc --- webform_old/components/date.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/date.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,433 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'mandatory' => 0, + 'extra' => array( + 'timezone' => 'user', + 'start_date' => '-2 years', + 'end_date' => '+2 years', + 'year_textfield' => 0, + 'datepicker' => 1, + 'title_display' => 0, + 'description' => '', + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_date() { + return array( + 'webform_date' => array( + 'render element' => 'element', + 'file' => 'components/date.inc', + ), + 'webform_display_date' => array( + 'render element' => 'element', + 'file' => 'components/date.inc', + ), + 'webform_calendar' => array( + 'variables' => array('component' => NULL, 'calendar_classes' => NULL), + 'template' => 'templates/webform-calendar', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_date($component) { + $form = array(); + $form['value'] = array( + '#type' => 'textfield', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field.') . '
' . t('Accepts any date in any GNU Date Input Format. Strings such as today, +2 months, and Dec 9 2004 are all valid.'), + '#size' => 60, + '#maxlength' => 127, + '#weight' => 0, + ); + $form['extra']['timezone'] = array( + '#type' => 'radios', + '#title' => t('Default value timezone'), + '#default_value' => empty($component['extra']['timezone']) ? 'user' : $component['extra']['timezone'], + '#description' => t('If using relative dates for a default value (e.g. "today") base the current day on this timezone.'), + '#options' => array('user' => t('User timezone'), 'site' => t('Website timezone')), + '#weight' => 2, + '#access' => variable_get('configurable_timezones', 1), + ); + + $form['display']['datepicker'] = array( + '#type' => 'checkbox', + '#title' => t('Enable popup calendar'), + '#default_value' => $component['extra']['datepicker'], + '#description' => t('Enable a JavaScript date picker next to the date field.'), + '#weight' => 2, + '#parents' => array('extra', 'datepicker'), + ); + + $form['display']['year_textfield'] = array( + '#type' => 'checkbox', + '#title' => t('Use a textfield for year'), + '#default_value' => $component['extra']['year_textfield'], + '#description' => t('If checked, the generated date field will use a textfield for the year. Otherwise it will use a select list.'), + '#weight' => 5, + '#parents' => array('extra', 'year_textfield'), + ); + + $form['validation']['start_date'] = array( + '#type' => 'textfield', + '#title' => t('Start date'), + '#default_value' => $component['extra']['start_date'], + '#description' => t('The earliest date that may be entered into the field.') . ' ' . t('Accepts any date in any GNU Date Input Format.'), + '#size' => 30, + '#weight' => 3, + '#parents' => array('extra', 'start_date'), + ); + $form['validation']['end_date'] = array( + '#type' => 'textfield', + '#title' => t('End date'), + '#default_value' => $component['extra']['end_date'], + '#description' => t('The latest date that may be entered into the field.') . ' ' . t('Accepts any date in any GNU Date Input Format.'), + '#size' => 30, + '#weight' => 4, + '#parents' => array('extra', 'end_date'), + ); + + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_date($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'date', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#weight' => $component['weight'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#required' => $component['mandatory'], + '#start_date' => trim($component['extra']['start_date']), + '#end_date' => trim($component['extra']['end_date']), + '#year_textfield' => $component['extra']['year_textfield'], + '#default_value' => $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, FALSE) : $component['value'], + '#timezone' => $component['extra']['timezone'], + '#process' => array('webform_expand_date'), + '#theme' => 'webform_date', + '#theme_wrappers' => array('webform_element'), + '#element_validate' => array('webform_validate_date'), + '#translatable' => array('title', 'description'), + ); + + if ($component['extra']['datepicker']) { + $element['#datepicker'] = TRUE; + $element['#attached'] = array( + 'library' => array( + array('system', 'ui.datepicker'), + ), + ); + } + + // Set the value from Webform. + if (isset($value[0]) && $value[0] !== '') { + $value = webform_date_array($value[0], 'date'); + $element['#default_value'] = $value; + } + + return $element; +} + +/** + * Form API #process function for Webform date fields. + */ +function webform_expand_date($element) { + // Accept a string or array value for #default_value. + if (!empty($element['#default_value']) && is_string($element['#default_value'])) { + $timezone = $element['#timezone'] != 'user' ? NULL : 'user'; + $timestring = webform_strtodate('c', $element['#default_value'], $timezone); + $element['#default_value'] = webform_date_array($timestring, 'date'); + } + + // Set defaults according to existing #default_value (set by Form API) + if (isset($element['#default_value']['month']) || isset($element['#default_value']['day']) || isset($element['#default_value']['year'])) { + $default_values = array( + 'month' => $element['#default_value']['month'], + 'day' => $element['#default_value']['day'], + 'year' => $element['#default_value']['year'], + ); + } + else { + $default_values = array( + 'day' => NULL, + 'month' => NULL, + 'year' => NULL, + ); + } + + // Let Drupal do it's normal expansion. + $element = form_process_date($element); + + // Set default values. + foreach ($default_values as $type => $value) { + switch ($type) { + case 'month': + $none = t('Month'); + break; + case 'day': + $none = t('Day'); + break; + case 'year': + $none = t('Year'); + break; + } + unset($element[$type]['#value']); + $element[$type]['#default_value'] = isset($default_values[$type]) ? $default_values[$type] : NULL; + $element[$type]['#options'] = array('' => $none) + $element[$type]['#options']; + } + + // Convert relative dates to absolute ones. + foreach (array('start_date', 'end_date') as $start_end) { + $timezone = $element['#timezone'] != 'user' ? NULL : 'user'; + $date = webform_strtodate('Y-m-d', $element['#' . $start_end], $timezone); + $element['#' . $start_end] = $date ? $date : ''; + } + + // Tweak the year field. + if ($element['#year_textfield']) { + $element['year']['#type'] = 'textfield'; + $element['year']['#size'] = 5; + $element['year']['#maxlength'] = 4; + unset($element['year']['#options']); + } + elseif ($element['#start_date'] || $element['#end_date']) { + $start_year = $element['#start_date'] ? webform_strtodate('Y', $element['#start_date']) : webform_strtodate('Y', '-2 years'); + $end_year = $element['#end_date'] ? webform_strtodate('Y', $element['#end_date']) : webform_strtodate('Y', '+2 years'); + $element['year']['#options'] = array('' => t('Year')) + drupal_map_assoc(range($start_year, $end_year)); + } + + return $element; +} + +/** + * Theme a webform date element. + */ +function theme_webform_date($variables) { + $element = $variables['element']; + + $element['year']['#attributes']['class'] = array('year'); + $element['month']['#attributes']['class'] = array('month'); + $element['day']['#attributes']['class'] = array('day'); + + // Add error classes to all items within the element. + if (form_get_error($element)) { + $element['year']['#attributes']['class'][] = 'error'; + $element['month']['#attributes']['class'][] = 'error'; + $element['day']['#attributes']['class'][] = 'error'; + } + + $class = array('webform-container-inline'); + + // Add the JavaScript calendar if available (provided by Date module package). + if (!empty($element['#datepicker'])) { + $class[] = 'webform-datepicker'; + $calendar_class = array('webform-calendar'); + if ($element['#start_date']) { + $calendar_class[] = 'webform-calendar-start-' . $element['#start_date']; + } + if ($element['#end_date']) { + $calendar_class[] = 'webform-calendar-end-' . $element['#end_date']; + } + $calendar_class[] ='webform-calendar-day-' . variable_get('date_first_day', 0); + + $calendar = theme('webform_calendar', array('component' => $element['#webform_component'], 'calendar_classes' => $calendar_class)); + } + + $output = ''; + $output .= '
'; + $output .= drupal_render_children($element); + $output .= isset($calendar) ? $calendar : ''; + $output .= '
'; + + return $output; +} + +/** + * Element validation for Webform date fields. + */ +function webform_validate_date($element, $form_state) { + // Check if the user filled the required fields. + foreach (array('day', 'month', 'year') as $field_type) { + if (!is_numeric($element[$field_type]['#value']) && $element['#required']) { + form_error($element, t('!name field is required.', array('!name' => $element['#title']))); + return; + } + } + + if ($element['month']['#value'] !== '' || $element['day']['#value'] !== '' || $element['year']['#value'] !== '') { + // Check for a valid date. + if (!checkdate((int) $element['month']['#value'], (int) $element['day']['#value'], (int) $element['year']['#value'])) { + form_error($element, t('Entered !name is not a valid date.', array('!name' => $element['#title']))); + return; + } + + // Create a timestamp of the entered value for comparison. + $timestamp = strtotime($element['year']['#value'] . '-' . $element['month']['#value'] . '-' . $element['day']['#value']); + $format = webform_date_format('short'); + + // Flip start and end if needed. + $date1 = strtotime($element['#start_date']); + $date2 = strtotime($element['#end_date']); + if ($date1 !== FALSE && $date2 !== FALSE) { + $start_date = $date1 < $date2 ? $date1 : $date2; + $end_date = $date1 > $date2 ? $date1 : $date2; + } + else { + $start_date = $date1; + $end_date = $date2; + } + + // Check that the date is after the start date. + if ($start_date !== FALSE) { + if ($timestamp < $start_date) { + form_error($element, t('The entered date must be @start_date or later.', array('@start_date' => date($format, $start_date)))); + } + } + + // Check that the date is before the end date. + if ($end_date !== FALSE) { + if ($timestamp > $end_date) { + form_error($element, t('The entered date must be @end_date or earlier.', array('@end_date' => date($format, $end_date)))); + } + } + } +} + +/** + * Implements _webform_submit_component(). + */ +function _webform_submit_date($component, $value) { + // Convert the date to an ISO 8601 format. + return ($value['year'] && $value['month'] && $value['day']) ? webform_date_string($value, 'date') : ''; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_date($component, $value, $format = 'html') { + $value = webform_date_array(isset($value[0]) ? $value[0] : '', 'date'); + + return array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#theme' => 'webform_display_date', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#format' => $format, + '#value' => $value, + '#translatable' => array('title'), + ); +} + +/** + * Format the text output for this component. + */ +function theme_webform_display_date($variables) { + $element = $variables['element']; + $output = ' '; + if ($element['#value']['year'] && $element['#value']['month'] && $element['#value']['day']) { + $timestamp = webform_strtotime($element['#value']['month'] . '/' . $element['#value']['day'] . '/' . $element['#value']['year']); + $format = webform_date_format('medium'); + $output = format_date($timestamp, 'custom', $format, 'UTC'); + } + + return $output; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_date($component, $sids = array()) { + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('no', 'data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']) + ->orderBy('sid'); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $result = $query->execute(); + + $dates = array(); + $submissions = 0; + foreach ($result as $row) { + $submissions++; + if ($row['data']) { + $dates[] = webform_date_array($row['data']); + } + } + + // Display stats. + $nonblanks = count($dates); + $rows[0] = array(t('Left Blank'), ($submissions - $nonblanks)); + $rows[1] = array(t('User entered value'), $nonblanks); + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_date($component, $value) { + if ($value[0]) { + $timestamp = webform_strtotime($value[0]); + $format = webform_date_format('short'); + return format_date($timestamp, 'custom', $format, 'UTC'); + } + else { + return ''; + } +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_date($component, $export_options) { + $header = array(); + $header[0] = ''; + $header[1] = ''; + $header[2] = $component['name']; + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_date($component, $export_options, $value) { + if ($value[0]) { + $timestamp = webform_strtotime($value[0]); + $format = webform_date_format('short'); + return format_date($timestamp, 'custom', $format, 'UTC'); + } + else { + return ''; + } +} diff -Naurw webform_old/components/email.inc webform/components/email.inc --- webform_old/components/email.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/email.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,285 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'mandatory' => 0, + 'extra' => array( + 'width' => '', + 'unique' => 0, + 'disabled' => 0, + 'title_display' => 0, + 'description' => '', + 'attributes' => array(), + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_email() { + return array( + 'webform_email' => array( + 'render element' => 'element', + 'file' => 'components/email.inc', + ), + 'webform_display_email' => array( + 'render element' => 'element', + 'file' => 'components/email.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_email($component) { + $form['value'] = array( + '#type' => 'textfield', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field.') . theme('webform_token_help'), + '#size' => 60, + '#maxlength' => 127, + '#weight' => 0, + '#attributes' => ($component['value'] == '%useremail' && count(form_get_errors()) == 0) ? array('disabled' => TRUE) : array(), + '#id' => 'email-value', + ); + $form['user_email'] = array( + '#type' => 'checkbox', + '#title' => t('User email as default'), + '#default_value' => $component['value'] == '%useremail' ? 1 : 0, + '#description' => t('Set the default value of this field to the user email, if he/she is logged in.'), + '#attributes' => array('onclick' => 'getElementById("email-value").value = (this.checked ? "%useremail" : ""); getElementById("email-value").disabled = this.checked;'), + '#weight' => 0, + '#element_validate' => array('_webform_edit_email_validate'), + ); + $form['display']['width'] = array( + '#type' => 'textfield', + '#title' => t('Width'), + '#default_value' => $component['extra']['width'], + '#description' => t('Width of the textfield.') . ' ' . t('Leaving blank will use the default size.'), + '#size' => 5, + '#maxlength' => 10, + '#parents' => array('extra', 'width'), + ); + $form['display']['disabled'] = array( + '#type' => 'checkbox', + '#title' => t('Disabled'), + '#return_value' => 1, + '#description' => t('Make this field non-editable. Useful for setting an unchangeable default value.'), + '#weight' => 11, + '#default_value' => $component['extra']['disabled'], + '#parents' => array('extra', 'disabled'), + ); + $form['validation']['unique'] = array( + '#type' => 'checkbox', + '#title' => t('Unique'), + '#return_value' => 1, + '#description' => t('Check that all entered values for this field are unique. The same value is not allowed to be used twice.'), + '#weight' => 1, + '#default_value' => $component['extra']['unique'], + '#parents' => array('extra', 'unique'), + ); + return $form; +} + +/** + * Element validation function for the email edit form. + */ +function _webform_edit_email_validate($element, &$form_state) { + if ($form_state['values']['user_email']) { + $form_state['values']['value'] = '%useremail'; + } +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_email($component, $value = NULL, $filter = TRUE) { + global $user; + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'webform_email', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#default_value' => $filter ? _webform_filter_values($component['value'], $node) : $component['value'], + '#required' => $component['mandatory'], + '#weight' => $component['weight'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#attributes' => $component['extra']['attributes'], + '#element_validate' => array('_webform_validate_email'), + '#theme_wrappers' => array('webform_element'), + '#translatable' => array('title', 'description'), + ); + + // Add an e-mail class for identifying the difference from normal textfields. + $element['#attributes']['class'][] = 'email'; + + // Enforce uniqueness. + if ($component['extra']['unique']) { + $element['#element_validate'][] = 'webform_validate_unique'; + } + + if (isset($value)) { + $element['#default_value'] = $value[0]; + } + + if ($component['extra']['disabled']) { + if ($filter) { + $element['#attributes']['readonly'] = 'readonly'; + } + else { + $element['#disabled'] = TRUE; + } + } + + // Change the 'width' option to the correct 'size' option. + if ($component['extra']['width'] > 0) { + $element['#size'] = $component['extra']['width']; + } + + return $element; +} + +/** + * Theme function to render an email component. + */ +function theme_webform_email($variables) { + $element = $variables['element']; + + // This IF statement is mostly in place to allow our tests to set type="text" + // because SimpleTest does not support type="email". + if (!isset($element['#attributes']['type'])) { + $element['#attributes']['type'] = 'email'; + } + + // Convert properties to attributes on the element if set. + foreach (array('id', 'name', 'value', 'size') as $property) { + if (isset($element['#' . $property]) && $element['#' . $property] !== '') { + $element['#attributes'][$property] = $element['#' . $property]; + } + } + _form_set_class($element, array('form-text', 'form-email')); + + return ''; +} + +/** + * A Drupal Form API Validation function. Validates the entered values from + * email components on the client-side form. + * + * @param $form_element + * The e-mail form element. + * @param $form_state + * The full form state for the webform. + * @return + * None. Calls a form_set_error if the e-mail is not valid. + */ +function _webform_validate_email($form_element, &$form_state) { + $component = $form_element['#webform_component']; + $value = trim($form_element['#value']); + if ($value !== '' && !valid_email_address($value)) { + form_error($form_element, t('%value is not a valid email address.', array('%value' => $value))); + } + else { + form_set_value($form_element, $value, $form_state); + } +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_email($component, $value, $format = 'html') { + return array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#theme' => 'webform_display_email', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#format' => $format, + '#value' => isset($value[0]) ? $value[0] : '', + '#translatable' => array('title'), + ); +} + +/** + * Format the text output for this component. + */ +function theme_webform_display_email($variables) { + $element = $variables['element']; + $element['#value'] = empty($element['#value']) ? ' ' : $element['#value']; + return $element['#format'] == 'html' ? check_plain($element['#value']) : $element['#value']; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_email($component, $sids = array()) { + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('no', 'data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $nonblanks = 0; + $submissions = 0; + $wordcount = 0; + + $result = $query->execute(); + foreach ($result as $data) { + if (drupal_strlen(trim($data['data'])) > 0) { + $nonblanks++; + $wordcount += str_word_count(trim($data['data'])); + } + $submissions++; + } + + $rows[0] = array(t('Left Blank'), ($submissions - $nonblanks)); + $rows[1] = array(t('User entered value'), $nonblanks); + $rows[2] = array(t('Average submission length in words (ex blanks)'), ($nonblanks != 0 ? number_format($wordcount/$nonblanks, 2) : '0')); + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_email($component, $value) { + return check_plain(empty($value[0]) ? '' : $value[0]); +} + + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_email($component, $export_options) { + $header = array(); + $header[0] = ''; + $header[1] = ''; + $header[2] = $component['name']; + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_email($component, $export_options, $value) { + return empty($value[0]) ? '' : $value[0]; +} diff -Naurw webform_old/components/fieldset.inc webform/components/fieldset.inc --- webform_old/components/fieldset.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/fieldset.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,100 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'extra' => array( + 'title_display' => 0, + 'collapsible' => 0, + 'collapsed' => 0, + 'description' => '', + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_fieldset($component) { + $form = array(); + $form['display']['collapsible'] = array( + '#type' => 'checkbox', + '#title' => t('Collapsible'), + '#default_value' => $component['extra']['collapsible'], + '#description' => t('If this fieldset is collapsible, the user may open or close the fieldset.'), + '#weight' => 0, + '#parents' => array('extra', 'collapsible'), + ); + $form['display']['collapsed'] = array( + '#type' => 'checkbox', + '#title' => t('Collapsed by Default'), + '#default_value' => $component['extra']['collapsed'], + '#description' => t('Collapsible fieldsets are "open" by default. Select this option to default the fieldset to "closed."'), + '#weight' => 3, + '#parents' => array('extra', 'collapsed'), + ); + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_fieldset($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'fieldset', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : NULL, + '#weight' => $component['weight'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#collapsible' => $component['extra']['collapsible'], + '#collapsed' => $component['extra']['collapsed'], + '#attributes' => array('class' => array('webform-component-fieldset'), 'id' => 'webform-component-' . $component['form_key']), + '#pre_render' => array('webform_fieldset_prerender', 'webform_element_title_display'), + '#translatable' => array('title', 'description'), + ); + + return $element; +} + +/** + * Pre-render function to set a fieldset ID. + */ +function webform_fieldset_prerender($element) { + $element['#attributes']['id'] = 'webform-component-' . str_replace('_', '-', implode('--', array_slice($element['#parents'], 1))); + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_fieldset($component, $value, $format = 'html') { + if ($format == 'text') { + $element = array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#theme_wrappers' => array('webform_element_text'), + '#translatable' => array('title'), + ); + } + else { + $element = _webform_render_fieldset($component, $value); + } + + $element['#format'] = $format; + + return $element; +} diff -Naurw webform_old/components/file.inc webform/components/file.inc --- webform_old/components/file.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/file.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,532 @@ + '', + 'form_key' => NULL, + 'mandatory' => 0, + 'pid' => 0, + 'weight' => 0, + 'extra' => array( + 'filtering' => array( + 'types' => array('gif', 'jpg', 'png'), + 'addextensions' => '', + 'size' => '2 MB', + ), + 'scheme' => 'public', + 'directory' => '', + 'progress_indicator' => 'throbber', + 'title_display' => 0, + 'description' => '', + 'attributes' => array(), + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_file() { + return array( + 'webform_edit_file_extensions' => array( + 'render element' => 'element', + 'file' => 'components/file.inc', + ), + 'webform_display_file' => array( + 'render element' => 'element', + 'file' => 'components/file.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_file($component) { + $form = array(); + $form['#element_validate'] = array('_webform_edit_file_check_directory'); + $form['#after_build'] = array('_webform_edit_file_check_directory'); + + $form['validation']['size'] = array( + '#type' => 'textfield', + '#title' => t('Max upload size'), + '#default_value' => $component['extra']['filtering']['size'], + '#description' => t('Enter the max file size a user may upload such as 2 MB or 800 KB. Your server has a max upload size of @size.', array('@size' => format_size(file_upload_max_size()))), + '#size' => 10, + '#parents' => array('extra', 'filtering', 'size'), + '#element_validate' => array('_webform_edit_file_size_validate'), + '#weight' => 1, + ); + + $form['validation']['extensions'] = array( + '#element_validate' => array('_webform_edit_file_extensions_validate'), + '#parents' => array('extra', 'filtering'), + '#theme' => 'webform_edit_file_extensions', + '#theme_wrappers' => array('form_element'), + '#title' => t('Allowed file extensions'), + '#attached' => array( + 'js' => array(drupal_get_path('module', 'webform') . '/js/webform-admin.js'), + 'css' => array(drupal_get_path('module', 'webform') . '/css/webform-admin.css'), + ), + '#weight' => 2, + ); + + // Find the list of all currently valid extensions. + $current_types = isset($component['extra']['filtering']['types']) ? $component['extra']['filtering']['types'] : array(); + + $types = array('gif', 'jpg', 'png'); + $form['validation']['extensions']['types']['webimages'] = array( + '#type' => 'checkboxes', + '#title' => t('Web images'), + '#options' => drupal_map_assoc($types), + '#default_value' => array_intersect($current_types, $types), + ); + + $types = array('bmp', 'eps', 'tif', 'pict', 'psd'); + $form['validation']['extensions']['types']['desktopimages'] = array( + '#type' => 'checkboxes', + '#title' => t('Desktop images'), + '#options' => drupal_map_assoc($types), + '#default_value' => array_intersect($current_types, $types), + ); + + $types = array('txt', 'rtf', 'html', 'odf', 'pdf', 'doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx', 'xml'); + $form['validation']['extensions']['types']['documents'] = array( + '#type' => 'checkboxes', + '#title' => t('Documents'), + '#options' => drupal_map_assoc($types), + '#default_value' => array_intersect($current_types, $types), + ); + + $types = array('avi', 'mov', 'mp3', 'ogg', 'wav'); + $form['validation']['extensions']['types']['media'] = array( + '#type' => 'checkboxes', + '#title' => t('Media'), + '#options' => drupal_map_assoc($types), + '#default_value' => array_intersect($current_types, $types), + ); + + $types = array('bz2', 'dmg', 'gz', 'jar', 'rar', 'sit', 'tar', 'zip'); + $form['validation']['extensions']['types']['archives'] = array( + '#type' => 'checkboxes', + '#title' => t('Archives'), + '#options' => drupal_map_assoc($types), + '#default_value' => array_intersect($current_types, $types), + ); + + $form['validation']['extensions']['addextensions'] = array( + '#type' => 'textfield', + '#title' => t('Additional extensions'), + '#default_value' => $component['extra']['filtering']['addextensions'], + '#description' => t('Enter a list of additional file extensions for this upload field, separated by commas.
Entered extensions will be appended to checked items above.'), + '#size' => 20, + '#weight' => 3, + ); + + $scheme_options = array(); + foreach (file_get_stream_wrappers(STREAM_WRAPPERS_WRITE_VISIBLE) as $scheme => $stream_wrapper) { + $scheme_options[$scheme] = $stream_wrapper['name']; + } + $form['extra']['scheme'] = array( + '#type' => 'radios', + '#title' => t('Upload destination'), + '#options' => $scheme_options, + '#default_value' => $component['extra']['scheme'], + '#description' => t('Private file storage has significantly more overhead than public files, but restricts file access to users who can view submissions.'), + '#weight' => 4, + '#access' => count($scheme_options) > 1, + ); + $form['extra']['directory'] = array( + '#type' => 'textfield', + '#title' => t('Upload directory'), + '#default_value' => $component['extra']['directory'], + '#description' => t('You may optionally specify a sub-directory to store your files.'), + '#weight' => 5, + '#field_prefix' => 'webform/', + ); + + $form['display']['progress_indicator'] = array( + '#type' => 'radios', + '#title' => t('Progress indicator'), + '#options' => array( + 'throbber' => t('Throbber'), + 'bar' => t('Bar with progress meter'), + ), + '#default_value' => $component['extra']['progress_indicator'], + '#description' => t('The throbber display does not show the status of uploads but takes up less space. The progress bar is helpful for monitoring progress on large uploads.'), + '#weight' => 16, + '#access' => file_progress_implementation(), + '#parents' => array('extra', 'progress_indicator'), + ); + + // TODO: Make managed_file respect the "size" parameter. + /* + $form['display']['width'] = array( + '#type' => 'textfield', + '#title' => t('Width'), + '#default_value' => $component['extra']['width'], + '#description' => t('Width of the file field.') . ' ' . t('Leaving blank will use the default size.'), + '#size' => 5, + '#maxlength' => 10, + '#weight' => 4, + '#parents' => array('extra', 'width') + ); + */ + + return $form; +} + +/** + * A Form API element validate function to check filesize is valid. + */ +function _webform_edit_file_size_validate($element) { + if (!empty($element['#value'])) { + $set_filesize = parse_size($element['#value']); + if ($set_filesize == FALSE) { + form_error($element, t('File size @value is not a valid filesize. Use a value such as 2 MB or 800 KB.', array('@value' => $element['#value']))); + } + else { + $max_filesize = parse_size(file_upload_max_size()); + if ($max_filesize < $set_filesize) { + form_error($element, t('An upload size of @value is too large, you are allow to upload files @max or less.', array('@value' => $element['#value'], '@max' => format_size($max_filesize)))); + } + } + } +} + +/** + * A Form API after build and validate function. + * + * Ensure that the destination directory exists and is writable. + */ +function _webform_edit_file_check_directory($element) { + $scheme = $element['extra']['scheme']['#value']; + $directory = $element['extra']['directory']['#value']; + + $destination_dir = file_stream_wrapper_uri_normalize($scheme . '://' . $directory . '/webform'); + + // Sanity check input to prevent use parent (../) directories. + if (preg_match('/\.\.[\/\\\]/', $destination_dir . '/')) { + form_error($element['extra']['directory'], t('The save directory %directory is not valid.', array('%directory' => $directory))); + } + else { + $destination_success = file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY); + if (!$destination_success) { + form_error($element['extra']['directory'], t('The save directory %directory could not be created. Check that the webform files directory is writable.', array('%directory' => $directory))); + } + } + + return $element; +} + +/** + * A Form API element validate function. + * + * Change the submitted values of the component so that all filtering extensions + * are saved as a single array. + */ +function _webform_edit_file_extensions_validate($element, &$form_state) { + // Predefined types. + $extensions = array(); + foreach (element_children($element['types']) as $category) { + foreach (array_keys($element['types'][$category]['#value']) as $extension) { + if ($element['types'][$category][$extension]['#value']) { + $extensions[] = $extension; + } + } + } + + // Additional types. + $additional_extensions = explode(',', $element['addextensions']['#value']); + foreach ($additional_extensions as $extension) { + $clean_extension = drupal_strtolower(trim($extension)); + if (!empty($clean_extension) && !in_array($clean_extension, $extensions)) { + $extensions[] = $clean_extension; + } + } + + form_set_value($element['types'], $extensions, $form_state); +} + +/** + * Output the list of allowed extensions as checkboxes. + */ +function theme_webform_edit_file_extensions($variables) { + $element = $variables['element']; + + // Format the components into a table. + $rows = array(); + foreach (element_children($element['types']) as $filtergroup) { + $row = array(); + $first_row = count($rows); + if ($element['types'][$filtergroup]['#type'] == 'checkboxes') { + $select_link = ' (' . t('select') . ')'; + $row[] = $element['types'][$filtergroup]['#title']; + $row[] = array('data' => $select_link, 'width' => 40); + $row[] = array('data' => drupal_render_children($element['types'][$filtergroup]), 'class' => array('webform-file-extensions', 'webform-select-group-' . $filtergroup)); + $rows[] = array('data' => $row); + unset($element['types'][$filtergroup]); + } + } + + // Add the row for additional types. + $row = array(); + $title = $element['addextensions']['#title']; + $element['addextensions']['#title'] = NULL; + $row[] = array('data' => $title, 'colspan' => 2); + $row[] = drupal_render($element['addextensions']); + $rows[] = $row; + + $header = array(array('data' => t('Category'), 'colspan' => '2'), array('data' => t('Types'))); + + // Create the table inside the form. + $element['types']['table'] = array( + '#theme' => 'table', + '#header' => $header, + '#rows' => $rows, + '#attributes' => array('class' => array('webform-file-extensions')), + ); + + return drupal_render_children($element); +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_file($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + // Cap the upload size according to the PHP limit. + $max_filesize = parse_size(file_upload_max_size()); + $set_filesize = $component['extra']['filtering']['size']; + if (!empty($set_filesize) && parse_size($set_filesize) < $max_filesize) { + $max_filesize = parse_size($set_filesize); + } + + $element = array( + '#type' => 'managed_file', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#required' => $component['mandatory'], + '#default_value' => isset($value[0]) ? $value[0] : NULL, + '#attributes' => $component['extra']['attributes'], + '#upload_validators' => array( + 'file_validate_size' => array($max_filesize), + 'file_validate_extensions' => array(implode(' ', $component['extra']['filtering']['types'])), + ), + '#pre_render' => array_merge(element_info_property('managed_file', '#pre_render'), array('webform_file_allow_access')), + '#upload_location' => $component['extra']['scheme'] . '://webform/' . $component['extra']['directory'], + '#progress_indicator' => $component['extra']['progress_indicator'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#weight' => $component['weight'], + '#theme_wrappers' => array('webform_element'), + '#translatable' => array('title', 'description'), + ); + + return $element; +} + +/** + * Implements _webform_submit_component(). + */ +function _webform_submit_file($component, $value) { + if (is_array($value)) { + return !empty($value['fid']) ? $value['fid'] : ''; + } + else { + return !empty($value) ? $value : ''; + } +} + +/** + * Pre-render callback to allow access to uploaded files. + * + * Files that have not yet been saved into a submission must be accessible to + * the user who uploaded it, but no one else. After the submission is saved, + * access is granted through the file_usage table. Before then, we use a + * $_SESSION value to record a user's upload. + * + * @see webform_file_download() + */ +function webform_file_allow_access($element) { + if (!empty($element['#value']['fid'])) { + $fid = $element['#value']['fid']; + $_SESSION['webform_files'][$fid] = $fid; + } + + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_file($component, $value, $format = 'html') { + $fid = isset($value[0]) ? $value[0] : NULL; + return array( + '#title' => $component['name'], + '#value' => $fid ? webform_get_file($fid) : NULL, + '#weight' => $component['weight'], + '#theme' => 'webform_display_file', + '#theme_wrappers' => $format == 'text' ? array('webform_element_text') : array('webform_element'), + '#format' => $format, + '#translatable' => array('title'), + ); +} + +/** + * Format the output of text data for this component + */ +function theme_webform_display_file($variables) { + $element = $variables['element']; + + $file = $element['#value']; + $url = !empty($file) ? webform_file_url($file->uri) : t('no upload'); + return !empty($file) ? ($element['#format'] == 'text' ? $url : l($file->filename, $url)) : ' '; +} + +/** + * Implements _webform_delete_component(). + */ +function _webform_delete_file($component, $value) { + // Delete an individual submission file. + if (!empty($value[0]) && ($file = webform_get_file($value[0]))) { + file_usage_delete($file, 'webform'); + file_delete($file); + } +} + +/** + * Implements _webform_attachments_component(). + */ +function _webform_attachments_file($component, $value) { + $file = (array) webform_get_file($value[0]); + //This is necessary until the next release of mimemail is out, see [#1388786] + $file['filepath'] = $file['uri']; + $files = array($file); + return $files; +} +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_file($component, $sids = array()) { + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('no', 'data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $nonblanks = 0; + $sizetotal = 0; + $submissions = 0; + + $result = $query->execute(); + foreach ($result as $data) { + $file = webform_get_file($data['data']); + if (isset($file->filesize)) { + $nonblanks++; + $sizetotal += $file->filesize; + } + $submissions++; + } + + $rows[0] = array(t('Left Blank'), ($submissions - $nonblanks)); + $rows[1] = array(t('User uploaded file'), $nonblanks); + $rows[2] = array(t('Average uploaded file size'), ($sizetotal != 0 ? (int) (($sizetotal/$nonblanks)/1024) . ' KB' : '0')); + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_file($component, $value) { + $output = ''; + $file = webform_get_file($value[0]); + if (!empty($file->fid)) { + $output = '' . check_plain(webform_file_name($file->uri)) . ''; + $output .= ' (' . (int) ($file->filesize/1024) . ' KB)'; + } + return $output; +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_file($component, $export_options) { + $header = array(); + // Two columns in header. + $header[0] = array('', ''); + $header[1] = array($component['name'], ''); + $header[2] = array(t('Name'), t('Filesize (KB)')); + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_file($component, $export_options, $value) { + $file = webform_get_file($value[0]); + return empty($file->filename) ? array('', '') : array(webform_file_url($file->uri), (int) ($file->filesize/1024)); +} + +/** + * Helper function to create proper file names for uploaded file. + */ +function webform_file_name($filepath) { + if (!empty($filepath)) { + $info = pathinfo($filepath); + $file_name = $info['basename']; + } + return isset($file_name) ? $file_name : ''; +} + +/** + * Helper function to create proper URLs for uploaded file. + */ +function webform_file_url($uri) { + if (!empty($uri)) { + $file_url = file_create_url($uri); + } + return isset($file_url) ? $file_url : ''; +} + +/** + * Helper function to load a file from the database. + */ +function webform_get_file($fid) { + // Simple check to prevent loading of NULL values, which throws an entity + // system error. + return $fid ? file_load($fid) : FALSE; +} + +/** + * Given a submission with file_usage set, add or remove file usage entries. + */ +function webform_file_usage_adjust($submission) { + if (isset($submission->file_usage)) { + $files = file_load_multiple($submission->file_usage['added_fids']); + foreach ($files as $file) { + $file->status = 1; + file_save($file); + file_usage_add($file, 'webform', 'submission', $submission->sid); + } + + $files = file_load_multiple($submission->file_usage['deleted_fids']); + foreach ($files as $file) { + file_usage_delete($file, 'webform', 'submission', $submission->sid); + file_delete($file); + } + } +} + diff -Naurw webform_old/components/grid.inc webform/components/grid.inc --- webform_old/components/grid.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/grid.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,430 @@ + '', + 'form_key' => NULL, + 'mandatory' => 0, + 'pid' => 0, + 'weight' => 0, + 'extra' => array( + 'options' => '', + 'questions' => '', + 'optrand' => 0, + 'qrand' => 0, + 'title_display' => 0, + 'custom_option_keys' => 0, + 'custom_question_keys' => 0, + 'description' => '', + 'private' => FALSE, + ), + ); +} + + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_grid() { + return array( + 'webform_grid' => array( + 'render element' => 'element', + 'file' => 'components/grid.inc', + ), + 'webform_display_grid' => array( + 'render element' => 'element', + 'file' => 'components/grid.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_grid($component) { + $form = array(); + + if (module_exists('options_element')) { + $form['options'] = array( + '#type' => 'fieldset', + '#title' => t('Options'), + '#collapsible' => TRUE, + '#description' => t('Options to select across the top. Usually these are ratings such as "poor" through "excellent" or "strongly disagree" through "strongly agree".'), + '#attributes' => array('class' => array('webform-options-element')), + '#element_validate' => array('_webform_edit_validate_options'), + ); + $form['options']['options'] = array( + '#type' => 'options', + '#options' => _webform_select_options_from_text($component['extra']['options'], TRUE), + '#optgroups' => FALSE, + '#default_value' => FALSE, + '#default_value_allowed' => FALSE, + '#optgroups' => FALSE, + '#key_type' => 'mixed', + '#key_type_toggle' => t('Customize option keys (Advanced)'), + '#key_type_toggled' => $component['extra']['custom_option_keys'], + ); + + $form['questions'] = array( + '#type' => 'fieldset', + '#title' => t('Questions'), + '#collapsible' => TRUE, + '#description' => t('Questions list down the side of the grid.'), + '#attributes' => array('class' => array('webform-options-element')), + '#element_validate' => array('_webform_edit_validate_options'), + ); + $form['questions']['options'] = array( + '#type' => 'options', + '#options' => _webform_select_options_from_text($component['extra']['questions'], TRUE), + '#optgroups' => FALSE, + '#default_value' => FALSE, + '#default_value_allowed' => FALSE, + '#optgroups' => FALSE, + '#key_type' => 'mixed', + '#key_type_toggle' => t('Customize question keys (Advanced)'), + '#key_type_toggled' => $component['extra']['custom_question_keys'], + ); + } + else { + $form['extra']['options'] = array( + '#type' => 'textarea', + '#title' => t('Options'), + '#default_value' => $component['extra']['options'], + '#description' => t('Options to select across the top. One option per line. Key-value pairs MUST be specified as "safe_key|Some readable option". Use of only alphanumeric characters and underscores is recommended in keys.') . theme('webform_token_help'), + '#cols' => 60, + '#rows' => 5, + '#weight' => -3, + '#required' => TRUE, + '#wysiwyg' => FALSE, + '#element_validate' => array('_webform_edit_validate_select'), + ); + $form['extra']['questions'] = array( + '#type' => 'textarea', + '#title' => t('Questions'), + '#default_value' => $component['extra']['questions'], + '#description' => t('Questions list down the side of the grid. One question per line. Key-value pairs MUST be specified as "safe_key|Some readable option". Use of only alphanumeric characters and underscores is recommended in keys.') . theme('webform_token_help'), + '#cols' => 60, + '#rows' => 5, + '#weight' => -2, + '#required' => TRUE, + '#wysiwyg' => FALSE, + '#element_validate' => array('_webform_edit_validate_select'), + ); + } + + $form['display']['optrand'] = array( + '#type' => 'checkbox', + '#title' => t('Randomize Options'), + '#default_value' => $component['extra']['optrand'], + '#description' => t('Randomizes the order of options on the top when they are displayed in the form.'), + '#parents' => array('extra', 'optrand') + ); + $form['display']['qrand'] = array( + '#type' => 'checkbox', + '#title' => t('Randomize Questions'), + '#default_value' => $component['extra']['qrand'], + '#description' => t('Randomize the order of the questions on the side when they are displayed in the form.'), + '#parents' => array('extra', 'qrand') + ); + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_grid($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'webform_grid', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#required' => $component['mandatory'], + '#weight' => $component['weight'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#grid_questions' => _webform_select_options_from_text($component['extra']['questions'], TRUE), + '#grid_options' => _webform_select_options_from_text($component['extra']['options'], TRUE), + '#optrand' => $component['extra']['optrand'], + '#qrand' => $component['extra']['qrand'], + '#theme' => 'webform_grid', + '#theme_wrappers' => array('webform_element'), + '#process' => array('webform_expand_grid'), + '#translatable' => array('title', 'description', 'grid_options', 'grid_questions'), + ); + + if ($value) { + $element['#default_value'] = $value; + } + + return $element; +} + +/** + * A Form API #process function for Webform grid fields. + */ +function webform_expand_grid($element) { + $options = $element['#grid_options']; + $questions = $element['#grid_questions']; + + if (!empty($element['#optrand'])) { + _webform_shuffle_options($options); + } + + if (!empty($element['#qrand'])) { + _webform_shuffle_options($questions); + } + + foreach ($questions as $key => $question) { + if ($question != '') { + $element[$key] = array( + '#title' => $question, + '#required' => $element['#required'], + '#options' => $options, + '#type' => 'radios', + '#process' => array('form_process_radios', 'webform_expand_select_ids'), + + // Webform handles validation manually. + '#validated' => TRUE, + '#webform_validated' => FALSE, + '#translatable' => array('title'), + ); + } + } + + $value = isset($element['#default_value']) ? $element['#default_value'] : array(); + foreach (element_children($element) as $key) { + if (isset($value[$key])) { + $element[$key]['#default_value'] = ($value[$key] !== '') ? $value[$key] : NULL; + } + else { + $element[$key]['#default_value'] = NULL; + } + } + + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_grid($component, $value, $format = 'html') { + $questions = _webform_select_options_from_text($component['extra']['questions'], TRUE); + $options = _webform_select_options_from_text($component['extra']['options'], TRUE); + + $element = array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#format' => $format, + '#grid_questions' => $questions, + '#grid_options' => $options, + '#theme' => 'webform_display_grid', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#sorted' => TRUE, + '#translatable' => array('#title', '#grid_questions', '#grid_options'), + ); + + foreach ($questions as $key => $question) { + if ($question !== '') { + $element[$key] = array( + '#title' => $question, + '#value' => isset($value[$key]) ? $value[$key] : NULL, + '#translatable' => array('#title', '#value'), + ); + } + } + + return $element; +} + +/** + * Format the text output for this component. + */ +function theme_webform_display_grid($variables) { + $element = $variables['element']; + + $component = $element['#webform_component']; + $format = $element['#format']; + + if ($format == 'html') { + $rows = array(); + $header = array(array('data' => '', 'class' => array('webform-grid-question'))); + foreach ($element['#grid_options'] as $option) { + $header[] = array('data' => _webform_filter_xss($option), 'class' => array('checkbox', 'webform-grid-option')); + } + foreach ($element['#grid_questions'] as $question_key => $question) { + $row = array(); + $row[] = array('data' => _webform_filter_xss($question), 'class' => array('webform-grid-question')); + foreach ($element['#grid_options'] as $option_value => $option_label) { + if (strcmp($element[$question_key]['#value'], $option_value) == 0) { + $row[] = array('data' => 'X', 'class' => array('checkbox', 'webform-grid-option')); + } + else { + $row[] = array('data' => ' ', 'class' => array('checkbox', 'webform-grid-option')); + } + } + $rows[] = $row; + } + + $option_count = count($header) - 1; + $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('webform-grid', 'webform-grid-' . $option_count)))); + } + else { + $items = array(); + foreach (element_children($element) as $key) { + $items[] = ' - ' . $element[$key]['#title'] . ': ' . (isset($element['#grid_options'][$element[$key]['#value']]) ? $element['#grid_options'][$element[$key]['#value']] : ''); + } + $output = implode("\n", $items); + } + + return $output; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_grid($component, $sids = array()) { + // Generate the list of options and questions. + $options = _webform_select_options_from_text($component['extra']['options'], TRUE); + $questions = _webform_select_options_from_text($component['extra']['questions'], TRUE); + + // Generate a lookup table of results. + $query = db_select('webform_submitted_data', 'wsd') + ->fields('wsd', array('no', 'data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']) + ->condition('data', '', '<>') + ->groupBy('no') + ->groupBy('data'); + $query->addExpression('COUNT(sid)', 'datacount'); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $result = $query->execute(); + $counts = array(); + foreach ($result as $data) { + $counts[$data->no][$data->data] = $data->datacount; + } + + // Create an entire table to be put into the returned row. + $rows = array(); + $header = array(''); + + // Add options as a header row. + foreach ($options as $option) { + $header[] = _webform_filter_xss($option); + } + + // Add questions as each row. + foreach ($questions as $qkey => $question) { + $row = array(_webform_filter_xss($question)); + foreach ($options as $okey => $option) { + $row[] = !empty($counts[$qkey][$okey]) ? $counts[$qkey][$okey] : 0; + } + $rows[] = $row; + } + $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('webform-grid')))); + + + return array(array(array('data' => $output, 'colspan' => 2))); +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_grid($component, $value) { + $questions = _webform_select_options_from_text($component['extra']['questions'], TRUE); + $options = _webform_select_options_from_text($component['extra']['options'], TRUE); + + $output = ''; + // Set the value as a single string. + foreach ($questions as $key => $label) { + if (isset($value[$key]) && isset($options[$value[$key]])) { + $output .= _webform_filter_xss($label) . ': ' . _webform_filter_xss($options[$value[$key]]) . '
'; + } + } + + return $output; +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_grid($component, $export_options) { + $header = array(); + $header[0] = array(''); + $header[1] = array($component['name']); + $items = _webform_select_options_from_text($component['extra']['questions'], TRUE); + $count = 0; + foreach ($items as $key => $item) { + // Empty column per sub-field in main header. + if ($count != 0) { + $header[0][] = ''; + $header[1][] = ''; + } + // The value for this option. + $header[2][] = $item; + $count++; + } + + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_grid($component, $export_options, $value) { + $questions = _webform_select_options_from_text($component['extra']['questions'], TRUE); + $options = _webform_select_options_from_text($component['extra']['options'], TRUE); + $return = array(); + foreach ($questions as $key => $question) { + if (isset($value[$key]) && isset($options[$value[$key]])) { + $return[] = $export_options['select_keys'] ? $value[$key] : $options[$value[$key]]; + } + else { + $return[] = ''; + } + } + return $return; +} + +function theme_webform_grid($variables) { + $element = $variables['element']; + + $rows = array(); + $header = array(array('data' => '', 'class' => array('webform-grid-question'))); + // Set the header for the table. + foreach ($element['#grid_options'] as $option) { + $header[] = array('data' => _webform_filter_xss($option), 'class' => array('checkbox', 'webform-grid-option')); + } + + foreach (element_children($element) as $key) { + $question_element = $element[$key]; + + // Create a row with the question title. + $row = array(array('data' => _webform_filter_xss($question_element['#title']), 'class' => array('webform-grid-question'))); + + // Render each radio button in the row. + $radios = form_process_radios($question_element); + foreach (element_children($radios) as $key) { + $radios[$key]['#title_display'] = 'invisible'; + $row[] = array('data' => drupal_render($radios[$key]), 'class' => array('checkbox', 'webform-grid-option')); + } + $rows[] = $row; + } + + $option_count = count($header) - 1; + return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('webform-grid', 'webform-grid-' . $option_count)))); +} diff -Naurw webform_old/components/hidden.inc webform/components/hidden.inc --- webform_old/components/hidden.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/hidden.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,179 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'extra' => array( + 'private' => FALSE, + 'hidden_type' => 'value', + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_hidden() { + return array( + 'webform_display_hidden' => array( + 'render element' => 'element', + 'file' => 'components/hidden.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_hidden($component) { + $form = array(); + $form['value'] = array( + '#type' => 'textarea', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field.') . theme('webform_token_help'), + '#cols' => 60, + '#rows' => 5, + '#weight' => 0, + ); + + $form['display']['hidden_type'] = array( + '#type' => 'radios', + '#options' => array( + 'value' => t('Secure value (allows use of all tokens)'), + 'hidden' => t('Hidden element (less secure, changeable via JavaScript)'), + ), + '#title' => t('Hidden type'), + '#description' => t('Both types of hidden fields are not shown to end-users. Using a Secure value allows the use of all tokens, even for anonymous users.'), + '#default_value' => $component['extra']['hidden_type'], + '#parents' => array('extra', 'hidden_type'), + ); + + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_hidden($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + // Set filtering options for "value" types, which are not displayed to the + // end user so they do not need to be sanitized. + $strict = $component['extra']['hidden_type'] != 'value'; + $allow_anonymous = $component['extra']['hidden_type'] == 'value'; + $default_value = $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, $strict, $allow_anonymous) : $component['value']; + if (isset($value[0])) { + $default_value = $value[0]; + } + + $element = array( + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#weight' => $component['weight'], + '#translatable' => array('title'), + ); + + if ($component['extra']['hidden_type'] == 'value') { + $element['#type'] = 'value'; + $element['#value'] = $default_value; + } + else { + $element['#type'] = 'hidden'; + $element['#default_value'] = $default_value; + } + + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_hidden($component, $value, $format = 'html') { + $element = array( + '#title' => $component['name'], + '#markup' => isset($value[0]) ? $value[0] : NULL, + '#weight' => $component['weight'], + '#format' => $format, + '#theme' => 'webform_display_hidden', + '#theme_wrappers' => $format == 'text' ? array('webform_element_text') : array('webform_element'), + '#translatable' => array('title'), + ); + + return $element; +} + +function theme_webform_display_hidden($variables) { + $element = $variables['element']; + + return $element['#format'] == 'html' ? check_plain($element['#markup']) : $element['#markup']; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_hidden($component, $sids = array()) { + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('no', 'data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $nonblanks = 0; + $submissions = 0; + $wordcount = 0; + + $result = $query->execute(); + foreach ($result as $data) { + if (strlen(trim($data['data'])) > 0) { + $nonblanks++; + $wordcount += str_word_count(trim($data['data'])); + } + $submissions++; + } + + $rows[0] = array( t('Empty'), ($submissions - $nonblanks)); + $rows[1] = array( t('Non-empty'), $nonblanks); + $rows[2] = array( t('Average submission length in words (ex blanks)'), + ($nonblanks !=0 ? number_format($wordcount/$nonblanks, 2) : '0')); + return $rows; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_table_hidden($component, $value) { + return check_plain(empty($value[0]) ? '' : $value[0]); +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_headers_hidden($component, $export_options) { + $header = array(); + $header[0] = ''; + $header[1] = ''; + $header[2] = $component['name']; + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_hidden($component, $export_options, $value) { + return isset($value[0]) ? $value[0] : ''; +} diff -Naurw webform_old/components/markup.inc webform/components/markup.inc --- webform_old/components/markup.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/markup.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,80 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'extra' => array( + 'format' => NULL, + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_markup($component) { + $form = array(); + $form['value'] = array( + '#type' => 'text_format', + '#title' => t('Value'), + '#default_value' => $component['value'], + '#description' => t('Markup allows you to enter custom HTML or PHP logic into your form.') . theme('webform_token_help'), + '#weight' => -1, + '#format' => $component['extra']['format'], + '#element_validate' => array('_webform_edit_markup_validate'), + ); + + return $form; +} + +/** + * Element validate handler; Set the text format value. + */ +function _webform_edit_markup_validate($form, &$form_state) { + if (is_array($form_state['values']['value'])) { + $form_state['values']['extra']['format'] = $form_state['values']['value']['format']; + $form_state['values']['value'] = $form_state['values']['value']['value']; + } +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_markup($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'markup', + '#title' => $filter ? NULL : $component['name'], + '#weight' => $component['weight'], + '#markup' => $filter ? _webform_filter_values(check_markup($component['value'], $component['extra']['format'], '', TRUE), $node, NULL, NULL, FALSE) : $component['value'], + '#format' => $component['extra']['format'], + '#theme_wrappers' => array('webform_element'), + '#translatable' => array('title', 'markup'), + ); + + // TODO: Remove when #markup becomes available in D7. + $element['#value'] = $element['#markup']; + + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_markup($component, $value, $format = 'html') { + return array(); +} diff -Naurw webform_old/components/number.inc webform/components/number.inc --- webform_old/components/number.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/number.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,721 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'mandatory' => 0, + 'extra' => array( + 'type' => 'textfield', + 'field_prefix' => '', + 'field_suffix' => '', + 'unique' => 0, + 'title_display' => 0, + 'description' => '', + 'attributes' => array(), + 'private' => FALSE, + 'min' => '', + 'max' => '', + 'step' => '', + 'decimals' => '', + 'point' => '.', + 'separator' => ',', + 'integer' => 0, + 'excludezero' => 0, + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_number() { + return array( + 'webform_number' => array( + 'render element' => 'element', + 'file' => 'components/number.inc', + ), + 'webform_display_number' => array( + 'render element' => 'element', + 'file' => 'components/number.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_number($component) { + $form = array(); + $form['value'] = array( + '#type' => 'textfield', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field.') . theme('webform_token_help'), + '#size' => 60, + '#maxlength' => 1024, + '#weight' => 0, + ); + $form['display']['type'] = array( + '#type' => 'radios', + '#title' => t('Element type'), + '#options' => array( + 'textfield' => t('Text field'), + 'select' => t('Select list'), + ), + '#default_value' => $component['extra']['type'], + '#description' => t('A minimum and maximum value are required if displaying as a select.'), + '#weight' => -1, + '#parents' => array('extra', 'type'), + ); + $form['display']['field_prefix'] = array( + '#type' => 'textfield', + '#title' => t('Prefix text placed to the left of the field'), + '#default_value' => $component['extra']['field_prefix'], + '#description' => t('Examples: $, #, -.'), + '#size' => 20, + '#maxlength' => 127, + '#weight' => 1.1, + '#parents' => array('extra', 'field_prefix'), + ); + $form['display']['field_suffix'] = array( + '#type' => 'textfield', + '#title' => t('Postfix text placed to the right of the field'), + '#default_value' => $component['extra']['field_suffix'], + '#description' => t('Examples: lb, kg, %.'), + '#size' => 20, + '#maxlength' => 127, + '#weight' => 1.2, + '#parents' => array('extra', 'field_suffix'), + ); + $form['display']['decimals'] = array( + '#type' => 'select', + '#title' => t('Decimal places'), + '#options' => array('' => t('Automatic')) + drupal_map_assoc(range(0, 10)), + '#description' => t('Automatic will display up to @count decimals places if needed. A value of "2" is common to format currency amounts.', array('@count' => '4')), + '#default_value' => $component['extra']['decimals'], + '#weight' => 2, + '#parents' => array('extra', 'decimals'), + '#element_validate' => array('_webform_edit_number_validate'), + ); + $form['display']['separator'] = array( + '#type' => 'select', + '#title' => t('Thousands separator'), + '#options' => array( + ',' => t('Comma (,)'), + '.' => t('Period (.)'), + ' ' => t('Space ( )'), + '' => t('None'), + ), + '#default_value' => $component['extra']['separator'], + '#weight' => 3, + '#parents' => array('extra', 'separator'), + '#element_validate' => array('_webform_edit_number_validate'), + ); + $form['display']['point'] = array( + '#type' => 'select', + '#title' => t('Decimal point'), + '#options' => array( + ',' => t('Comma (,)'), + '.' => t('Period (.)'), + ), + '#default_value' => $component['extra']['point'], + '#weight' => 4, + '#parents' => array('extra', 'point'), + '#element_validate' => array('_webform_edit_number_validate'), + ); + $form['validation']['unique'] = array( + '#type' => 'checkbox', + '#title' => t('Unique'), + '#return_value' => 1, + '#description' => t('Check that all entered values for this field are unique. The same value is not allowed to be used twice.'), + '#weight' => 1, + '#default_value' => $component['extra']['unique'], + '#parents' => array('extra', 'unique'), + ); + $form['validation']['integer'] = array( + '#type' => 'checkbox', + '#title' => t('Integer'), + '#return_value' => 1, + '#description' => t('Permit only integer values as input. e.g. 12.34 would be invalid.'), + '#weight' => 1.5, + '#default_value' => $component['extra']['integer'], + '#parents' => array('extra', 'integer'), + ); + $form['validation']['min'] = array( + '#type' => 'textfield', + '#title' => t('Minimum'), + '#default_value' => $component['extra']['min'], + '#description' => t('Minimum numeric value. e.g. 0 would ensure positive numbers.'), + '#size' => 5, + '#maxlength' => 10, + '#weight' => 2.1, + '#parents' => array('extra', 'min'), + '#element_validate' => array('_webform_edit_number_validate'), + ); + $form['validation']['max'] = array( + '#type' => 'textfield', + '#title' => t('Maximum'), + '#default_value' => $component['extra']['max'], + '#description' => t('Maximum numeric value. This may also determine the display width of your field.'), + '#size' => 5, + '#maxlength' => 10, + '#weight' => 2.2, + '#parents' => array('extra', 'max'), + '#element_validate' => array('_webform_edit_number_validate'), + ); + $form['validation']['step'] = array( + '#type' => 'textfield', + '#title' => t('Step'), + '#default_value' => $component['extra']['step'], + '#description' => t('Limit options to a specific increment. e.g. a step of "5" would allow values 5, 10, 15, etc.'), + '#size' => 5, + '#maxlength' => 10, + '#weight' => 3, + '#parents' => array('extra', 'step'), + '#element_validate' => array('_webform_edit_number_validate'), + ); + // Analysis settings. + $form['analysis'] = array( + '#type' => 'fieldset', + '#title' => t('Analysis'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#weight' => 10, + ); + $form['analysis']['excludezero'] = array( + '#type' => 'checkbox', + '#title' => t('Exclude zero'), + '#return_value' => 1, + '#description' => t('Exclude entries of zero (or blank) when counting submissions to calculate average and standard deviation.'), + '#weight' => 1.5, + '#default_value' => $component['extra']['excludezero'], + '#parents' => array('extra', 'excludezero'), + ); + return $form; +} + +/** + * Theme function to render a number component. + */ +function theme_webform_number($variables) { + $element = $variables['element']; + + // This IF statement is mostly in place to allow our tests to set type="text" + // because SimpleTest does not support type="number". + if (!isset($element['#attributes']['type'])) { + $element['#attributes']['type'] = 'number'; + } + + // Step property *must* be a full number with 0 prefix if a decimal. + if (!empty($element['#step']) && !is_int($element['#step'] * 1)) { + $decimals = strlen($element['#step']) - strrpos($element['#step'], '.') - 1; + $element['#step'] = sprintf('%1.' . $decimals . 'F', $element['#step']); + } + + // If the number is not an integer and step is undefined/empty, set the "any" + // value to allow any decimal. + if (empty($element['#integer']) && empty($element['#step'])) { + $element['#step'] = 'any'; + } + elseif ($element['#integer'] && empty($element['#step'])) { + $element['#step'] = 1; + } + + // Convert properties to attributes on the element if set. + foreach (array('id', 'name', 'value', 'size', 'min', 'max', 'step') as $property) { + if (isset($element['#' . $property]) && $element['#' . $property] !== '') { + $element['#attributes'][$property] = $element['#' . $property]; + } + } + _form_set_class($element, array('form-text', 'form-number')); + + return ''; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_number($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#default_value' => $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, FALSE) : $component['value'], + '#required' => $component['mandatory'], + '#weight' => $component['weight'], + '#field_prefix' => empty($component['extra']['field_prefix']) ? NULL : ($filter ? _webform_filter_xss($component['extra']['field_prefix']) : $component['extra']['field_prefix']), + '#field_suffix' => empty($component['extra']['field_suffix']) ? NULL : ($filter ? _webform_filter_xss($component['extra']['field_suffix']) : $component['extra']['field_suffix']), + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#attributes' => $component['extra']['attributes'], + '#element_validate' => array('_webform_validate_number'), + '#theme_wrappers' => array('webform_element'), + '#min' => $component['extra']['min'], + '#max' => $component['extra']['max'], + '#step' => $component['extra']['step'] ? abs($component['extra']['step']) : '', + '#integer' => $component['extra']['integer'], + '#translatable' => array('title', 'description'), + ); + + // Flip the min and max properties to make min less than max if needed. + if ($element['#min'] !== '' && $element['#max'] !== '' && $element['#min'] > $element['#max']) { + $max = $element['#min']; + $element['#min'] = $element['#max']; + $element['#max'] = $max; + } + + // Ensure #step starts with a zero if a decimal. + if (!is_int($element['#step'] * 1)) { + $decimals = strlen($element['#step']) - strrpos($element['#step'], '.') - 1; + $element['#step'] = sprintf('%1.' . $decimals . 'F', $element['#step']); + } + + if ($component['extra']['type'] == 'textfield') { + // Render as textfield. + $element['#type'] = 'webform_number'; + + // Set the size property based on #max, to ensure consistent behavior for + // browsers that do not support type = number. + if ($element['#max']) { + $element['#size'] = strlen($element['#max']) + 1; + } + } + else { + // Render as select. + $element['#type'] = 'select'; + + // Create user-specified options list as an array. + $element['#options'] = _webform_number_select_options($component); + + // Add default options if using a select list with no default. This trigger's + // Drupal 7's adding of the option for us. See form_process_select(). + if ($component['extra']['type'] == 'select' && $element['#default_value'] === '') { + $element['#empty_value'] = ''; + } + } + + // Set user-entered values. + if (isset($value[0])) { + $element['#default_value'] = $value[0]; + } + + // Enforce uniqueness. + if ($component['extra']['unique']) { + $element['#element_validate'][] = 'webform_validate_unique'; + } + + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_number($component, $value, $format = 'html') { + $empty = !isset($value[0]) || $value[0] === ''; + return array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#theme' => 'webform_display_number', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#field_prefix' => $empty ? '' : $component['extra']['field_prefix'], + '#field_suffix' => $empty ? '' : $component['extra']['field_suffix'], + '#format' => $format, + '#value' => $empty ? '' : _webform_number_format($component, $value[0]), + '#translatable' => array('title'), + ); +} + +/** + * Format the output of data for this component. + */ +function theme_webform_display_number($variables) { + $element = $variables['element']; + $prefix = $element['#format'] == 'html' ? filter_xss($element['#field_prefix']) : $element['#field_prefix']; + $suffix = $element['#format'] == 'html' ? filter_xss($element['#field_suffix']) : $element['#field_suffix']; + $value = $element['#format'] == 'html' ? check_plain($element['#value']) : $element['#value']; + return $value !== '' ? ($prefix . $value . $suffix) : ' '; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_number($component, $sids = array(), $single = FALSE) { + $advanced_stats = $single; + + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $population = array(); + $submissions = 0; + $nonzero = 0; + $not_empty = 0; + $sum = 0; + + $result = $query->execute(); + foreach ($result as $data) { + $value = trim($data['data']); + if ($value == '') { + $number = 0.0; + } + else { + $number = $value * 1.0; + } + + if ($value !== '') { + $not_empty++; + } + + if ($number > 0) { + $nonzero++; + $sum += $number; + } + $population[] = $number; + $submissions++; + } + sort($population, SORT_NUMERIC); + + // Average and population count. + if ($component['extra']['excludezero']) { + $average = $nonzero ? ($sum / $nonzero) : 0; + $average_title = t('Average !mu excluding zeros/blanks', array('!mu' => $advanced_stats ? '(μ)' : '')); + // Sample (sub-set of total population). + $population_count = $nonzero - 1; + $sigma = 'sd'; + $description = t('sample'); + } + else { + $average = $submissions ? ($sum / $submissions) : 0; + $average_title = t('Average !mu including zeros/blanks', array('!mu' => $advanced_stats ? '(μ)' : '')); + // Population. + $population_count = $submissions; + $sigma = 'σ'; + $description = t('population'); + } + + // Formatting. + $average = _webform_number_format($component, $average); + $sum = _webform_number_format($component, $sum); + + $rows[0] = array(t('Zero/blank'), ($submissions - $nonzero)); + $rows[1] = array(t('User entered value'), $not_empty); + $rows[2] = array(t('Sum') . ($advanced_stats ? ' (Σ)' : ''), $sum); + $rows[3] = array($average_title, $average); + + if (!$advanced_stats && $sum != 0) { + $rows[4] = array('', l(t('More stats »'), 'node/' . $component['nid'] . '/webform-results/analysis/' . $component['cid'])); + } + + // Normal distribution information. + if ($advanced_stats && $population_count && $sum != 0) { + // Standard deviation. + $stddev = 0; + foreach($population as $value) { + // Obtain the total of squared variances. + $stddev += pow(($value - $average), 2); + } + if ($population_count > 0) { + $stddev = sqrt($stddev / $population_count); + } + else { + $stddev = sqrt($stddev); + } + + // Build normal distribution table rows. + $count = array(); + $percent = array(); + $limit = array(); + $index = 0; + + $count[] = 0; + $limit[] = $average - ($stddev * 4); + foreach ($population as $value) { + while ($value >= $limit[$index]) { + $percent[] = number_format($count[$index] / $population_count * 100, 2, '.', ''); + $limit[] = $limit[$index] + $stddev; + $index += 1; + if ($limit[$index] == $average) { + $limit[$index] = $limit[$index] + $stddev; + } + $count[$index] = 0; + } + $count[$index] += 1; + } + $percent[] = number_format($count[$index] / $population_count * 100, 2, '.', ''); + + // Format normal distribution table output. + $stddev = _webform_number_format($component, $stddev); + $low = _webform_number_format($component, $population[0]); + $high = _webform_number_format($component, end($population)); + foreach($limit as $key => $value) { + $limit[$key] = _webform_number_format($component, $value); + } + + // Column headings (override potential theme uppercase, e.g. Seven in D7). + $header = array( + t('Normal Distribution'), + array('data' => '-4' . $sigma, 'style' => 'text-transform: lowercase;',), + array('data' => '-3' . $sigma, 'style' => 'text-transform: lowercase;',), + array('data' => '-2' . $sigma, 'style' => 'text-transform: lowercase;',), + array('data' => '-1' . $sigma, 'style' => 'text-transform: lowercase;',), + array('data' => '+1' . $sigma, 'style' => 'text-transform: lowercase;',), + array('data' => '+2' . $sigma, 'style' => 'text-transform: lowercase;',), + array('data' => '+3' . $sigma, 'style' => 'text-transform: lowercase;',), + array('data' => '+4' . $sigma, 'style' => 'text-transform: lowercase;',), + ); + + // Insert row labels. + array_unshift($limit, t('Boundary')); + array_unshift($count, t('Count')); + array_unshift($percent, t('% of !description', array('!description' => $description))); + + $output = theme('table', array('header' => $header, 'rows' => array($limit, $count, $percent))); + + $rows[4] = array(t('Range'), t('!low to !high', array('!low' => $low, '!high' => $high))); + $rows[5] = array(t('Standard deviation (!sigma)', array('!sigma' => $sigma)), $stddev); + $rows[6] = array(array('data' => $output, 'colspan' => 2)); + } + + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_number($component, $value) { + return isset($value[0]) ? _webform_number_format($component, $value[0]) : ''; +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_number($component, $export_options) { + $header = array(); + $header[0] = ''; + $header[1] = ''; + $header[2] = $component['name']; + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_number($component, $export_options, $value) { + if (isset($value[0]) && is_numeric($value[0]) && $component['extra']['decimals'] !== '') { + $value[0] = number_format($value[0], $component['extra']['decimals'], '.', ''); + } + return isset($value[0]) ? $value[0] : ''; +} + +/** + * A Drupal Form API Validation function. Validates the entered values from + * number components on the client-side form. + * + * @param $element + * The form element. May either be a select or a webform_number element. + * @param $form_state + * The full form state for the webform. + * @return + * None. Calls a form_set_error if the number is not valid. + */ +function _webform_validate_number($element, &$form_state) { + $value = trim($element['#value']); + form_set_value($element, $value, $form_state); + + if ($value != '') { + // Numeric test. + if (is_numeric($value)) { + // Range test. + if ($element['#min'] != '' && $element['#max'] != '') { + // Flip minimum and maximum if needed. + if ($element['#max'] > $element['#min']) { + $min = $element['#min']; + $max = $element['#max']; + } + else { + $min = $element['#max']; + $max = $element['#min']; + } + if ($value > $max || $value < $min) { + form_error($element, t('%name field value of @value should be in the range @min to @max.', array('%name' => $element['#title'], '@value' => $value, '@min' => $min, '@max' => $max))); + } + } + elseif ($element['#max'] != '' && $value > $element['#max']) { + form_error($element, t('%name field value must be less than @max.', array('%name' => $element['#title'], '@max' => $element['#max']))); + } + elseif ($element['#min'] != '' && $value < $element['#min']) { + form_error($element, t('%name field value must be greater than @min.', array('%name' => $element['#title'], '@min' => $element['#min']))); + } + + // Integer test. + if ($element['#integer'] && !is_int($value * 1)) { + form_error($element, t('%name field value of @value must be an integer.', array('%name' => $element['#title'], '@value' => $value))); + } + + // Step test. + $starting_number = $element['#min'] ? $element['#min'] : 0; + if ($element['#step'] != 0 && fmod($element['#value'] - $starting_number, $element['#step']) != 0) { + $samples = array( + $starting_number, + $starting_number + ($element['#step'] * 1), + $starting_number + ($element['#step'] * 2), + $starting_number + ($element['#step'] * 3), + ); + if ($starting_number) { + form_error($element, t('%name field value must be @start plus a multiple of @step. i.e. @samples, etc.', array('%name' => $element['#title'], '@start' => $element['#min'], '@step' => $element['#step'], '@samples' => implode(', ', $samples)))); + } + else { + form_error($element, t('%name field value must be a multiple of @step. i.e. @samples, etc.', array('%name' => $element['#title'], '@step' => $element['#step'], '@samples' => implode(', ', $samples)))); + } + } + } + else { + form_error($element, t('%name field value of @value must be numeric.', array('%name' => $element['#title'], '@value' => $value))); + } + } + +} + +/** + * Validation of number edit form items. + */ +function _webform_edit_number_validate($element, &$form_state) { + // Find the value of all related fields to this element. + $parents = $element['#parents']; + $key = array_pop($parents); + $values = $form_state['values']; + foreach ($parents as $parent) { + $values = $values[$parent]; + } + + switch ($key) { + case 'min': + if ($values['min'] == '') { + if (isset($values['type']) && $values['type'] === 'select') { + form_error($element, t('Minimum is required when using a select list element.')); + } + } + else { + if (!is_numeric($values['min'])) { + form_error($element, t('Minimum must be numeric.')); + } + if ($values['integer'] && !is_int($values['min'] * 1)) { + form_error($element, t('Minimum must have an integer value.')); + } + } + break; + case 'max': + if ($values['max'] == '') { + if (isset($values['type']) && $values['type'] === 'select') { + form_error($element, t('Maximum is required when using a select list element.')); + } + } + else { + if (!is_numeric($values['max'])) { + form_error($element, t('Maximum must be numeric.')); + } + if ($values['integer'] && !is_int($values['max'] * 1)) { + form_error($element, t('Maximum must have an integer value.')); + } + } + break; + case 'step': + if ($values['step'] !== '') { + if (!is_numeric($values['step'])) { + form_error($element, t('Step must be numeric.')); + } + else { + if ($values['integer'] && !is_int($values['step'] * 1)) { + form_error($element, t('Step must have an integer value.')); + } + } + } + break; + } + return TRUE; +} + +/** + * Generate select list options. + */ +function _webform_number_select_options($component) { + $options = array(); + $step = abs($component['extra']['step']); + + // Step is optional and defaults to 1. + $step = empty($step) ? 1 : $step; + + // Generate list in correct direction. + $min = $component['extra']['min']; + $max = $component['extra']['max']; + $flipped = FALSE; + if ($max < $min) { + $min = $component['extra']['max']; + $max = $component['extra']['min']; + $flipped = TRUE; + } + + for ($f = $min; $f <= $max; $f += $step) { + $options[$f . ''] = $f . ''; + } + + // TODO: HTML5 browsers apparently do not include the max value if it does + // not line up with step. Restore this if needed in the future. + // Add end limit if it's been skipped due to step. + //if (end($options) != $max) { + // $options[$f] = $max; + //} + + if ($flipped) { + $options = array_reverse($options, TRUE); + } + + // Apply requisite number formatting. + foreach ($options as $key => $value) { + $options[$key] = _webform_number_format($component, $value); + } + + return $options; +} + +/** + * Apply number format. + */ +function _webform_number_format($component, $value) { + if (!is_numeric($value)) { + return ''; + } + // If no decimal places are specified, do a best guess length of decimals. + $decimals = $component['extra']['decimals']; + if ($decimals === '') { + // If it's an integer, no decimals needed. + if (is_int(($value . '') * 1)) { + $decimals = 0; + } + else { + $decimals = strlen($value) - strrpos($value, '.') - 1; + } + if ($decimals > 4) { + $decimals = 4; + } + } + + return number_format($value, $decimals, $component['extra']['point'], $component['extra']['separator']); +} diff -Naurw webform_old/components/pagebreak.inc webform/components/pagebreak.inc --- webform_old/components/pagebreak.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/pagebreak.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,101 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'extra' => array( + 'private' => FALSE, + 'next_page_label' => '', + 'prev_page_label' => '', + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_pagebreak() { + return array( + 'webform_display_pagebreak' => array( + 'render element' => 'element', + 'file' => 'components/pagebreak.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_pagebreak($component) { + $form = array(); + // Force the parent to always be root. + $form['position']['pid'] = array( + '#type' => 'hidden', + '#value' => '0', + ); + + $form['display'] = array('#type' => 'markup'); // Hide the display options. + + $form['extra']['next_page_label'] = array( + '#type' => 'textfield', + '#title' => t('Next page button label'), + '#description' => t('This is used for the Next Page button on the page before this page break. Default: Next Page >'), + '#default_value' => $component['extra']['next_page_label'], + '#size' => 30, + ); + $form['extra']['prev_page_label'] = array( + '#type' => 'textfield', + '#title' => t('Prev page button label'), + '#description' => t('This is used for the Prev Page button on the page after this page break. Default: < Prev Page'), + '#default_value' => $component['extra']['prev_page_label'], + '#size' => 30, + ); + + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_pagebreak($component, $value = NULL, $filter = TRUE) { + $element = array( + '#type' => 'hidden', + '#value' => $component['name'], + '#weight' => $component['weight'], + ); + return $element; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_display_pagebreak($component, $value = NULL, $format = 'html') { + $element = array( + '#theme' => 'webform_display_pagebreak', + '#title' => $component['name'], + '#weight' => $component['weight'], + '#format' => $format, + '#translatable' => array('title'), + ); + return $element; +} + +/** + * Format the text output data for this component. + */ +function theme_webform_display_pagebreak($variables) { + $element = $variables['element']; + + return $element['#format'] == 'html' ? '

' . check_plain($element['#title']) . '

' : "--" . $element['#title'] . "--\n"; +} diff -Naurw webform_old/components/select.inc webform/components/select.inc --- webform_old/components/select.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/select.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,981 @@ + '', + 'form_key' => NULL, + 'mandatory' => 0, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'extra' => array( + 'items' => '', + 'multiple' => NULL, + 'aslist' => NULL, + 'optrand' => 0, + 'other_option' => NULL, + 'other_text' => t('Other...'), + 'title_display' => 0, + 'description' => '', + 'custom_keys' => FALSE, + 'options_source' => '', + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_select() { + return array( + 'webform_display_select' => array( + 'render element' => 'element', + 'file' => 'components/select.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_select($component) { + $form = array( + '#attached' => array( + 'js' => array( + drupal_get_path('module', 'webform') . '/js/select-admin.js' => array('preprocess' => FALSE), + array('data' => array('webform' => array('selectOptionsUrl' => url('webform/ajax/options/' . $component['nid']))), 'type' => 'setting'), + ), + ), + ); + + $other = array(); + if ($info = _webform_select_options_info()) { + $options = array('' => t('None')); + foreach ($info as $name => $source) { + $options[$name] = $source['title']; + } + + $other['options_source'] = array( + '#title' => t('Load a pre-built option list'), + '#type' => 'select', + '#options' => $options, + '#default_value' => $component['extra']['options_source'], + '#weight' => 1, + '#description' => t('Use a pre-built list of options rather than entering options manually. Options will not be editable if using pre-built list.'), + '#parents' => array('extra', 'options_source'), + '#weight' => 5, + ); + } + + if (module_exists('select_or_other')) { + $other['other_option'] = array( + '#type' => 'checkbox', + '#title' => t('Allow "Other..." option'), + '#default_value' => $component['extra']['other_option'], + '#description' => t('Check this option if you want to allow users to enter an option not on the list.'), + '#parents' => array('extra', 'other_option'), + '#weight' => 2, + ); + $other['other_text'] = array( + '#type' => 'textfield', + '#title' => t('Text for "Other..." option'), + '#default_value' => $component['extra']['other_text'], + '#description' => t('If allowing other options, enter text to be used for other-enabling option.'), + '#parents' => array('extra', 'other_text'), + '#weight' => 3, + ); + } + + if (module_exists('options_element')) { + $options = _webform_select_options($component, FALSE, FALSE); + + $form['items'] = array( + '#type' => 'fieldset', + '#title' => t('Options'), + '#collapsible' => TRUE, + '#attributes' => array('class' => array('webform-options-element')), + '#element_validate' => array('_webform_edit_validate_options'), + '#weight' => 2, + ); + + $form['items']['options'] = array( + '#type' => 'options', + '#limit' => 500, + '#optgroups' => $component['extra']['aslist'], + '#multiple' => $component['extra']['multiple'], + '#multiple_toggle' => t('Multiple'), + '#default_value' => $component['value'], + '#options' => $options, + '#options_readonly' => !empty($component['extra']['options_source']), + '#key_type' => 'mixed', + '#key_type_toggle' => t('Customize keys (Advanced)'), + '#key_type_toggled' => $component['extra']['custom_keys'], + '#default_value_pattern' => '^%.+\[.+\]$', + '#weight' => 1, + ); + + $form['items']['options']['option_settings'] = $other; + } + else { + $form['extra']['items'] = array( + '#type' => 'textarea', + '#title' => t('Options'), + '#default_value' => $component['extra']['items'], + '#description' => t('Key-value pairs MUST be specified as "safe_key|Some readable option". Use of only alphanumeric characters and underscores is recommended in keys. One option per line. Option groups may be specified with <Group Name>. <> can be used to insert items at the root of the menu after specifying a group.') . theme('webform_token_help'), + '#cols' => 60, + '#rows' => 5, + '#weight' => 0, + '#required' => TRUE, + '#wysiwyg' => FALSE, + '#element_validate' => array('_webform_edit_validate_select'), + ); + + if (!empty($component['extra']['options_source'])) { + $form['extra']['items']['#attributes'] = array('readonly' => 'readonly'); + } + + $form['extra'] = array_merge($form['extra'], $other); + $form['value'] = array( + '#type' => 'textfield', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field identified by its key. For multiple selects use commas to separate multiple defaults.') . theme('webform_token_help'), + '#size' => 60, + '#maxlength' => 1024, + '#weight' => 0, + ); + $form['extra']['multiple'] = array( + '#type' => 'checkbox', + '#title' => t('Multiple'), + '#default_value' => $component['extra']['multiple'], + '#description' => t('Check this option if the user should be allowed to choose multiple values.'), + '#weight' => 0, + ); + } + + $form['display']['aslist'] = array( + '#type' => 'checkbox', + '#title' => t('Listbox'), + '#default_value' => $component['extra']['aslist'], + '#description' => t('Check this option if you want the select component to be displayed as a select list box instead of radio buttons or checkboxes. Option groups (nested options) are only supported with listbox components.'), + '#parents' => array('extra', 'aslist'), + ); + $form['display']['optrand'] = array( + '#type' => 'checkbox', + '#title' => t('Randomize options'), + '#default_value' => $component['extra']['optrand'], + '#description' => t('Randomizes the order of the options when they are displayed in the form.'), + '#parents' => array('extra', 'optrand'), + ); + + return $form; +} + +/** + * Element validation callback. Ensure keys are not duplicated. + */ +function _webform_edit_validate_select($element, &$form_state) { + // Check for duplicate key values to prevent unexpected data loss. Require + // all options to include a safe_key. + if (!empty($element['#value'])) { + $lines = explode("\n", trim($element['#value'])); + $existing_keys = array(); + $duplicate_keys = array(); + $missing_keys = array(); + $long_keys = array(); + $group = ''; + foreach ($lines as $line) { + $matches = array(); + $line = trim($line); + if (preg_match('/^\<([^>]*)\>$/', $line, $matches)) { + $group = $matches[1]; + $key = NULL; // No need to store group names. + } + elseif (preg_match('/^([^|]*)\|(.*)$/', $line, $matches)) { + $key = $matches[1]; + if (strlen($key) > 128) { + $long_keys[] = $key; + } + } + else { + $missing_keys[] = $line; + } + + if (isset($key)) { + if (isset($existing_keys[$group][$key])) { + $duplicate_keys[$key] = $key; + } + else { + $existing_keys[$group][$key] = $key; + } + } + } + + if (!empty($missing_keys)) { + form_error($element, t('Every option must have a key specified. Specify each option as "safe_key|Some readable option".')); + } + + if (!empty($long_keys)) { + form_error($element, t('Option keys must be less than 128 characters. The following keys exceed this limit:') . theme('item_list', $long_keys)); + } + + if (!empty($duplicate_keys)) { + form_error($element, t('Options within the select list must be unique. The following keys have been used multiple times:') . theme('item_list', array('items' => $duplicate_keys))); + } + + // Set the listbox option if needed. + if (empty($missing_keys) && empty($long_keys) && empty($duplicate_keys)) { + $options = _webform_select_options_from_text($element['#value']); + _webform_edit_validate_set_aslist($options, $form_state); + } + } + + return TRUE; +} + +/** + * Set the appropriate webform values when using the options element module. + */ +function _webform_edit_validate_options($element, &$form_state) { + $key = end($element['#parents']); + $element_options = $form_state['values'][$key]['options']; + unset($form_state['values'][$key]); + + $form_state['values']['extra'][$key] = form_options_to_text($element_options['options'], 'custom'); + + // Options saved for select components. + if ($key == 'items') { + $form_state['values']['extra']['multiple'] = $element_options['multiple']; + $form_state['values']['extra']['custom_keys'] = $element_options['custom_keys']; + $form_state['values']['value'] = is_array($element_options['default_value']) ? implode(', ', $element_options['default_value']) : $element_options['default_value']; + + // Set the listbox option if needed. + _webform_edit_validate_set_aslist($element_options['options'], $form_state); + } + // Options saved for grid components. + else { + $form_state['values']['extra']['custom_' . rtrim($key, 's') . '_keys'] = $element_options['custom_keys']; + } +} + +/** + * Ensure "aslist" is used for option groups. Called from options validations. + */ +function _webform_edit_validate_set_aslist($options, &$form_state) { + if (empty($form_state['values']['extra']['aslist']) && !empty($options)) { + foreach ($options as $option) { + if (is_array($option)) { + $form_state['values']['extra']['aslist'] = 1; + drupal_set_message(t('The component %name has automatically been set to display as a listbox in order to support option groups.', array('%name' => $form_state['values']['name'])), 'warning'); + break; + } + } + } +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_select($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#required' => $component['mandatory'], + '#weight' => $component['weight'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#theme_wrappers' => array('webform_element'), + '#pre_render' => array(), // Needed to disable double-wrapping of radios and checkboxes. + '#translatable' => array('title', 'description', 'options'), + ); + + // Convert the user-entered options list into an array. + $default_value = $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, FALSE) : $component['value']; + $options = _webform_select_options($component, !$component['extra']['aslist'], $filter); + + if ($component['extra']['optrand']) { + _webform_shuffle_options($options); + } + + // Add default options if using a select list with no default. This trigger's + // Drupal 7's adding of the option for us. See @form_process_select(). + if ($component['extra']['aslist'] && !$component['extra']['multiple'] && $default_value === '') { + $element['#empty_value'] = ''; + } + + // Set the component options. + $element['#options'] = $options; + + // Set the default value. + if (isset($value)) { + if ($component['extra']['multiple']) { + // Set the value as an array. + $element['#default_value'] = array(); + foreach ((array) $value as $key => $option_value) { + $element['#default_value'][] = $option_value; + } + } + else { + // Set the value as a single string. + $element['#default_value'] = ''; + foreach ((array) $value as $option_value) { + $element['#default_value'] = $option_value; + } + } + } + elseif ($default_value !== '') { + // Convert default value to a list if necessary. + if ($component['extra']['multiple']) { + $varray = explode(',', $default_value); + foreach ($varray as $key => $v) { + $v = trim($v); + if ($v !== '') { + $element['#default_value'][] = $v; + } + } + } + else { + $element['#default_value'] = $default_value; + } + } + elseif ($component['extra']['multiple']) { + $element['#default_value'] = array(); + } + + if ($component['extra']['other_option'] && module_exists('select_or_other')) { + // Set display as a select_or_other element: + $element['#type'] = 'select_or_other'; + $element['#other'] = !empty($component['extra']['other_text']) ? check_plain($component['extra']['other_text']) : t('Other...'); + $element['#other_title'] = $element['#title'] . ' ' . $element['#other']; + $element['#other_title_display'] = 'invisible'; + $element['#other_unknown_defaults'] = 'other'; + $element['#other_delimiter'] = ', '; + // Merge in Webform's #process function for Select or other. + $element['#process'] = array_merge(element_info_property('select_or_other', '#process'), array('webform_expand_select_or_other')); + + if ($component['extra']['multiple']) { + $element['#multiple'] = TRUE; + $element['#select_type'] = 'checkboxes'; + } + else { + $element['#multiple'] = FALSE; + $element['#select_type'] = 'radios'; + } + if ($component['extra']['aslist']) { + $element['#select_type'] = 'select'; + } + } + elseif ($component['extra']['aslist']) { + // Set display as a select list: + $element['#type'] = 'select'; + if ($component['extra']['multiple']) { + $element['#size'] = 4; + $element['#multiple'] = TRUE; + } + } + else { + if ($component['extra']['multiple']) { + // Set display as a checkbox set. + $element['#type'] = 'checkboxes'; + $element['#theme_wrappers'] = array_merge(array('checkboxes'), $element['#theme_wrappers']); + $element['#process'] = array_merge(element_info_property('checkboxes', '#process'), array('webform_expand_select_ids')); + + // Entirely replace the normal expand checkboxes with our custom version. + // This helps render checkboxes in multipage forms. + $process_key = array_search('form_process_checkboxes', $element['#process']); + $element['#process'][$process_key] = 'webform_expand_checkboxes'; + } + else { + // Set display as a radio set. + $element['#type'] = 'radios'; + $element['#theme_wrappers'] = array_merge(array('radios'), $element['#theme_wrappers']); + $element['#process'] = array_merge(element_info_property('radios', '#process'), array('webform_expand_select_ids')); + } + } + + return $element; +} + +/** + * Process function to ensure select_or_other elements validate properly. + */ +function webform_expand_select_or_other($element) { + // Disable validation for back-button and save draft. + $element['select']['#validated'] = TRUE; + $element['select']['#webform_validated'] = FALSE; + + $element['other']['#validated'] = TRUE; + $element['other']['#webform_validated'] = FALSE; + + // The Drupal FAPI does not support #title_display inline so we need to move + // to a supported value here to be compatible with select_or_other. + $element['select']['#title_display'] = $element['#title_display'] === 'inline' ? 'before' : $element['#title_display']; + + // If the default value contains "select_or_other" (the key of the select + // element for the "other..." choice), discard it and set the "other" value. + if (is_array($element['#default_value']) && in_array('select_or_other', $element['#default_value'])) { + $key = array_search('select_or_other', $element['#default_value']); + unset($element['#default_value'][$key]); + $element['#default_value'] = array_values($element['#default_value']); + $element['other']['#default_value'] = implode(', ', $element['#default_value']); + } + + // Sanitize the options in Select or other check boxes and radio buttons. + if ($element['#select_type'] == 'checkboxes' || $element['#select_type'] == 'radios') { + $element['select']['#process'] = array_merge(element_info_property($element['#select_type'], '#process'), array('webform_expand_select_ids')); + } + + return $element; +} + +/** + * Drupal 6 hack that properly *renders* checkboxes in multistep forms. This is + * different than the value hack needed in Drupal 5, which is no longer needed. + */ +function webform_expand_checkboxes($element) { + // Elements that have a value set are already in the form structure cause + // them not to be written when the expand_checkboxes function is called. + $default_value = array(); + foreach (element_children($element) as $key) { + if (isset($element[$key]['#default_value'])) { + $default_value[$key] = $element[$key]['#default_value']; + unset($element[$key]); + } + } + + $element = form_process_checkboxes($element); + + // Escape the values of checkboxes. + foreach (element_children($element) as $key) { + $element[$key]['#return_value'] = check_plain($element[$key]['#return_value']); + $element[$key]['#name'] = $element['#name'] . '[' . $element[$key]['#return_value'] . ']'; + } + + foreach ($default_value as $key => $val) { + $element[$key]['#default_value'] = $val; + } + return $element; +} + +/** + * FAPI process function to rename IDs attached to checkboxes and radios. + */ +function webform_expand_select_ids($element) { + $id = $element['#id'] = str_replace('_', '-', _webform_safe_name(strip_tags($element['#id']))); + $delta = 0; + foreach (element_children($element) as $key) { + $delta++; + // Convert the #id for each child to a safe name, regardless of key. + $element[$key]['#id'] = $id . '-' . $delta; + + // Prevent scripts or CSS in the labels for each checkbox or radio. + $element[$key]['#title'] = _webform_filter_xss($element[$key]['#title']); + } + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_select($component, $value, $format = 'html') { + return array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#multiple' => $component['extra']['multiple'], + '#theme' => 'webform_display_select', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#format' => $format, + '#options' => _webform_select_options($component, !$component['extra']['aslist']), + '#value' => (array) $value, + '#translatable' => array('title', 'options'), + ); +} + +/** + * Implements _webform_submit_component(). + * + * Convert FAPI 0/1 values into something saveable. + */ +function _webform_submit_select($component, $value) { + // Build a list of all valid keys expected to be submitted. + $options = _webform_select_options($component, TRUE); + + $return = NULL; + if (is_array($value)) { + $return = array(); + foreach ($value as $key => $option_value) { + // Handle options that are specified options. + if ($option_value !== '' && isset($options[$option_value])) { + // Checkboxes submit an integer value of 0 when unchecked. A checkbox + // with a value of '0' is valid, so we can't use empty() here. + if ($option_value === 0 && !$component['extra']['aslist'] && $component['extra']['multiple']) { + unset($value[$option_value]); + } + else { + $return[] = $option_value; + } + } + // Handle options that are added through the "other" field. Specifically + // exclude the "select_or_other" value, which is added by the select list. + elseif ($component['extra']['other_option'] && module_exists('select_or_other') && $option_value != 'select_or_other') { + $return[] = $option_value; + } + } + } + elseif (is_string($value)) { + $return = $value; + } + + return $return; +} + +/** + * Format the text output for this component. + */ +function theme_webform_display_select($variables) { + $element = $variables['element']; + + // Flatten the list of options so we can get values easily. These options + // may be translated by hook_webform_display_component_alter(). + $options = array(); + foreach ($element['#options'] as $key => $value) { + if (is_array($value)) { + foreach ($value as $subkey => $subvalue) { + $options[$subkey] = $subvalue; + } + } + else { + $options[$key] = $value; + } + } + + $items = array(); + if ($element['#multiple']) { + foreach ((array) $element['#value'] as $option_value) { + if ($option_value !== '') { + // Administer provided values. + if (isset($options[$option_value])) { + $items[] = $element['#format'] == 'html' ? _webform_filter_xss($options[$option_value]) : $options[$option_value]; + } + // User-specified in the "other" field. + else { + $items[] = $element['#format'] == 'html' ? check_plain($option_value) : $option_value; + } + } + } + } + else { + if (isset($element['#value'][0]) && $element['#value'][0] !== '') { + // Administer provided values. + if (isset($options[$element['#value'][0]])) { + $items[] = $element['#format'] == 'html' ? _webform_filter_xss($options[$element['#value'][0]]) : $options[$element['#value'][0]]; + } + // User-specified in the "other" field. + else { + $items[] = $element['#format'] == 'html' ? check_plain($element['#value'][0]) : $element['#value'][0]; + } + } + } + + if ($element['#format'] == 'html') { + $output = count($items) > 1 ? theme('item_list', array('items' => $items)) : (isset($items[0]) ? $items[0] : ' '); + } + else { + if (count($items) > 1) { + foreach ($items as $key => $item) { + $items[$key] = ' - ' . $item; + } + $output = implode("\n", $items); + } + else { + $output = isset($items[0]) ? $items[0] : ' '; + } + } + + return $output; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_select($component, $sids = array(), $single = FALSE) { + $options = _webform_select_options($component, TRUE); + $show_other_results = $single; + + $sid_placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array(); + $sid_filter = count($sids) ? " AND sid IN (" . implode(",", $sid_placeholders) . ")" : ""; + + $option_operator = $show_other_results ? 'NOT IN' : 'IN'; + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']) + ->condition('data', '', '<>') + ->condition('data', array_keys($options), $option_operator) + ->groupBy('data'); + $query->addExpression('COUNT(data)', 'datacount'); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $count_query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']) + ->condition('data', '', '<>'); + $count_query->addExpression('COUNT(*)', 'datacount'); + if (count($sids)) { + $count_query->condition('sid', $sids, 'IN'); + } + + $result = $query->execute(); + $rows = array(); + $normal_count = 0; + foreach ($result as $data) { + $display_option = $single ? $data['data'] : $options[$data['data']]; + $rows[$data['data']] = array(_webform_filter_xss($display_option), $data['datacount']); + $normal_count += $data['datacount']; + } + + if (!$show_other_results) { + // Order the results according to the normal options array. + $ordered_rows = array(); + foreach (array_intersect_key($options, $rows) as $key => $label) { + $ordered_rows[] = $rows[$key]; + } + + // Add a row for any unknown or user-entered values. + if ($component['extra']['other_option']) { + $full_count = $count_query->execute()->fetchField(); + $other_count = $full_count - $normal_count; + $display_option = !empty($component['extra']['other_text']) ? check_plain($component['extra']['other_text']) : t('Other...'); + $other_text = $other_count ? $other_count . ' (' . l(t('view'), 'node/' . $component['nid'] . '/webform-results/analysis/' . $component['cid']) . ')' : $other_count; + $ordered_rows[] = array($display_option, $other_text); + } + + $rows = $ordered_rows; + } + + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_select($component, $value) { + // Convert submitted 'safe' values to un-edited, original form. + $options = _webform_select_options($component, TRUE); + + $value = (array) $value; + $items = array(); + // Set the value as a single string. + foreach ($value as $option_value) { + if ($option_value !== '') { + if (isset($options[$option_value])) { + $items[] = _webform_filter_xss($options[$option_value]); + } + else { + $items[] = check_plain($option_value); + } + } + } + + return implode('
', $items); +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_select($component, $export_options) { + $headers = array( + 0 => array(), + 1 => array(), + 2 => array(), + ); + + if ($component['extra']['multiple'] && $export_options['select_format'] == 'separate') { + $headers[0][] = ''; + $headers[1][] = $component['name']; + $items = _webform_select_options($component, TRUE, FALSE); + if ($component['extra']['other_option']) { + $other_label = !empty($component['extra']['other_text']) ? check_plain($component['extra']['other_text']) : t('Other...'); + $items[$other_label] = $other_label; + } + $count = 0; + foreach ($items as $key => $item) { + // Empty column per sub-field in main header. + if ($count != 0) { + $headers[0][] = ''; + $headers[1][] = ''; + } + if ($export_options['select_keys']) { + $headers[2][] = $key; + } + else { + $headers[2][] = $item; + } + $count++; + } + } + else { + $headers[0][] = ''; + $headers[1][] = ''; + $headers[2][] = $component['name']; + } + return $headers; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_select($component, $export_options, $value) { + $options = _webform_select_options($component, TRUE, FALSE); + $return = array(); + + if ($component['extra']['multiple']) { + foreach ($options as $key => $item) { + $index = array_search($key, (array) $value); + if ($index !== FALSE) { + if ($export_options['select_format'] == 'separate') { + $return[] = 'X'; + } + else { + $return[] = $export_options['select_keys'] ? $key : $item; + } + unset($value[$index]); + } + elseif ($export_options['select_format'] == 'separate') { + $return[] = ''; + } + } + + // Any remaining items in the $value array will be user-added options. + if ($component['extra']['other_option']) { + $return[] = count($value) ? implode(',', $value) : ''; + } + } + else { + $key = $value[0]; + if ($export_options['select_keys']) { + $return = $key; + } + else { + $return = isset($options[$key]) ? $options[$key] : $key; + } + } + + if ($component['extra']['multiple'] && $export_options['select_format'] == 'compact') { + $return = implode(',', (array) $return); + } + + return $return; +} + +/** + * Menu callback; Return a predefined list of select options as JSON. + */ +function webform_select_options_ajax($source_name = '') { + $info = _webform_select_options_info(); + + $component['extra']['options_source'] = $source_name; + if ($source_name && isset($info[$source_name])) { + $options = _webform_select_options_to_text(_webform_select_options($component, !$component['extra']['aslist'], FALSE)); + } + else { + $options = ''; + } + + $return = array( + 'elementId' => module_exists('options_element') ? 'edit-items-options-options-field-widget' : 'edit-extra-items', + 'options' => $options, + ); + + drupal_json_output($return); +} + +/** + * Generate a list of options for a select list. + */ +function _webform_select_options($component, $flat = FALSE, $filter = TRUE) { + if ($component['extra']['options_source']) { + $options = _webform_select_options_callback($component['extra']['options_source'], $component, $flat, $filter); + } + else { + $options = _webform_select_options_from_text($component['extra']['items'], $flat, $filter); + } + + return isset($options) ? $options : array(); +} + +/** + * Load Webform select option info from 3rd party modules. + */ +function _webform_select_options_info() { + static $info; + if (!isset($info)) { + $info = array(); + + foreach (module_implements('webform_select_options_info') as $module) { + $additions = module_invoke($module, 'webform_select_options_info'); + foreach ($additions as $key => $addition) { + $additions[$key]['module'] = $module; + } + $info = array_merge($info, $additions); + } + drupal_alter('webform_select_options_info', $info); + } + return $info; +} + +/** + * Execute a select option callback. + * + * @param $name + * The name of the options group. + * @param $component + * The full Webform component. + * @param $flat + * Whether the information returned should exclude any nested groups. + * @param $filter + * Whether information returned should be sanitized. Defaults to TRUE. + */ +function _webform_select_options_callback($name, $component, $flat = FALSE, $filter = TRUE) { + $info = _webform_select_options_info(); + + // Include any necessary files. + if (isset($info[$name]['file'])) { + $pathinfo = pathinfo($info[$name]['file']); + $path = ($pathinfo['dirname'] ? $pathinfo['dirname'] . '/' : '') . basename($pathinfo['basename'], '.' . $pathinfo['extension']); + module_load_include($pathinfo['extension'], $info[$name]['module'], $path); + } + + // Execute the callback function. + if (isset($info[$name]['options callback']) && function_exists($info[$name]['options callback'])) { + $function = $info[$name]['options callback']; + + $arguments = array(); + if (isset($info[$name]['options arguments'])) { + $arguments = $info[$name]['options arguments']; + } + + return $function($component, $flat, $filter, $arguments); + } +} + +/** + * Utility function to split user-entered values from new-line separated + * text into an array of options. + * + * @param $text + * Text to be converted into a select option array. + * @param $flat + * Optional. If specified, return the option array and exclude any optgroups. + * @param $filter + * Optional. Whether or not to filter returned values. + */ +function _webform_select_options_from_text($text, $flat = FALSE, $filter = TRUE) { + static $option_cache = array(); + + // Keep each processed option block in an array indexed by the MD5 hash of + // the option text and the value of the $flat variable. + $md5 = md5($text); + + // Check if this option block has been previously processed. + if (!isset($option_cache[$flat][$md5])) { + $options = array(); + $rows = array_filter(explode("\n", trim($text))); + $group = NULL; + foreach ($rows as $option) { + $option = trim($option); + /** + * If the Key of the option is within < >, treat as an optgroup + * + * + * creates an optgroup with the label "Group 1" + * + * <> + * Unsets the current group, allowing items to be inserted at the root element. + */ + if (preg_match('/^\<([^>]*)\>$/', $option, $matches)) { + if (empty($matches[1])) { + unset($group); + } + elseif (!$flat) { + $group = $filter ? _webform_filter_values($matches[1], NULL, NULL, NULL, FALSE) : $matches[1]; + } + } + elseif (preg_match('/^([^|]+)\|(.*)$/', $option, $matches)) { + $key = $filter ? _webform_filter_values($matches[1], NULL, NULL, NULL, FALSE) : $matches[1]; + $value = $filter ? _webform_filter_values($matches[2], NULL, NULL, NULL, FALSE) : $matches[2]; + isset($group) ? $options[$group][$key] = $value : $options[$key] = $value; + } + else { + $filtered_option = $filter ? _webform_filter_values($option, NULL, NULL, NULL, FALSE) : $option; + isset($group) ? $options[$group][$filtered_option] = $filtered_option : $options[$filtered_option] = $filtered_option; + } + } + + $option_cache[$flat][$md5] = $options; + } + + // Return our options from the option_cache array. + return $option_cache[$flat][$md5]; +} + +/** + * Convert an array of options into text. + */ +function _webform_select_options_to_text($options) { + $output = ''; + $previous_key = FALSE; + + foreach ($options as $key => $value) { + // Convert groups. + if (is_array($value)) { + $output .= '<' . $key . '>' . "\n"; + foreach ($value as $subkey => $subvalue) { + $output .= $subkey . '|' . $subvalue . "\n"; + } + $previous_key = $key; + } + // Typical key|value pairs. + else { + // Exit out of any groups. + if (isset($options[$previous_key]) && is_array($options[$previous_key])) { + $output .= "<>\n"; + } + // Skip empty rows. + if ($options[$key] !== '') { + $output .= $key . '|' . $value . "\n"; + } + $previous_key = $key; + } + } + + return $output; +} + +/** + * Utility function to shuffle an array while preserving key-value pairs. + */ +function _webform_shuffle_options(&$array) { + // First shuffle the array keys, then use them as the basis for ordering + // the options. + $aux = array(); + $keys = array_keys($array); + shuffle($keys); + foreach ($keys as $key) { + $aux[$key] = $array[$key]; + } + $array = $aux; +} diff -Naurw webform_old/components/textarea.inc webform/components/textarea.inc --- webform_old/components/textarea.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/textarea.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,217 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'mandatory' => 0, + 'extra' => array( + 'cols' => '', + 'rows' => '', + 'title_display' => 0, + 'resizable' => 1, + 'disabled' => 0, + 'description' => '', + 'attributes' => array(), + 'private' => FALSE, + ), + ); +} + + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_textarea() { + return array( + 'webform_display_textarea' => array( + 'render element' => 'element', + 'file' => 'components/textarea.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_textarea($component) { + $form = array(); + $form['value'] = array( + '#type' => 'textarea', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field.') . theme('webform_token_help'), + '#cols' => 60, + '#rows' => 5, + '#weight' => 0, + ); + $form['display']['cols'] = array( + '#type' => 'textfield', + '#title' => t('Width'), + '#default_value' => $component['extra']['cols'], + '#description' => t('Width of the textarea in columns. This property might not have a visual impact depending on the CSS of your site.') . ' ' . t('Leaving blank will use the default size.'), + '#size' => 5, + '#maxlength' => 10, + '#parents' => array('extra', 'cols'), + ); + $form['display']['rows'] = array( + '#type' => 'textfield', + '#title' => t('Height'), + '#default_value' => $component['extra']['rows'], + '#description' => t('Height of the textarea in rows.') . ' ' . t('Leaving blank will use the default size.'), + '#size' => 5, + '#maxlength' => 10, + '#parents' => array('extra', 'rows'), + ); + $form['display']['resizable'] = array( + '#type' => 'checkbox', + '#title' => t('Resizable'), + '#description' => t('Make this field resizable by the user.'), + '#weight' => 2, + '#default_value' => $component['extra']['resizable'], + '#parents' => array('extra', 'resizable'), + ); + $form['display']['disabled'] = array( + '#type' => 'checkbox', + '#title' => t('Disabled'), + '#return_value' => 1, + '#description' => t('Make this field non-editable. Useful for setting an unchangeable default value.'), + '#weight' => 11, + '#default_value' => $component['extra']['disabled'], + '#parents' => array('extra', 'disabled'), + ); + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_textarea($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'textarea', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#default_value' => $filter ? _webform_filter_values($component['value'], $node) : $component['value'], + '#required' => $component['mandatory'], + '#weight' => $component['weight'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#rows' => !empty($component['extra']['rows']) ? $component['extra']['rows'] : 5, + '#cols' => !empty($component['extra']['cols']) ? $component['extra']['cols'] : 60, + '#attributes' => $component['extra']['attributes'], + '#resizable' => (bool) $component['extra']['resizable'], // MUST be FALSE to disable. + '#theme_wrappers' => array('webform_element'), + '#translatable' => array('title', 'description'), + ); + + if ($component['extra']['disabled']) { + if ($filter) { + $element['#attributes']['readonly'] = 'readonly'; + } + else { + $element['#disabled'] = TRUE; + } + } + + if (isset($value)) { + $element['#default_value'] = $value[0]; + } + + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_textarea($component, $value, $format = 'html') { + return array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#theme' => 'webform_display_textarea', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#format' => $format, + '#value' => isset($value[0]) ? $value[0] : '', + '#translatable' => array('title'), + ); +} + +/** + * Format the output of data for this component. + */ +function theme_webform_display_textarea($variables) { + $element = $variables['element']; + $output = $element['#format'] == 'html' ? nl2br(check_plain($element['#value'])) : $element['#value']; + if (drupal_strlen($output) > 80) { + $output = ($element['#format'] == 'html') ? '
' . $output . '
' : $output; + } + return $output !== '' ? $output : ' '; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_textarea($component, $sids = array()) { + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('no', 'data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $nonblanks = 0; + $submissions = 0; + $wordcount = 0; + + $result = $query->execute(); + foreach ($result as $data) { + if (drupal_strlen(trim($data['data'])) > 0) { + $nonblanks++; + $wordcount += str_word_count(trim($data['data'])); + } + $submissions++; + } + + $rows[0] = array(t('Left Blank'), ($submissions - $nonblanks)); + $rows[1] = array(t('User entered value'), $nonblanks); + $rows[2] = array(t('Average submission length in words (ex blanks)'), ($nonblanks != 0 ? number_format($wordcount/$nonblanks, 2) : '0')); + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_textarea($component, $value) { + return empty($value[0]) ? '' : check_plain($value[0]); +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_textarea($component, $export_options) { + $header = array(); + $header[0] = ''; + $header[1] = ''; + $header[2] = $component['name']; + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_textarea($component, $export_options, $value) { + return empty($value[0]) ? '' : $value[0]; +} diff -Naurw webform_old/components/textfield.inc webform/components/textfield.inc --- webform_old/components/textfield.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/textfield.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,254 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'mandatory' => 0, + 'extra' => array( + 'width' => '', + 'maxlength' => '', + 'field_prefix' => '', + 'field_suffix' => '', + 'disabled' => 0, + 'unique' => 0, + 'title_display' => 0, + 'description' => '', + 'attributes' => array(), + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_textfield() { + return array( + 'webform_display_textfield' => array( + 'render element' => 'element', + 'file' => 'components/textfield.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_textfield($component) { + $form = array(); + $form['value'] = array( + '#type' => 'textfield', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field.') . theme('webform_token_help'), + '#size' => 60, + '#maxlength' => 1024, + '#weight' => 0, + ); + $form['display']['width'] = array( + '#type' => 'textfield', + '#title' => t('Width'), + '#default_value' => $component['extra']['width'], + '#description' => t('Width of the textfield.') . ' ' . t('Leaving blank will use the default size.'), + '#size' => 5, + '#maxlength' => 10, + '#weight' => 0, + '#parents' => array('extra', 'width'), + ); + $form['display']['field_prefix'] = array( + '#type' => 'textfield', + '#title' => t('Prefix text placed to the left of the textfield'), + '#default_value' => $component['extra']['field_prefix'], + '#description' => t('Examples: $, #, -.'), + '#size' => 20, + '#maxlength' => 127, + '#weight' => 1.1, + '#parents' => array('extra', 'field_prefix'), + ); + $form['display']['field_suffix'] = array( + '#type' => 'textfield', + '#title' => t('Postfix text placed to the right of the textfield'), + '#default_value' => $component['extra']['field_suffix'], + '#description' => t('Examples: lb, kg, %.'), + '#size' => 20, + '#maxlength' => 127, + '#weight' => 1.2, + '#parents' => array('extra', 'field_suffix'), + ); + $form['display']['disabled'] = array( + '#type' => 'checkbox', + '#title' => t('Disabled'), + '#return_value' => 1, + '#description' => t('Make this field non-editable. Useful for setting an unchangeable default value.'), + '#weight' => 11, + '#default_value' => $component['extra']['disabled'], + '#parents' => array('extra', 'disabled'), + ); + $form['validation']['unique'] = array( + '#type' => 'checkbox', + '#title' => t('Unique'), + '#return_value' => 1, + '#description' => t('Check that all entered values for this field are unique. The same value is not allowed to be used twice.'), + '#weight' => 1, + '#default_value' => $component['extra']['unique'], + '#parents' => array('extra', 'unique'), + ); + $form['validation']['maxlength'] = array( + '#type' => 'textfield', + '#title' => t('Maxlength'), + '#default_value' => $component['extra']['maxlength'], + '#description' => t('Maximum length of the textfield value.'), + '#size' => 5, + '#maxlength' => 10, + '#weight' => 2, + '#parents' => array('extra', 'maxlength'), + ); + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_textfield($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'textfield', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#default_value' => $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, FALSE) : $component['value'], + '#required' => $component['mandatory'], + '#weight' => $component['weight'], + '#field_prefix' => empty($component['extra']['field_prefix']) ? NULL : ($filter ? _webform_filter_xss($component['extra']['field_prefix']) : $component['extra']['field_prefix']), + '#field_suffix' => empty($component['extra']['field_suffix']) ? NULL : ($filter ? _webform_filter_xss($component['extra']['field_suffix']) : $component['extra']['field_suffix']), + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#attributes' => $component['extra']['attributes'], + '#theme_wrappers' => array('webform_element'), + '#translatable' => array('title', 'description', 'field_prefix', 'field_suffix'), + ); + + if ($component['extra']['disabled']) { + if ($filter) { + $element['#attributes']['readonly'] = 'readonly'; + } + else { + $element['#disabled'] = TRUE; + } + } + + // Enforce uniqueness. + if ($component['extra']['unique']) { + $element['#element_validate'][] = 'webform_validate_unique'; + } + + // Change the 'width' option to the correct 'size' option. + if ($component['extra']['width'] > 0) { + $element['#size'] = $component['extra']['width']; + } + if ($component['extra']['maxlength'] > 0) { + $element['#maxlength'] = $component['extra']['maxlength']; + } + + if (isset($value)) { + $element['#default_value'] = $value[0]; + } + + return $element; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_textfield($component, $value, $format = 'html') { + return array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#theme' => 'webform_display_textfield', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#field_prefix' => $component['extra']['field_prefix'], + '#field_suffix' => $component['extra']['field_suffix'], + '#format' => $format, + '#value' => isset($value[0]) ? $value[0] : '', + '#translatable' => array('title', 'field_prefix', 'field_suffix'), + ); +} + +/** + * Format the output of data for this component. + */ +function theme_webform_display_textfield($variables) { + $element = $variables['element']; + $prefix = $element['#format'] == 'html' ? '' : $element['#field_prefix']; + $suffix = $element['#format'] == 'html' ? '' : $element['#field_suffix']; + $value = $element['#format'] == 'html' ? check_plain($element['#value']) : $element['#value']; + return $value !== '' ? ($prefix . $value . $suffix) : ' '; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_textfield($component, $sids = array()) { + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $nonblanks = 0; + $submissions = 0; + $wordcount = 0; + + $result = $query->execute(); + foreach ($result as $data) { + if (drupal_strlen(trim($data['data'])) > 0) { + $nonblanks++; + $wordcount += str_word_count(trim($data['data'])); + } + $submissions++; + } + + $rows[0] = array(t('Left Blank'), ($submissions - $nonblanks)); + $rows[1] = array(t('User entered value'), $nonblanks); + $rows[2] = array(t('Average submission length in words (ex blanks)'), ($nonblanks != 0 ? number_format($wordcount/$nonblanks, 2) : '0')); + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_textfield($component, $value) { + return check_plain(empty($value[0]) ? '' : $value[0]); +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_textfield($component, $export_options) { + $header = array(); + $header[0] = ''; + $header[1] = ''; + $header[2] = $component['name']; + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_textfield($component, $export_options, $value) { + return !isset($value[0]) ? '' : $value[0]; +} diff -Naurw webform_old/components/time.inc webform/components/time.inc --- webform_old/components/time.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/components/time.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,433 @@ + '', + 'form_key' => NULL, + 'pid' => 0, + 'weight' => 0, + 'value' => '', + 'mandatory' => 0, + 'extra' => array( + 'timezone' => 'user', + 'hourformat' => '12-hour', + 'minuteincrements' => 1, + 'title_display' => 0, + 'description' => '', + 'private' => FALSE, + ), + ); +} + +/** + * Implements _webform_theme_component(). + */ +function _webform_theme_time() { + return array( + 'webform_time' => array( + 'render element' => 'element', + 'file' => 'components/time.inc', + ), + 'webform_display_time' => array( + 'render element' => 'element', + 'file' => 'components/time.inc', + ), + ); +} + +/** + * Implements _webform_edit_component(). + */ +function _webform_edit_time($component) { + $form = array(); + $form['value'] = array( + '#type' => 'textfield', + '#title' => t('Default value'), + '#default_value' => $component['value'], + '#description' => t('The default value of the field.') . '
' . t('Accepts a time in any GNU Date Input Format. Strings such as now, +2 hours, and 10:30pm are all valid.'), + '#size' => 60, + '#maxlength' => 127, + '#weight' => 0, + ); + $form['extra']['timezone'] = array( + '#type' => 'radios', + '#title' => t('Default value timezone'), + '#default_value' => $component['extra']['timezone'], + '#description' => t('If using relative dates for a default value (e.g. "now") base the current time on this timezone.'), + '#options' => array('user' => t('User timezone'), 'site' => t('Website timezone')), + '#weight' => 2, + '#access' => variable_get('configurable_timezones', 1), + ); + $form['display']['hourformat'] = array( + '#type' => 'radios', + '#title' => t('Time format'), + '#default_value' => $component['extra']['hourformat'], + '#options' => array('12-hour' => t('12-hour (am/pm)'), '24-hour' => t('24-hour')), + '#weight' => 2, + '#parents' => array('extra', 'hourformat'), + ); + $form['display']['minuteincrements'] = array( + '#type' => 'select', + '#title' => t('Minute increments'), + '#default_value' => $component['extra']['minuteincrements'], + '#options' => array( + 1 => t('1 minute'), + 5 => t('5 minute'), + 10 => t('10 minute'), + 15 => t('15 minute'), + 30 => t('30 minute'), + ), + '#weight' => 3, + '#parents' => array('extra', 'minuteincrements'), + ); + return $form; +} + +/** + * Implements _webform_render_component(). + */ +function _webform_render_time($component, $value = NULL, $filter = TRUE) { + $node = isset($component['nid']) ? node_load($component['nid']) : NULL; + + $element = array( + '#type' => 'webform_time', + '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'], + '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before', + '#required' => $component['mandatory'], + '#weight' => $component['weight'], + '#description' => $filter ? _webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'], + '#element_validate' => array('webform_validate_time'), + '#hourformat' => $component['extra']['hourformat'], + '#minuteincrements' => $component['extra']['minuteincrements'], + '#default_value' => $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, FALSE) : $component['value'], + '#timezone' => $component['extra']['timezone'], + '#process' => array('webform_expand_time'), + '#theme' => 'webform_time', + '#theme_wrappers' => array('webform_element'), + '#translatable' => array('title', 'description'), + ); + + // Set the value from Webform if available. + if (!empty($value[0])) { + $element['#default_value'] = $value[0]; + } + + return $element; +} + +/** + * Form API #process function for Webform time fields. + */ +function webform_expand_time($element) { + // Expand the default value from a string into an array. + if (!empty($element['#default_value'])) { + // Adjust the time based on the user or site timezone. + if (variable_get('configurable_timezones', 1) && $element['#timezone'] == 'user') { + $timezone_name = isset($GLOBALS['user']->timezone) ? $GLOBALS['user']->timezone : 'UTC'; + } + else { + $timezone_name = variable_get('date_default_timezone', 'UTC'); + } + + $default_values = webform_date_array(webform_strtodate('c', $element['#default_value'], $timezone_name), 'time'); + } + else { + $default_values = array( + 'hour' => '', + 'minute' => '', + 'second' => '', + ); + } + + $first_hour = 0; + $last_hour = 23; + if ($element['#hourformat'] == '12-hour') { + $first_hour = 1; + $last_hour = 12; + $default_values = webform_time_convert($default_values, '12-hour'); + $default_values['ampm'] = $default_values['ampm'] ? $default_values['ampm'] : 'am'; + } + + // Generate the choices for drop-down selects. + $hours[''] = t('hour'); + $minutes[''] = t('minute'); + for ($i = $first_hour; $i <= $last_hour; $i++) { + $hours[$i] = $i; + } + for ($i = 0; $i <= 59; $i += $element['#minuteincrements']) { + $minutes[$i] = $i < 10 ? "0$i" : $i; + } + $ampms = array('am' => t('am'), 'pm' => t('pm')); + + // Adjust the default for minutes if needed, rounding up to the closest value. + if (!isset($minutes[$default_values['minute']])) { + foreach ($minutes as $minute => $padded_minute) { + if ($minute > $default_values['minute']) { + $default_values['minute'] = $minute; + break; + } + } + } + + // If the above loop didn't set a value, it's because rounding up would go to + // the next hour. This gets quite a bit more complicated, since we need to + // deal with looping around on hours, as well as flipping am/pm. + if (!isset($minutes[$default_values['minute']])) { + $default_values['minute'] = 0; + $default_values['hour']++; + // If the hour rolls over also, set hour to the first hour in the list. + if (!isset($hours[$default_values['hour']])) { + $default_values['hour'] = $element['#hourformat'] == '12-hour' ? 1 : 0; + } + // If the hour has been incremented to 12:00 in 12-hour format, flip am/pm. + // Note that technically midnight and noon are neither am or pm, but common + // convention (and US standard) is to represent 12:00am as midnight. + // See http://en.wikipedia.org/wiki/Midnight#Start_and_end_of_day. + if ($element['#hourformat'] == '12-hour' && $default_values['hour'] == 12) { + $default_values['ampm'] = $default_values['ampm'] == 'am' ? 'pm' : 'am'; + } + } + + $element['hour'] = array( + '#prefix' => '', + '#type' => 'select', + '#default_value' => $default_values['hour'], + '#options' => $hours, + ); + $element['minute'] = array( + '#prefix' => ':', + '#type' => 'select', + '#default_value' => $default_values['minute'], + '#options' => $minutes, + ); + if (strcmp($element['#hourformat'], '12-hour') == 0) { + $element['ampm'] = array( + '#type' => 'radios', + '#default_value' => $default_values['ampm'], + '#options' => $ampms, + ); + } + + // Set the overall default value. + if ($default_values['hour'] !== '') { + $element['#default_value'] = webform_date_string($default_values); + } + + return $element; +} + +/** + * Theme a webform time element. + */ +function theme_webform_time($variables) { + $element = $variables['element']; + + $element['hour']['#attributes']['class'] = array('hour'); + $element['minute']['#attributes']['class'] = array('minute'); + + // Add error classes to all items within the element. + if (form_get_error($element)) { + $element['hour']['#attributes']['class'][] = 'error'; + $element['minute']['#attributes']['class'][] = 'error'; + } + + $output = '
' . drupal_render($element['hour']) . drupal_render($element['minute']) . drupal_render($element['ampm']) . '
'; + + return $output; +} + +function webform_validate_time($element, $form_state) { + $form_key = $element['#webform_component']['form_key']; + $name = $element['#webform_component']['name']; + + // Check if the user filled the required fields. + foreach ($element['#hourformat'] == '12-hour' ? array('hour', 'minute', 'ampm') : array('hour', 'minute') as $field_type) { + if ($element[$field_type]['#value'] === '' && $element['#required']) { + form_error($element, t('%field field is required.', array('%field' => $name))); + return; + } + } + + // Check for a valid time. + if ($element['hour']['#value'] !== '' || $element['minute']['#value'] !== '') { + if (!is_numeric($element['hour']['#value']) || !is_numeric($element['minute']['#value']) || (isset($element['ampm']) && $element['ampm']['#value'] === '')) { + form_error($element, t('Entered %name is not a valid time.', array('%name' => $name))); + return; + } + } +} + +/** + * Implements _webform_submit_component(). + */ +function _webform_submit_time($component, $value) { + // Convert to 24-hour time before string conversion. + if ($component['extra']['hourformat'] == '12-hour') { + $value = webform_time_convert($value, '24-hour'); + } + + // Convert the value into a ISO 8601 string. + return $value['hour'] !== '' ? webform_date_string($value, 'time') : ''; +} + +/** + * Implements _webform_display_component(). + */ +function _webform_display_time($component, $value, $format = 'html') { + $value = webform_date_array(isset($value[0]) ? $value[0] : '', 'time'); + if ($component['extra']['hourformat'] == '12-hour') { + $value = webform_time_convert($value, '12-hour'); + } + + return array( + '#title' => $component['name'], + '#weight' => $component['weight'], + '#theme' => 'webform_display_time', + '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'), + '#format' => $format, + '#hourformat' => $component['extra']['hourformat'], + '#value' => $value, + '#translatable' => array('title'), + ); +} + +/** + * Format the output of data for this component. + */ +function theme_webform_display_time($variables) { + $element = $variables['element']; + $output = ' '; + if (isset($element['#value']['hour']) && $element['#value']['hour'] !== '' && isset($element['#value']['minute']) && $element['#value']['minute'] !== '') { + if ($element['#hourformat'] == '24-hour') { + $output = sprintf('%02d', $element['#value']['hour']) . ':' . sprintf('%02d', $element['#value']['minute']); + } + else { + $output = $element['#value']['hour'] . ':' . sprintf('%02d', $element['#value']['minute']) . ' ' . $element['#value']['ampm']; + } + } + return $output; +} + +/** + * Implements _webform_analysis_component(). + */ +function _webform_analysis_time($component, $sids = array()) { + $query = db_select('webform_submitted_data', 'wsd', array('fetch' => PDO::FETCH_ASSOC)) + ->fields('wsd', array('no', 'data')) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']) + ->orderBy('sid'); + + if (count($sids)) { + $query->condition('sid', $sids, 'IN'); + } + + $result = $query->execute(); + + $times = array(); + $submissions = 0; + foreach ($result as $row) { + $submissions++; + if ($row['data']) { + $times[] = webform_date_array($row['data']); + } + } + + // Display stats. + $nonblanks = count($times); + $rows[0] = array(t('Left Blank'), ($submissions - $nonblanks)); + $rows[1] = array(t('User entered value'), $nonblanks); + return $rows; +} + +/** + * Implements _webform_table_component(). + */ +function _webform_table_time($component, $value) { + if ($value[0]) { + $time = webform_date_array($value[0], 'time'); + if ($component['extra']['hourformat'] == '24-hour') { + return sprintf('%02d', $time['hour']) . ':' . sprintf('%02d', $time['minute']); + } + else { + $time = webform_time_convert($time, '12-hour'); + return $time['hour'] . ':' . sprintf('%02d', $time['minute']) . ' ' . $time['ampm']; + } + } + else { + return ''; + } +} + +/** + * Implements _webform_csv_headers_component(). + */ +function _webform_csv_headers_time($component, $export_options) { + $header = array(); + $header[0] = ''; + $header[1] = ''; + $header[2] = $component['name']; + return $header; +} + +/** + * Implements _webform_csv_data_component(). + */ +function _webform_csv_data_time($component, $export_options, $value) { + if ($value[0]) { + $time = webform_date_array($value[0], 'time'); + if ($component['extra']['hourformat'] == '24-hour') { + return sprintf('%02d', $time['hour']) . ':' . sprintf('%02d', $time['minute']); + } + else { + $time = webform_time_convert($time, '12-hour'); + return $time['hour'] . ':' . sprintf('%02d', $time['minute']) . ' ' . $time['ampm']; + } + } + else { + return ''; + } +} + +/** + * Convert a time between a 24-hour and a 12-hour value. + * + * @param $array + * An array of hour, minute, second, and optionally ampm. + * @param $format + * Either 12-hour or 24-hour. + * @return + * An array with hour, minute, second, and ampm (if using "12-hour"). + */ +function webform_time_convert($array, $format) { + if ($array['hour'] !== '') { + if ($format == '12-hour') { + $array['ampm'] = ($array['hour'] >= 12 && $array['hour'] < 24) ? 'pm' : 'am'; + $array['hour'] = ($array['hour'] > 12 || $array['hour'] == 0) ? abs($array['hour'] - 12) : (int) $array['hour']; + } + elseif ($format == '24-hour' && isset($array['ampm'])) { + $array['hour'] = ($array['hour'] < 12 && $array['ampm'] == 'pm') ? $array['hour'] + 12 : (int) $array['hour']; + $array['hour'] = ($array['hour'] == 12 && $array['ampm'] == 'am') ? 0 : $array['hour']; + } + } + + if ($format == '12-hour' && !isset($array['ampm'])) { + $array['ampm'] = ''; + } + elseif ($format == '24-hour' && isset($array['ampm'])) { + unset($array['ampm']); + } + + return $array; +} diff -Naurw webform_old/css/webform-admin.css webform/css/webform-admin.css --- webform_old/css/webform-admin.css 1970-01-01 01:00:00.000000000 +0100 +++ webform/css/webform-admin.css 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,119 @@ +/** + * @file + * Styles that are used when viewing results or modifying webform settings. + */ + +/* Submission view page */ +.webform-submission-info { + padding: 10px; +} +.webform-submission-info .user-picture { + float: right; + margin-left: 10px; +} +.webform-submission-info-text { + overflow: hidden; +} +.webform-submission-actions { + float: left; +} +.webform-submission-navigation { + text-align: right; +} +.webform-submission-next { + margin-left: 20px; +} + +/* Element for selecting components, i.e. included components for e-mails. */ +.webform-component-select-wrapper { + max-height: 300px; + overflow: auto; +} +.webform-component-select-table table { + margin: 0; +} +.webform-component-select-table tr.selected td, +.webform-component-select-table tr.selected td.active { + background: inherit; + color: inherit; +} +.form-item .webform-component-select-table .description { + font-size: inherit; +} +.form-item .webform-component-select-table input { + width: 12px; + height: 12px; + margin: 0 2px 2px; +} +.webform-select-list-format table { + border: 1px solid; + width: auto; + font-size: 90%; +} +.webform-select-list-format td, +.webform-select-list-format th { + border: 1px solid; +} +tr.webform-pagebreak td { + border-top: 2px dotted #999; +} +td.webform-pagebreak { + font-weight: bold; +} + +/* Special theming for the options element widget (if installed) */ +.webform-options-element thead { + display: none; +} +.webform-options-element fieldset { + border: none; + background: none; + margin: 0; + padding: 0; +} +.webform-options-element fieldset legend { + display: none; +} + +/* Checkboxes for allowed file extensions */ +table.webform-file-extensions td { + vertical-align: top; +} +table.webform-file-extensions td .description { + white-space: normal; +} +table.webform-file-extensions .form-type-checkbox { + width: 5em; + float: left; +} +table.webform-file-extensions input.form-text { + width: 95%; +} + +/* General styles */ +.webform-checkbox { + text-align: center; + width: 40px; +} +.webform-container-inline div, +.webform-container-inline div.form-item { + display: inline; +} +.webform-default-value { + color: #999; +} +.webform-results-per-page a.selected { + font-weight: bold; +} + +/* Display of adding/editing components */ +html.js fieldset.webform-position, +html.js div.webform-position { + display: none; +} +tr.webform-add-form .tabledrag-changed { + display: none; +} +#webform-components tr.webform-add-form { + background-color: inherit; +} diff -Naurw webform_old/css/webform.css webform/css/webform.css --- webform_old/css/webform.css 1970-01-01 01:00:00.000000000 +0100 +++ webform/css/webform.css 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,30 @@ +/** + * @file + * Front-end styling for the display of webforms. + */ +input.webform-calendar { + display: none; + padding: 3px; + vertical-align: top; +} +html.js input.webform-calendar { + display: inline; +} +.webform-container-inline label { + display: inline; + margin-right: 1em; +} +.webform-container-inline div, +.webform-container-inline div.form-item { + display: inline; +} +.webform-container-inline div.description { + display: block; +} +.webform-container-inline div.messages { + display: block; + float: left; +} +.webform-container-inline div.ajax-progress-bar div { + display: inherit; +} diff -Naurw webform_old/images/calendar.png webform/images/calendar.png --- webform_old/images/calendar.png 1970-01-01 01:00:00.000000000 +0100 +++ webform/images/calendar.png 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,3 @@ +PNG + + IHDRXo tEXtSoftwareAdobe ImageReadyqe<PLTEuN/1ɴqqqs- tRNSSOx8IDATxb lh$L !FTY.!V@~RJ>w#OIENDB` \ No newline at end of file diff -Naurw webform_old/includes/webform.admin.inc webform/includes/webform.admin.inc --- webform_old/includes/webform.admin.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/includes/webform.admin.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,297 @@ + 'checkboxes', + '#title' => t('Webform-enabled content types'), + '#description' => t('Webform allows you to enable the webform components for any content type. Choose the types on which you would like to associate webform components.'), + '#options' => $node_types, + '#default_value' => webform_variable_get('webform_node_types'), + ); + + $form['components'] = array( + '#type' => 'fieldset', + '#title' => t('Available components'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#description' => t('These are the available field types for your installation of Webform. You may disable any of these components by unchecking its corresponding box. Only checked components will be available in existing or new webforms.'), + ); + + // Add each component to the form: + $form['components'] = array('#tree' => TRUE); + $component_types = webform_components(TRUE); + foreach ($component_types as $key => $component) { + $form['components'][$key] = array( + '#title' => $component['label'], + '#description' => $component['description'], + '#type' => 'checkbox', + '#return_value' => 1, + '#default_value' => $component['enabled'], + ); + } + + $form['email'] = array( + '#type' => 'fieldset', + '#title' => t('Default e-mail values'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); + + $form['email']['webform_default_from_address'] = array( + '#type' => 'textfield', + '#title' => t('From address'), + '#default_value' => variable_get('webform_default_from_address', variable_get('site_mail', ini_get('sendmail_from'))), + '#description' => t('The default sender address for emailed webform results; often the e-mail address of the maintainer of your forms.'), + ); + + $form['email']['webform_default_from_name'] = array( + '#type' => 'textfield', + '#title' => t('From name'), + '#default_value' => variable_get('webform_default_from_name', variable_get('site_name', '')), + '#description' => t('The default sender name which is used along with the default from address.'), + ); + + $form['email']['webform_default_subject'] = array( + '#type' => 'textfield', + '#title' => t('Default subject'), + '#default_value' => variable_get('webform_default_subject', t('Form submission from: %title')), + '#description' => t('The default subject line of any e-mailed results.'), + ); + + $form['email']['webform_default_format'] = array( + '#type' => 'radios', + '#title' => t('Format'), + '#options' => array( + 0 => t('Plain text'), + 1 => t('HTML'), + ), + '#default_value' => variable_get('webform_default_format', 0), + '#description' => t('The default format for new e-mail settings. Webform e-mail options take precedence over the settings for system-wide e-mails configured in MIME mail.'), + '#access' => webform_email_html_capable(), + ); + + $form['email']['webform_format_override'] = array( + '#type' => 'radios', + '#title' => t('Format override'), + '#options' => array( + 0 => t('Per-webform configuration of e-mail format'), + 1 => t('Send all e-mails in the default format'), + ), + '#default_value' => variable_get('webform_format_override', 0), + '#description' => t('Force all webform e-mails to be sent in the default format.'), + '#access' => webform_email_html_capable(), + ); + + $form['advanced'] = array( + '#type' => 'fieldset', + '#title' => t('Advanced options'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['advanced']['webform_use_cookies'] = array( + '#type' => 'checkbox', + '#checked_value' => 1, + '#title' => t('Allow cookies for tracking submissions'), + '#default_value' => variable_get('webform_use_cookies', 0), + '#description' => t('Cookies can be used to help prevent the same user from repeatedly submitting a webform. This feature is not needed for limiting submissions per user, though it can increase accuracy in some situations. Besides cookies, Webform also uses IP addresses and site usernames to prevent repeated submissions.'), + ); + + $form['advanced']['webform_search_index'] = array( + '#type' => 'checkbox', + '#checked_value' => 1, + '#title' => t('Include webform forms in search index'), + '#default_value' => variable_get('webform_search_index', 1), + '#description' => t('When selected, all Webform nodes will have their form components indexed by the search engine.'), + '#access' => module_exists('search'), + ); + + $form['advanced']['webform_email_address_format'] = array( + '#type' => 'radios', + '#title' => t('E-mail address format'), + '#options' => array( + 'long' => t('Long format: "Example Name" <name@example.com>'), + 'short' => t('Short format: name@example.com'), + ), + '#default_value' => variable_get('webform_email_address_format', 'long'), + '#description' => t('Most servers support the "long" format which will allow for more friendly From addresses in e-mails sent. However many Windows-based servers are unable to send in the long format. Change this option if experiencing problems sending e-mails with Webform.'), + ); + + $form['advanced']['webform_export_format'] = array( + '#type' => 'radios', + '#title' => t('Default export format'), + '#options' => webform_export_list(), + '#default_value' => variable_get('webform_export_format', 'delimited'), + ); + + $form['advanced']['webform_csv_delimiter'] = array( + '#type' => 'select', + '#title' => t('Default export delimiter'), + '#description' => t('This is the delimiter used in the CSV/TSV file when downloading Webform results. Using tabs in the export is the most reliable method for preserving non-latin characters. You may want to change this to another character depending on the program with which you anticipate importing results.'), + '#default_value' => variable_get('webform_csv_delimiter', '\t'), + '#options' => array( + ',' => t('Comma (,)'), + '\t' => t('Tab (\t)'), + ';' => t('Semicolon (;)'), + ':' => t('Colon (:)'), + '|' => t('Pipe (|)'), + '.' => t('Period (.)'), + ' ' => t('Space ( )'), + ), + ); + + $form['advanced']['webform_submission_access_control'] = array( + '#type' => 'radios', + '#title' => t('Submission access control'), + '#options' => array( + '1' => t('Select the user roles that may submit each individual webform'), + '0' => t('Disable Webform submission access control'), + ), + '#default_value' => variable_get('webform_submission_access_control', 1), + '#description' => t('By default, the configuration form for each webform allows the administrator to choose which roles may submit the form. You may want to allow users to always submit the form if you are using a separate node access module to control access to webform nodes themselves.'), + ); + + $form = system_settings_form($form); + $form['#theme'] = 'webform_admin_settings'; + array_unshift($form['#submit'], 'webform_admin_settings_submit'); + + return $form; +} + +/** + * Submit handler for the webform_admin_settings() form. + */ +function webform_admin_settings_submit($form, &$form_state) { + $disabled_components = array(); + foreach ($form_state['values']['components'] as $name => $enabled) { + if (!$enabled) { + $disabled_components[] = $name; + } + } + // Update $form_state and let system_settings_form_submit() handle saving. + $form_state['values']['webform_disabled_components'] = $disabled_components; + unset($form_state['values']['components']); + + // Change the name of the node type variable and clean it up. + $form_state['values']['webform_node_types'] = array_keys(array_filter($form_state['values']['node_types'])); + unset($form_state['values']['node_types']); +} + +/** + * Theme the output of the webform_admin_settings() form. + */ +function theme_webform_admin_settings($variables) { + $form = $variables['form']; + + // Format the components into a table. + foreach (element_children($form['components']) as $key) { + $row = array(); + $row[] = $form['components'][$key]['#title']; + $row[] = $form['components'][$key]['#description']; + $form['components'][$key]['#title'] = NULL; + $form['components'][$key]['#description'] = NULL; + $row[] = array('data' => drupal_render($form['components'][$key]), 'align' => 'center'); + $rows[] = $row; + } + $header = array(t('Name'), t('Description'), array('data' => t('Enabled'), 'class' => array('checkbox'))); + + // Create the table inside the form. + $form['components']['table'] = array( + '#theme' => 'table', + '#header' => $header, + '#rows' => $rows, + ); + + return drupal_render_children($form); +} + +/** + * Menu callback for admin/content/webform. Displays all webforms on the site. + */ +function webform_admin_content() { + $webform_types = webform_variable_get('webform_node_types'); + + $nodes = array(); + if ($webform_types) { + $nodes = db_select('node', 'n') + ->fields('n') + ->condition('n.type', $webform_types, 'IN') + ->execute() + ->fetchAllAssoc('nid'); + } + + return theme('webform_admin_content', array('nodes' => $nodes)); +} + +/** + * Create a comma-separate list of content types that are webform enabled. + */ +function webform_admin_type_list() { + $webform_types = webform_variable_get('webform_node_types'); + $webform_type_list = ''; + $webform_type_count = count($webform_types); + foreach ($webform_types as $n => $type) { + $webform_type_list .= l(node_type_get_name($type), 'node/add/' . $type); + if ($n + 1 < $webform_type_count) { + $webform_type_list .= $webform_type_count == 2 ? ' ' : ', '; + } + if ($n + 2 == $webform_type_count) { + $webform_type_list .= t('or') . ' '; + } + } + + return $webform_type_list; +} + +/** + * Generate a list of all webforms avaliable on this site. + */ +function theme_webform_admin_content($variables) { + $nodes = $variables['nodes']; + $header = array( + t('Title'), + array('data' => t('View'), 'colspan' => '4'), + array('data' => t('Operations'), 'colspan' => '2') + ); + + $rows = array(); + foreach ($nodes as $node) { + $rows[] = array( + l($node->title, 'node/' . $node->nid), + l(t('Submissions'), 'node/' . $node->nid . '/webform-results'), + l(t('Analysis'), 'node/' . $node->nid . '/webform-results/analysis'), + l(t('Table'), 'node/' . $node->nid . '/webform-results/table'), + l(t('Download'), 'node/' . $node->nid . '/webform-results/download'), + node_access('update', $node) ? l(t('Edit'), 'node/' . $node->nid . '/edit') : '', + user_access('delete all webform submissions') ? l(t('Clear'), 'node/' . $node->nid . '/webform-results/clear') : '', + ); + } + + if (empty($rows)) { + $webform_types = webform_variable_get('webform_node_types'); + if (empty($webform_types)) { + $message = t('Webform is currently not enabled on any content types.') . ' ' . t('Visit the Webform settings page and enable Webform on at least one content type.', array('!url' => url('admin/config/content/webform'))); + } + else { + $webform_type_list = webform_admin_type_list(); + $message = t('There are currently no webforms on your site. Create a !types piece of content.', array('!types' => $webform_type_list)); + } + + $rows[] = array( + array('data' => $message, 'colspan' => 7), + ); + } + + return theme('table', array('header' => $header, 'rows' => $rows)); +} diff -Naurw webform_old/includes/webform.components.inc webform/includes/webform.components.inc --- webform_old/includes/webform.components.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/includes/webform.components.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,1104 @@ + + */ + +/** + * Overview page of all components for this webform. + */ +function webform_components_page($node, $page_number = 1) { + $output = drupal_get_form('webform_components_form', $node); + + return array( + '#theme' => 'webform_components_page', + '#node' => $node, + '#form' => $output, + ); +} + +/** + * Theme the output of the main components page. + * + * This theming provides a way to toggle between the editing modes if Form + * Builder module is available. + */ +function theme_webform_components_page($variables) { + $node = $variables['node']; + $form = $variables['form']; + + return drupal_render($form); +} + +/** + * The table-based listing of all components for this webform. + */ +function webform_components_form($form, $form_state, $node) { + $form = array( + '#tree' => TRUE, + '#node' => $node, + 'components' => array(), + ); + + $form['nid'] = array( + '#type' => 'value', + '#value' => $node->nid, + ); + + $options = array(); + foreach ($node->webform['components'] as $cid => $component) { + $options[$cid] = check_plain($component['name']); + $form['components'][$cid]['cid'] = array( + '#type' => 'hidden', + '#default_value' => $component['cid'], + ); + $form['components'][$cid]['pid'] = array( + '#type' => 'hidden', + '#default_value' => $component['pid'], + ); + $form['components'][$cid]['weight'] = array( + '#type' => 'textfield', + '#size' => 4, + '#title' => t('Weight'), + '#default_value' => $component['weight'], + ); + $form['components'][$cid]['mandatory'] = array( + '#type' => 'checkbox', + '#title' => t('Mandatory'), + '#default_value' => $component['mandatory'], + '#access' => webform_component_feature($component['type'], 'required'), + ); + if (!isset($max_weight) || $component['weight'] > $max_weight) { + $max_weight = $component['weight']; + } + } + + $form['add']['name'] = array( + '#type' => 'textfield', + '#size' => 24, + '#maxlength' => 255, + ); + + $form['add']['type'] = array( + '#type' => 'select', + '#options' => webform_component_options(), + '#weight' => 3, + '#default_value' => (isset($_GET['cid']) && isset($node->webform['components'][$_GET['cid']])) ? $node->webform['components'][$_GET['cid']]['type'] : 'textfield', + ); + $form['add']['mandatory'] = array( + '#type' => 'checkbox', + ); + $form['add']['cid'] = array( + '#type' => 'hidden', + '#default_value' => '', + ); + $form['add']['pid'] = array( + '#type' => 'hidden', + '#default_value' => (isset($_GET['cid']) && isset($node->webform['components'][$_GET['cid']])) ? $node->webform['components'][$_GET['cid']]['pid'] : 0, + ); + $form['add']['weight'] = array( + '#type' => 'textfield', + '#size' => 4, + '#delta' => count($node->webform['components']) > 10 ? count($node->webform['components']) : 10, + ); + + if (isset($_GET['cid']) && isset($node->webform['components'][$_GET['cid']])) { + // Make the new component appear by default directly after the one that was + // just added. + $form['add']['weight']['#default_value'] = $node->webform['components'][$_GET['cid']]['weight'] + 1; + foreach (array_keys($node->webform['components']) as $cid) { + // Adjust all later components also, to make sure none of them have the + // same weight as the new component. + if ($form['components'][$cid]['weight']['#default_value'] >= $form['add']['weight']['#default_value']) { + $form['components'][$cid]['weight']['#default_value']++; + } + } + } + else { + // If no component was just added, the new component should appear by + // default at the end of the list. + $form['add']['weight']['#default_value'] = isset($max_weight) ? $max_weight + 1 : 0; + } + + $form['add']['add'] = array( + '#type' => 'submit', + '#value' => t('Add'), + '#weight' => 45, + '#validate' => array('webform_components_form_add_validate', 'webform_components_form_validate'), + '#submit' => array('webform_components_form_add_submit'), + ); + + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Save'), + '#weight' => 45, + '#access' => count($node->webform['components']) > 0, + ); + + return $form; +} + +/** + * Theme the node components form. Use a table to organize the components. + * + * @param $form + * The form array. + * @return + * Formatted HTML form, ready for display. + */ +function theme_webform_components_form($variables) { + $form = $variables['form']; + + $form['components']['#attached']['library'][] = array('webform', 'admin'); + + // TODO: Attach these. See http://drupal.org/node/732022. + drupal_add_tabledrag('webform-components', 'order', 'sibling', 'webform-weight'); + drupal_add_tabledrag('webform-components', 'match', 'parent', 'webform-pid', 'webform-pid', 'webform-cid'); + + $node = $form['#node']; + + $header = array(t('Label'), t('Type'), t('Value'), t('Mandatory'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3)); + $rows = array(); + + // Add a row containing form elements for a new item. + unset($form['add']['name']['#title'], $form['add_type']['#description']); + $form['add']['name']['#attributes']['rel'] = t('New component name'); + $form['add']['name']['#attributes']['class'] = array('webform-default-value'); + $form['add']['cid']['#attributes']['class'] = array('webform-cid'); + $form['add']['pid']['#attributes']['class'] = array('webform-pid'); + $form['add']['weight']['#attributes']['class'] = array('webform-weight'); + $row_data = array( + drupal_render($form['add']['name']), + drupal_render($form['add']['type']), + '', + drupal_render($form['add']['mandatory']), + drupal_render($form['add']['cid']) . drupal_render($form['add']['pid']) . drupal_render($form['add']['weight']), + array('colspan' => 3, 'data' => drupal_render($form['add']['add'])), + ); + $add_form = array('data' => $row_data, 'class' => array('draggable', 'webform-add-form')); + $form_rendered = FALSE; + + if (!empty($node->webform['components'])) { + $component_tree = array(); + $page_count = 1; + _webform_components_tree_build($node->webform['components'], $component_tree, 0, $page_count); + $component_tree = _webform_components_tree_sort($component_tree); + // Build the table rows. + function _webform_components_form_rows($node, $cid, $component, $level, &$form, &$rows, &$add_form) { + // Create presentable values. + if (drupal_strlen($component['value']) > 30) { + $component['value'] = drupal_substr($component['value'], 0, 30); + $component['value'] .= '...'; + } + $component['value'] = check_plain($component['value']); + + // Remove individual titles from the mandatory and weight fields. + unset($form['components'][$cid]['mandatory']['#title']); + unset($form['components'][$cid]['pid']['#title']); + unset($form['components'][$cid]['weight']['#title']); + + // Add special classes for weight and parent fields. + $form['components'][$cid]['cid']['#attributes']['class'] = array('webform-cid'); + $form['components'][$cid]['pid']['#attributes']['class'] = array('webform-pid'); + $form['components'][$cid]['weight']['#attributes']['class'] = array('webform-weight'); + + // Build indentation for this row. + $indents = ''; + for ($n = 1; $n <= $level; $n++) { + $indents .= '
 
'; + } + + // Add each component to a table row. + $row_data = array( + $indents . filter_xss($component['name']), + $form['add']['type']['#options'][$component['type']], + ($component['value'] == '') ? '-' : $component['value'], + drupal_render($form['components'][$cid]['mandatory']), + drupal_render($form['components'][$cid]['cid']) . drupal_render($form['components'][$cid]['pid']) . drupal_render($form['components'][$cid]['weight']), + l(t('Edit'), 'node/' . $node->nid . '/webform/components/' . $cid, array('query' => drupal_get_destination())), + l(t('Clone'), 'node/' . $node->nid . '/webform/components/' . $cid . '/clone', array('query' => drupal_get_destination())), + l(t('Delete'), 'node/' . $node->nid . '/webform/components/' . $cid . '/delete', array('query' => drupal_get_destination())), + ); + $row_class = array('draggable'); + if (!webform_component_feature($component['type'], 'group')) { + $row_class[] = 'tabledrag-leaf'; + } + if ($component['type'] == 'pagebreak') { + $row_class[] = 'tabledrag-root'; + $row_class[] = 'webform-pagebreak'; + $row_data[0] = array('class' => array('webform-pagebreak'), 'data' => $row_data[0]); + } + $rows[] = array('data' => $row_data, 'class' => $row_class); + if (isset($component['children']) && is_array($component['children'])) { + foreach ($component['children'] as $cid => $component) { + _webform_components_form_rows($node, $cid, $component, $level + 1, $form, $rows, $add_form); + } + } + + // Add the add form if this was the last edited component. + if (isset($_GET['cid']) && $component['cid'] == $_GET['cid'] && $add_form) { + $add_form['data'][0] = $indents . $add_form['data'][0]; + $rows[] = $add_form; + $add_form = FALSE; + } + } + foreach ($component_tree['children'] as $cid => $component) { + _webform_components_form_rows($node, $cid, $component, 0, $form, $rows, $add_form); + } + } + else { + $rows[] = array(array('data' => t('No Components, add a component below.'), 'colspan' => 9)); + } + + // Append the add form if not already printed. + if ($add_form) { + $rows[] = $add_form; + } + + $output = ''; + $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'webform-components'))); + $output .= drupal_render_children($form); + return $output; +} + +/** + * Validate handler for webform_components_form(). + */ +function webform_components_form_validate($form, &$form_state) { + // Check that no two components end up with the same form key. + $duplicates = array(); + $parents = array(); + if (isset($form_state['values']['components'])) { + foreach ($form_state['values']['components'] as $cid => $component) { + $form_key = $form['#node']->webform['components'][$cid]['form_key']; + if (isset($parents[$component['pid']]) && ($existing = array_search($form_key, $parents[$component['pid']])) && $existing !== FALSE) { + if (!isset($duplicates[$form_key])) { + $duplicates[$form_key] = array($existing); + } + $duplicates[$form_key][] = $cid; + } + $parents[$component['pid']][$cid] = $form_key; + } + } + + if (!empty($duplicates)) { + $error = t('The form order failed to save because the following elements have same form keys and are under the same parent. Edit each component and give them a unique form key, then try moving them again.'); + $items = array(); + foreach ($duplicates as $form_key => $cids) { + foreach ($cids as $cid) { + $items[] = $form['#node']->webform['components'][$cid]['name']; + } + } + + form_error($form['components'], $error . theme('item_list', array('items' => $items))); + } +} + +/** + * Validate handler for webform_component_form() when adding a new component. + */ +function webform_components_form_add_validate($form, &$form_state) { + // Check that the entered component name is valid. + if (drupal_strlen(trim($form_state['values']['add']['name'])) <= 0) { + form_error($form['add']['name'], t('When adding a new component, the name field is required.')); + } +} + +/** + * Submit handler for webform_components_form() to save component order. + */ +function webform_components_form_submit($form, &$form_state) { + $node = node_load($form_state['values']['nid']); + + // Update all mandatory and weight values. + $changes = FALSE; + foreach ($node->webform['components'] as $cid => $component) { + if ($component['pid'] != $form_state['values']['components'][$cid]['pid'] || $component['weight'] != $form_state['values']['components'][$cid]['weight'] || $component['mandatory'] != $form_state['values']['components'][$cid]['mandatory']) { + $changes = TRUE; + $node->webform['components'][$cid]['weight'] = $form_state['values']['components'][$cid]['weight']; + $node->webform['components'][$cid]['mandatory'] = $form_state['values']['components'][$cid]['mandatory']; + $node->webform['components'][$cid]['pid'] = $form_state['values']['components'][$cid]['pid']; + } + } + + if ($changes) { + node_save($node); + } + + drupal_set_message(t('The component positions and mandatory values have been updated.')); +} + +/** + * Submit handler for webform_components_form() that adds a new component. + */ +function webform_components_form_add_submit($form, &$form_state) { + $node = node_load($form_state['values']['nid']); + + $component = $form_state['values']['add']; + $form_state['redirect'] = array('node/' . $node->nid . '/webform/components/new/' . $component['type'], array('query' => array('name' => $component['name'], 'mandatory' => $component['mandatory'], 'pid' => $component['pid'], 'weight' => $component['weight']))); +} + +/** + * Form to configure a webform component. + */ +function webform_component_edit_form($form, $form_state, $node, $component, $clone = FALSE) { + drupal_set_title(t('Edit component: @name', array('@name' => $component['name'])), PASS_THROUGH); + + $form['#attached']['library'][] = array('webform', 'admin'); + $form['#tree'] = TRUE; + + // Print the correct field type specification. + // We always need: name and description. + $form['type'] = array( + '#type' => 'value', + '#value' => $component['type'], + ); + $form['nid'] = array( + '#type' => 'value', + '#value' => $node->nid, + ); + $form['cid'] = array( + '#type' => 'value', + '#value' => isset($component['cid']) ? $component['cid'] : NULL, + ); + $form['clone'] = array( + '#type' => 'value', + '#value' => $clone, + ); + + if (webform_component_feature($component['type'], 'title')) { + $form['name'] = array( + '#type' => 'textfield', + '#default_value' => $component['name'], + '#title' => t('Label'), + '#description' => t('This is used as a descriptive label when displaying this form element.'), + '#required' => TRUE, + '#weight' => -10, + '#maxlength' => 255, + ); + } + + $form['form_key'] = array( + '#type' => 'textfield', + '#default_value' => empty($component['form_key']) ? _webform_safe_name($component['name']) : $component['form_key'], + '#title' => t('Field Key'), + '#description' => t('Enter a machine readable key for this form element. May contain only alphanumeric characters and underscores. This key will be used as the name attribute of the form element. This value has no effect on the way data is saved, but may be helpful if doing custom form processing.'), + '#required' => TRUE, + '#weight' => -9, + ); + + $form['extra'] = array(); + if (webform_component_feature($component['type'], 'description')) { + $form['extra']['description'] = array( + '#type' => 'textarea', + '#default_value' => isset($component['extra']['description']) ? $component['extra']['description'] : '', + '#title' => t('Description'), + '#description' => t('A short description of the field used as help for the user when he/she uses the form.') . theme('webform_token_help'), + '#weight' => -1, + ); + } + + // Display settings. + $form['display'] = array( + '#type' => 'fieldset', + '#title' => t('Display'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#weight' => 8, + ); + if (webform_component_feature($component['type'], 'title_display')) { + if (webform_component_feature($component['type'], 'title_inline')) { + $form['display']['title_display'] = array( + '#type' => 'select', + '#title' => t('Label display'), + '#default_value' => !empty($component['extra']['title_display']) ? $component['extra']['title_display'] : 'before', + '#options' => array( + 'before' => t('Above'), + 'inline' => t('Inline'), + 'none' => t('None'), + ), + '#description' => t('Determines the placement of the component\'s label.'), + ); + } + else { + $form['display']['title_display'] = array( + '#type' => 'checkbox', + '#title' => t('Hide label'), + '#default_value' => strcmp($component['extra']['title_display'], 'none') === 0, + '#return_value' => 'none', + '#description' => t('Do not display the label of this component.'), + ); + } + $form['display']['title_display']['#weight'] = 8; + $form['display']['title_display']['#parents'] = array('extra', 'title_display'); + } + + if (webform_component_feature($component['type'], 'private')) { + // May user mark fields as Private? + $form['display']['private'] = array( + '#type' => 'checkbox', + '#title' => t('Private'), + '#default_value' => ($component['extra']['private'] == '1' ? TRUE : FALSE), + '#description' => t('Private fields are shown only to users with results access.'), + '#weight' => 45, + '#parents' => array('extra', 'private'), + '#disabled' => empty($node->nid) ? FALSE : !webform_results_access($node), + ); + } + + // Validation settings. + $form['validation'] = array( + '#type' => 'fieldset', + '#title' => t('Validation'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#weight' => 5, + ); + if (webform_component_feature($component['type'], 'required')) { + $form['validation']['mandatory'] = array( + '#type' => 'checkbox', + '#title' => t('Mandatory'), + '#default_value' => ($component['mandatory'] == '1' ? TRUE : FALSE), + '#description' => t('Check this option if the user must enter a value.'), + '#weight' => -1, + '#parents' => array('mandatory'), + ); + } + + // Position settings, only shown if JavaScript is disabled. + $form['position'] = array( + '#type' => 'fieldset', + '#title' => t('Position'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#tree' => FALSE, + '#weight' => 20, + '#attributes' => array('class' => array('webform-position')), + ); + + $options = array('0' => t('Root')); + foreach ($node->webform['components'] as $existing_cid => $value) { + if (webform_component_feature($value['type'], 'group') && (!isset($component['cid']) || $existing_cid != $component['cid'])) { + $options[$existing_cid] = $value['name']; + } + } + $form['position']['pid'] = array( + '#type' => 'select', + '#title' => t('Parent'), + '#default_value' => $component['pid'], + '#description' => t('Optional. You may organize your form by placing this component inside another fieldset.'), + '#options' => $options, + '#access' => count($options) > 1, + '#weight' => 3, + ); + $form['position']['weight'] = array( + '#type' => 'textfield', + '#size' => 4, + '#title' => t('Weight'), + '#default_value' => $component['weight'], + '#description' => t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.'), + '#weight' => 4, + ); + + // Add conditional fields. + $conditional_components = array(); + $counter = 0; + $last_pagebreak_slice = 0; + foreach ($node->webform['components'] as $cid => $test_component) { + // Only components before the pagebreak can be considered. + if ($test_component['type'] == 'pagebreak') { + $last_pagebreak_slice = $counter; + } + if (isset($component['cid']) && $cid == $component['cid']) { + break; + } + if (webform_component_feature($test_component['type'], 'conditional')) { + $conditional_components[$cid] = $test_component; + $counter++; + } + } + if ($component['type'] != 'pagebreak') { + $fieldset_description = t('Create a rule to control whether or not to skip this page.'); + } + else { + $fieldset_description = t('Create a rule to control whether or not to show this form element.'); + } + $conditional_components = array_slice($conditional_components, 0, $last_pagebreak_slice, TRUE); + $form['conditional'] = array( + '#weight' => 10, + '#type' => 'fieldset', + '#title' => t('Conditional rules'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#description' => t('Create a rule to control whether or not to show this form element.'), + '#tree' => FALSE, + ); + $form['conditional']['extra'] = array( + '#tree' => TRUE, + ); + $form['conditional']['extra']['conditional_component'] = array( + '#type' => 'select', + '#title' => t('Component'), + '#options' => webform_component_list($node, $conditional_components, FALSE, TRUE), + '#description' => t('Select another component to decide whether to show or hide this component. You can only select components occurring before the most recent pagebreak.'), + '#default_value' => $component['extra']['conditional_component'], + ); + $form['conditional']['extra']['conditional_operator'] = array( + '#type' => 'select', + '#title' => t('Operator'), + '#options' => array( + '=' => t('Is one of'), + '!=' => t('Is not one of') + ), + '#description' => t('Determines whether the list below is inclusive or exclusive.'), + '#default_value' => $component['extra']['conditional_operator'], + ); + $form['conditional']['extra']['conditional_values'] = array( + '#type' => 'textarea', + '#title' => t('Values'), + '#description' => t('List values, one per line, that will trigger this action. If you leave this blank, this component will always display.'), + '#default_value' => $component['extra']['conditional_values'], + ); + if (empty($conditional_components)) { + $form['conditional']['#access'] = FALSE; + } + + // Add the fields specific to this component type: + $additional_form_elements = (array) webform_component_invoke($component['type'], 'edit', $component); + if (empty($additional_form_elements)) { + drupal_set_message(t('The webform component of type @type does not have an edit function defined.', array('@type' => $component['type']))); + } + + // Merge the additional fields with the current fields: + if (isset($additional_form_elements['extra'])) { + $form['extra'] = array_merge($form['extra'], $additional_form_elements['extra']); + unset($additional_form_elements['extra']); + } + if (isset($additional_form_elements['position'])) { + $form['position'] = array_merge($form['position'], $additional_form_elements['position']); + unset($additional_form_elements['position']); + } + if (isset($additional_form_elements['display'])) { + $form['display'] = array_merge($form['display'], $additional_form_elements['display']); + unset($additional_form_elements['display']); + } + if (isset($additional_form_elements['validation'])) { + $form['validation'] = array_merge($form['validation'], $additional_form_elements['validation']); + unset($additional_form_elements['validation']); + } + elseif (count(element_children($form['validation'])) == 0) { + unset($form['validation']); + } + $form = array_merge($form, $additional_form_elements); + + // Add the submit button. + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Save component'), + '#weight' => 50, + ); + + return $form; +} + +/** + * Field name validation for the webform unique key. Must be alphanumeric. + */ +function webform_component_edit_form_validate($form, &$form_state) { + $node = node_load($form_state['values']['nid']); + + if (!preg_match('/^[a-z0-9_]+$/i', $form_state['values']['form_key'])) { + form_set_error('form_key', t('The field key %field_key is invalid. Please include only lowercase alphanumeric characters and underscores.', array('%field_key' => $form_state['values']['form_key']))); + } + + foreach ($node->webform['components'] as $cid => $component) { + if (($component['cid'] != $form_state['values']['cid'] || $form_state['values']['clone']) && ($component['pid'] == $form_state['values']['pid']) && (strcasecmp($component['form_key'], $form_state['values']['form_key']) == 0)) { + form_set_error('form_key', t('The field key %field_key is already in use by the field labeled %existing_field. Please use a unique key.', array('%field_key' => $form_state['values']['form_key'], '%existing_field' => $component['name']))); + } + } +} + +/** + * Submit handler for webform_component_edit_form(). + */ +function webform_component_edit_form_submit($form, &$form_state) { + // Ensure a webform record exists. + $node = node_load($form_state['values']['nid']); + webform_ensure_record($node); + + // Remove empty extra values. + if (isset($form_state['values']['extra'])) { + foreach ($form_state['values']['extra'] as $key => $value) { + if ($value === '' && !isset($form['display'][$key]['#options'][''])) { + unset($form_state['values']['extra'][$key]); + } + } + } + + // Remove empty attribute values. + if (isset($form_state['values']['extra']['attributes'])) { + foreach ($form_state['values']['extra']['attributes'] as $key => $value) { + if ($value === '') { + unset($form_state['values']['extra']['attributes'][$key]); + } + } + } + + if ($form_state['values']['clone']) { + webform_component_clone($node, $form_state['values']); + drupal_set_message(t('Component %name cloned.', array('%name' => $form_state['values']['name']))); + } + elseif (!empty($form_state['values']['cid'])) { + webform_component_update($form_state['values']); + drupal_set_message(t('Component %name updated.', array('%name' => $form_state['values']['name']))); + } + else { + $cid = webform_component_insert($form_state['values']); + drupal_set_message(t('New component %name added.', array('%name' => $form_state['values']['name']))); + } + + // Since Webform components have been updated but the node itself has not + // been saved, it is necessary to explicitly clear the cache to make sure + // the updated webform is visible to anonymous users. + cache_clear_all(); + + // Clear the entity cache if Entity Cache module is installed. + if (module_exists('entitycache')) { + cache_clear_all($node->nid, 'cache_entity_node'); + } + + $form_state['redirect'] = array('node/' . $node->nid . '/webform/components', isset($cid) ? array('query' => array('cid' => $cid)) : array()); +} + +/** + * Form to confirm deletion of a component. + */ +function webform_component_delete_form($form, $form_state, $node, $component) { + $cid = $component['cid']; + + $form = array(); + $form['node'] = array( + '#type' => 'value', + '#value' => $node, + ); + $form['component'] = array( + '#type' => 'value', + '#value' => $component, + ); + + if (webform_component_feature($node->webform['components'][$cid]['type'], 'group')) { + $question = t('Delete the %name fieldset?', array('%name' => $node->webform['components'][$cid]['name'])); + $description = t('This will immediately delete the %name fieldset and all children elements within %name from the %webform webform. This cannot be undone.', array('%name' => $node->webform['components'][$cid]['name'], '%webform' => $node->title)); + } + else { + $question = t('Delete the %name component?', array('%name' => $node->webform['components'][$cid]['name'])); + $description = t('This will immediately delete the %name component from the %webform webform. This cannot be undone.', array('%name' => $node->webform['components'][$cid]['name'], '%webform' => $node->title)); + } + + return confirm_form($form, $question, 'node/' . $node->nid . '/webform/components', $description, t('Delete')); +} + +/** + * Submit handler for webform_component_delete_form(). + */ +function webform_component_delete_form_submit($form, &$form_state) { + // Delete the component. + $node = $form_state['values']['node']; + $component = $form_state['values']['component']; + webform_component_delete($node, $component); + drupal_set_message(t('Component %name deleted.', array('%name' => $component['name']))); + + // Check if this webform still contains any information. + unset($node->webform['components'][$component['cid']]); + webform_check_record($node); + + // Since Webform components have been updated but the node itself has not + // been saved, it is necessary to explicitly clear the cache to make sure + // the updated webform is visible to anonymous users. + cache_clear_all(); + + // Clear the entity cache if Entity Cache module is installed. + if (module_exists('entitycache')) { + cache_clear_all($node->nid, 'cache_entity_node'); + } + + $form_state['redirect'] = 'node/' . $node->nid . '/webform/components'; +} + +/** + * Insert a new component into the database. + * + * @param $component + * A full component containing fields from the component form. + */ +function webform_component_insert(&$component) { + // Allow modules to modify the component before saving. + foreach (module_implements('webform_component_presave') as $module) { + $function = $module . '_webform_component_presave'; + $function($component); + } + + $component['value'] = isset($component['value']) ? $component['value'] : NULL; + $component['mandatory'] = isset($component['mandatory']) ? $component['mandatory'] : 0; + $component['extra']['private'] = isset($component['extra']['private']) ? $component['extra']['private'] : 0; + + if (!isset($component['cid'])) { + if (lock_acquire('webform_component_insert_' . $component['nid'], 5)) { + $next_id_query = db_select('webform_component')->condition('nid', $component['nid']); + $next_id_query->addExpression('MAX(cid) + 1', 'cid'); + $component['cid'] = $next_id_query->execute()->fetchField(); + if ($component['cid'] == NULL) { + $component['cid'] = 1; + } + lock_release('webform_component_insert_' . $component['nid']); + } + else { + watchdog('webform', 'A Webform component could not be saved because a timeout occurred while trying to acquire a lock for the node. Details: 
@component
', array('@component' => print_r($component, TRUE))); + return FALSE; + } + } + + $query = db_insert('webform_component') + ->fields(array( + 'nid' => $component['nid'], + 'cid' => $component['cid'], + 'pid' => $component['pid'], + 'form_key' => $component['form_key'], + 'name' => $component['name'], + 'type' => $component['type'], + 'value' => (string) $component['value'], + 'extra' => serialize($component['extra']), + 'mandatory' => $component['mandatory'], + 'weight' => $component['weight'], + )) + ->execute(); + + // Post-insert actions. + module_invoke_all('webform_component_insert', $component); + + return $component['cid']; +} + +/** + * Update an existing component with new values. + * + * @param $component + * A full component containing a nid, cid, and all other fields from the + * component form. Additional properties are stored in the extra array. + */ +function webform_component_update($component) { + // Allow modules to modify the component before saving. + foreach (module_implements('webform_component_presave') as $module) { + $function = $module . '_webform_component_presave'; + $function($component); + } + + $component['value'] = isset($component['value']) ? $component['value'] : NULL; + $component['mandatory'] = isset($component['mandatory']) ? $component['mandatory'] : 0; + $component['extra']['private'] = isset($component['extra']['private']) ? $component['extra']['private'] : 0; + db_update('webform_component') + ->fields(array( + 'pid' => $component['pid'], + 'form_key' => $component['form_key'], + 'name' => $component['name'], + 'type' => $component['type'], + 'value' => isset($component['value']) ? $component['value'] : '', + 'extra' => serialize($component['extra']), + 'mandatory' => $component['mandatory'], + 'weight' => $component['weight'] + )) + ->condition('nid', $component['nid']) + ->condition('cid', $component['cid']) + ->execute(); + + // Post-update actions. + module_invoke_all('webform_component_update', $component); +} + +function webform_component_delete($node, $component) { + // Check if a delete function is available for this component. If so, + // load all submissions and allow the component to delete each one. + + webform_component_include($component['type']); + $delete_function = '_webform_delete_' . $component['type']; + if (function_exists($delete_function)) { + module_load_include('inc', 'webform', 'includes/webform.submissions'); + $submissions = webform_get_submissions($node->nid); + foreach ($submissions as $submission) { + if (isset($submission->data[$component['cid']])) { + webform_component_invoke($component['type'], 'delete', $component, $submission->data[$component['cid']]['value']); + } + } + } + + // Remove database entries. + db_delete('webform_component') + ->condition('nid', $node->nid) + ->condition('cid', $component['cid']) + ->execute(); + db_delete('webform_submitted_data') + ->condition('nid', $node->nid) + ->condition('cid', $component['cid']) + ->execute(); + + // Delete all elements under this element. + $result = db_select('webform_component', 'c') + ->fields('c') + ->condition('nid', $node->nid) + ->condition('pid', $component['cid']) + ->execute(); + foreach ($result as $row) { + $child_component = $node->webform['components'][$row->cid]; + webform_component_delete($node, $child_component); + } + + // Post-delete actions. + module_invoke_all('webform_component_delete', $component); +} + +/** + * Recursively insert components into the database. + * + * @param $node + * The node object containing the current webform. + * @param $component + * A full component containing fields from the component form. + */ +function webform_component_clone(&$node, &$component) { + $original_cid = $component['cid']; + $component['cid'] = NULL; + $new_cid = webform_component_insert($component); + $component['cid'] = $new_cid; + if (webform_component_feature($component['type'], 'group')) { + foreach ($node->webform['components'] as $cid => $child_component) { + if ($child_component['pid'] == $original_cid) { + $child_component['pid'] = $new_cid; + webform_component_clone($node, $child_component); + } + } + } + return $new_cid; +} + +/** + * Check if a component has a particular feature. + * + * @see hook_webform_component_info() + */ +function webform_component_feature($type, $feature) { + $components = webform_components(); + $defaults = array( + 'csv' => TRUE, + 'default_value' => TRUE, + 'description' => TRUE, + 'email' => TRUE, + 'email_address' => FALSE, + 'email_name' => FALSE, + 'required' => TRUE, + 'title' => TRUE, + 'title_display' => TRUE, + 'title_inline' => TRUE, + 'conditional' => TRUE, + 'spam_analysis' => FALSE, + 'group' => FALSE, + 'attachment' => FALSE, + 'private' => TRUE, + ); + return isset($components[$type]['features'][$feature]) ? $components[$type]['features'][$feature] : !empty($defaults[$feature]); +} + +/** + * Create a list of components suitable for a select list. + * + * @param $node + * The webform node. + * @param $component_filter + * Either an array of components, or a string containing a feature name (csv, + * email, required, conditional) on which this list of components will be + * restricted. + * @param $indent + * Indent components placed under fieldsets with hyphens. + * @param $optgroups + * Determine if pagebreaks should be converted to option groups in the + * returned list of options. + */ +function webform_component_list($node, $component_filter = NULL, $indent = TRUE, $optgroups = FALSE) { + $options = array(); + $page_names = array(); + + $components = is_array($component_filter) ? $component_filter : $node->webform['components']; + $feature = is_string($component_filter) ? $component_filter : NULL; + + foreach ($components as $cid => $component) { + if (!isset($feature) || webform_component_feature($component['type'], $feature) || ($indent && webform_component_feature($component['type'], 'group'))) { + $prefix = ''; + $page_num = $component['page_num']; + $page_index = 'p' . $page_num; + if ($indent && ($parent_count = count(webform_component_parent_keys($node, $component)) - 1)) { + $prefix = str_repeat('-', $parent_count); + } + if ($optgroups && $component['type'] == 'pagebreak') { + $page_names[$page_index] = $component['name']; + } + elseif ($optgroups && $page_num > 1) { + $options[$page_index][$cid] = $prefix . $component['name']; + } + else { + $options[$cid] = $prefix . $component['name']; + } + } + } + + // Convert page breaks into optgroups. + if ($optgroups) { + $grouped_options = $options; + $options = array(); + foreach ($grouped_options as $key => $values) { + if (is_array($values) && isset($page_names[$key])) { + $options[$page_names[$key]] = $values; + } + else { + $options[$key] = $values; + } + } + } + + return $options; +} + +/** + * A Form API process function to expand a component list into checkboxes. + */ +function webform_component_select($element) { + // Split the select list into checkboxes. + foreach ($element['#options'] as $key => $label) { + $label_length = strlen($label); + $label = preg_replace('/^(\-)+/', '', $label); + $indents = $label_length - strlen($label); + $element[$key] = array( + '#title' => $label, + '#type' => 'checkbox', + '#default_value' => array_search($key, $element['#value']) !== FALSE, + '#return_value' => $key, + '#parents' => array_merge($element['#parents'], array($key)), + '#indent' => $indents, + ); + } + + $element['#theme_wrappers'] = array(); + $element['#type'] = 'webform_component_select'; + $element['#theme'] = 'webform_component_select'; + $element['#attached'] = array( + 'library' => array( + array('webform', 'admin'), + ), + 'js' => array( + 'misc/tableselect.js' => array(), + ), + ); + + return $element; +} + +/** + * Theme the contents of a Webform component select element. + */ +function theme_webform_component_select($variables) { + $element = $variables['element']; + + $rows = array(); + $header = array(); + if (!isset($element['#all_checkbox']) || $element['#all_checkbox']) { + $header = array(array('class' => array('select-all'), 'data' => ' ' . t('Include all components'))); + } + foreach (element_children($element) as $key) { + $rows[] = array( + theme('indentation', array('size' => $element[$key]['#indent'])) . drupal_render($element[$key]), + ); + } + + $element['#type'] = 'fieldset'; + $element['#value'] = NULL; + $element['#attributes']['class'] = array('webform-component-select-table'); + if (!isset($element['#collapsible']) || $element['#collapsible']) { + $element['#attributes']['class'][] = 'collapsible'; + } + if (!isset($element['#collapsed']) || $element['#collapsed']) { + $element['#attributes']['class'][] = 'collapsed'; + } + + if (empty($rows)) { + $element['#children'] = t('No available components.'); + } + else { + $element['#children'] = '
' . theme('table', array('header' => $header, 'rows' => $rows)) . '
'; + } + + return theme('fieldset', array('element' => $element)); +} + +/** + * Find a components parents within a node. + */ +function webform_component_parent_keys($node, $component) { + $parents = array($component['form_key']); + $pid = $component['pid']; + while ($pid) { + $parents[] = $node->webform['components'][$pid]['form_key']; + $pid = $node->webform['components'][$pid]['pid']; + } + return array_reverse($parents); +} + +/** + * Populate a component with the defaults for that type. + */ +function webform_component_defaults(&$component) { + if ($defaults = webform_component_invoke($component['type'], 'defaults')) { + foreach ($defaults as $key => $default) { + if (!isset($component[$key])) { + $component[$key] = $default; + } + } + foreach ($defaults['extra'] as $extra => $default) { + if (!isset($component['extra'][$extra])) { + $component['extra'][$extra] = $default; + } + } + $component['extra'] += array( + 'conditional_component' => '', + 'conditional_operator' => '=', + 'conditional_values' => '', + ); + } +} + +/** + * Validate an element value is unique with no duplicates in the database. + */ +function webform_validate_unique($element, $form_state) { + if ($element['#value'] !== '') { + $nid = $form_state['values']['details']['nid']; + $sid = $form_state['values']['details']['sid']; + $query = db_select('webform_submitted_data') + ->fields('webform_submitted_data', array('sid')) + ->condition('nid', $nid) + ->condition('cid', $element['#webform_component']['cid']) + ->condition('data', $element['#value']) + ->range(0, 1); // More efficient than using countQuery() for data checks. + if ($sid) { + $query->condition('sid', $sid, '<>'); + } + $count = $query->execute()->fetchField(); + if ($count) { + form_error($element, t('The value %value has already been submitted once for the %title field. You may have already submitted this form, or you need to use a different value.', array('%value' => $element['#value'], '%title' => $element['#title']))); + } + } +} diff -Naurw webform_old/includes/webform.emails.inc webform/includes/webform.emails.inc --- webform_old/includes/webform.emails.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/includes/webform.emails.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,578 @@ + + */ + +/** + * Overview form of all components for this webform. + */ +function webform_emails_form($form, $form_state, $node) { + module_load_include('inc', 'webform', 'includes/webform.components'); + + $form['#attached']['library'][] = array('webform', 'admin'); + + $form['#tree'] = TRUE; + $form['#node'] = $node; + $form['components'] = array(); + + $form['nid'] = array( + '#type' => 'value', + '#value' => $node->nid, + ); + + foreach ($node->webform['emails'] as $eid => $email) { + $email_addresses = array_filter(explode(',', check_plain($email['email']))); + foreach ($email_addresses as $key => $email_address) { + $email_addresses[$key] = webform_format_email_address($email_address, NULL, $node, NULL, FALSE); + } + + $form['emails'][$eid]['email'] = array( + '#markup' => implode('
', $email_addresses), + ); + $form['emails'][$eid]['subject'] = array( + '#markup' => check_plain(webform_format_email_subject($email['subject'], $node)), + ); + $form['emails'][$eid]['from'] = array( + '#markup' => check_plain(webform_format_email_address($email['from_address'], $email['from_name'], $node, NULL, FALSE)), + ); + } + + $form['add'] = array( + '#theme' => 'webform_email_add_form', + '#tree' => FALSE, + ); + + $form['add']['email_option'] = array( + '#type' => 'radios', + '#options' => array( + 'custom' => t('Address'), + 'component' => t('Component value'), + ), + '#default_value' => 'custom', + ); + + $form['add']['email_custom'] = array( + '#type' => 'textfield', + '#size' => 24, + '#maxlength' => 500, + ); + + $form['add']['email_component'] = array( + '#type' => 'select', + '#options' => webform_component_list($node, 'email_address', FALSE), + ); + + if (empty($form['add']['email_component']['#options'])) { + $form['add']['email_component']['#options'][''] = t('No available components'); + $form['add']['email_component']['#disabled'] = TRUE; + } + + $form['add_button'] = array( + '#type' => 'submit', + '#value' => t('Add'), + '#weight' => 45, + ); + + $form['#validate'] = array('webform_email_address_validate'); + + return $form; +} + +/** + * Theme the node components form. Use a table to organize the components. + * + * @param $form + * The form array. + * @return + * Formatted HTML form, ready for display. + */ +function theme_webform_emails_form($variables) { + $form = $variables['form']; + $node = $form['#node']; + + $header = array(t('E-mail to'), t('Subject'), t('From'), array('data' => t('Operations'), 'colspan' => 2)); + $rows = array(); + + if (!empty($form['emails'])) { + foreach (element_children($form['emails']) as $eid) { + // Add each component to a table row. + $rows[] = array( + drupal_render($form['emails'][$eid]['email']), + drupal_render($form['emails'][$eid]['subject']), + drupal_render($form['emails'][$eid]['from']), + l(t('Edit'), 'node/' . $node->nid . '/webform/emails/' . $eid), + l(t('Delete'), 'node/' . $node->nid . '/webform/emails/' . $eid . '/delete'), + ); + } + } + else { + $rows[] = array(array('data' => t('Currently not sending e-mails, add an e-mail recipient below.'), 'colspan' => 5)); + } + + // Add a row containing form elements for a new item. + $row_data = array( + array('colspan' => 3, 'data' => drupal_render($form['add'])), + array('colspan' => 2, 'data' => drupal_render($form['add_button'])), + ); + $rows[] = array('data' => $row_data, 'class' => array('webform-add-form')); + + $output = ''; + $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'webform-emails'))); + $output .= drupal_render_children($form); + return $output; +} + +/** + * Theme the add new e-mail settings form on the node/x/webform/emails page. + */ +function theme_webform_email_add_form($variables) { + $form = $variables['form']; + + // Add a default value to the custom e-mail textfield. + $form['email_custom']['#attributes']['rel'] = t('email@example.com'); + $form['email_custom']['#attributes']['class'] = array('webform-set-active', 'webform-default-value'); + $form['email_option']['custom']['#theme_wrappers'] = array('webform_inline_radio'); + $form['email_option']['custom']['#inline_element'] = drupal_render($form['email_custom']); + + // Render the component value. + $form['email_component']['#attributes']['class'] = array('webform-set-active'); + $form['email_option']['component']['#theme_wrappers'] = array('webform_inline_radio'); + $form['email_option']['component']['#inline_element'] = drupal_render($form['email_component']); + + return drupal_render_children($form); +} + +/** + * Submit handler for webform_emails_form(). + */ +function webform_emails_form_submit($form, &$form_state) { + if ($form_state['values']['email_option'] == 'custom') { + $email = $form_state['values']['email_custom']; + } + else { + $email = $form_state['values']['email_component']; + } + $form_state['redirect'] = array('node/' . $form['#node']->nid . '/webform/emails/new', array('query' => array('option' => $form_state['values']['email_option'], 'email' => trim($email)))); +} + +/** + * Form for configuring an e-mail setting and template. + */ +function webform_email_edit_form($form, $form_state, $node, $email = array()) { + module_load_include('inc', 'webform', 'includes/webform.components'); + + $form['#attached']['library'][] = array('webform', 'admin'); + $form['#attached']['js'][] = array('data' => array('webform' => array('revertConfirm' => t('Are you sure you want to revert any changes to your template back to the default?'))), 'type' => 'setting'); + + $form['#tree'] = TRUE; + $form['node'] = array( + '#type' => 'value', + '#value' => $node, + ); + $form['eid'] = array( + '#type' => 'value', + '#value' => isset($email['eid']) ? $email['eid'] : NULL, + ); + + // All these fields work essentially the same, with a radio button set, + // a textfield for custom values, and a select list for a component. + foreach (array('email', 'subject', 'from_address', 'from_name') as $field) { + switch ($field) { + case 'email': + $default_value = NULL; + $title = t('E-mail to address'); + $description = t('Form submissions will be e-mailed to this address. Any email, select, or hidden form element may be selected as the recipient address. Multiple e-mail addresses may be separated by commas.'); + break; + case 'subject': + $default_value = _webform_filter_values(webform_variable_get('webform_default_subject'), $node); + $title = t('E-mail subject'); + $description = t('Any textfield, select, or hidden form element may be selected as the subject for e-mails.'); + break; + case 'from_address': + $default_value = _webform_filter_values(webform_variable_get('webform_default_from_address'), $node); + $title = t('E-mail from address'); + $description = t('Any email, select, or hidden form element may be selected as the sender\'s e-mail address.'); + break; + case 'from_name': + $default_value = _webform_filter_values(webform_variable_get('webform_default_from_name'), $node); + $title = t('E-mail from name'); + $description = t('Any textfield, select, or hidden form element may be selected as the sender\'s name for e-mails.'); + break; + } + + $form[$field . '_option'] = array( + '#title' => $title, + '#type' => 'radios', + '#default_value' => is_numeric($email[$field]) ? 'component' : ((empty($default_value) || ($email[$field] != 'default' && isset($email[$field]))) ? 'custom' : 'default'), + '#description' => $description, + ); + if (!empty($default_value)) { + $form[$field . '_option']['#options']['default'] = t('Default: %value', array('%value' => $default_value)); + } + $form[$field . '_option']['#options']['custom'] = t('Custom'); + $form[$field . '_option']['#options']['component'] = t('Component'); + + $form[$field . '_custom'] = array( + '#type' => 'textfield', + '#size' => 40, + '#default_value' => (!is_numeric($email[$field]) && $email[$field] != 'default') ? $email[$field] : NULL, + '#maxlength' => $field == 'email' ? 500 : 255, + ); + $options = webform_component_list($node, $field == 'from_address' || $field == 'email' ? 'email_address' : 'email_name', FALSE); + $form[$field . '_component'] = array( + '#type' => 'select', + '#default_value' => is_numeric($email[$field]) ? $email[$field] : NULL, + '#options' => empty($options) ? array('' => t('No available components')) : $options, + '#disabled' => empty($options) ? TRUE : FALSE, + '#weight' => 6, + ); + } + + // Do not show the "E-mail from name" if using the short e-mail format. + if (variable_get('webform_email_address_format', 'long') == 'short') { + $form['from_name_option']['#access'] = FALSE; + $form['from_name_custom']['#access'] = FALSE; + $form['from_name_component']['#access'] = FALSE; + } + + // Add the template fieldset. + $form['template'] = array( + '#type' => 'fieldset', + '#title' => t('E-mail template'), + '#collapsible' => TRUE, + '#collapsed' => !empty($email['cid']) && empty($email['template']), + '#description' => t('An e-mail template can customize the display of e-mails.'), + '#weight' => 15, + '#tree' => FALSE, + '#attributes' => array('id' => 'webform-template-fieldset'), + ); + + $form['template']['template_option'] = array( + '#type' => 'select', + '#options' => array( + 'default' => t('Default template'), + 'custom' => t('Custom template'), + ), + '#default_value' => $email['template'] == 'default' ? 'default' : 'custom', + ); + + $default_template = theme(array('webform_mail_' . $node->nid, 'webform_mail', 'webform_mail_message'), array('node' => $node, 'email' => $email)); + $template = $email['template'] == 'default' ? $default_template : $email['template']; + $form['template']['template'] = array( + '#type' => 'textarea', + '#rows' => max(10, min(20, count(explode("\n", $template)))), + '#default_value' => $template, + '#wysiwyg' => webform_email_html_capable() ? NULL : FALSE, + ); + + $form['template']['html'] = array( + '#type' => 'checkbox', + '#title' => t('Send e-mail as HTML'), + '#default_value' => $email['html'], + '#access' => webform_email_html_capable() && !variable_get('webform_format_override', 0), + ); + + $form['template']['attachments'] = array( + '#type' => 'checkbox', + '#title' => t('Include files as attachments'), + '#default_value' => $email['attachments'], + '#access' => webform_email_html_capable(), + ); + + $form['template']['tokens'] = array( + '#markup' => theme('webform_token_help', array('groups' => 'all')), + ); + + $form['template']['components'] = array( + '#type' => 'select', + '#title' => t('Included e-mail values'), + '#options' => webform_component_list($node, 'email', TRUE), + '#default_value' => array_diff(array_keys($node->webform['components']), $email['excluded_components']), + '#multiple' => TRUE, + '#size' => 10, + '#description' => t('The selected components will be included in the %email_values token. Individual values may still be printed if explicitly specified as a %email[key] in the template.'), + '#process' => array('webform_component_select'), + ); + + // TODO: Allow easy re-use of existing templates. + $form['templates']['#tree'] = TRUE; + $form['templates']['default'] = array( + '#type' => 'textarea', + '#value' => $default_template, + '#resizable' => FALSE, + '#weight' => 19, + '#wysiwyg' => FALSE, + ); + + // Add the submit button. + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Save e-mail settings'), + '#weight' => 20, + ); + + $form['#validate'] = array('webform_email_address_validate', 'webform_email_edit_form_validate'); + + return $form; +} + +/** + * Theme the Webform mail settings section of the node form. + */ +function theme_webform_email_edit_form($variables) { + $form = $variables['form']; + + // Loop through fields, rendering them into radio button options. + foreach (array('email', 'subject', 'from_address', 'from_name') as $field) { + foreach (array('custom', 'component') as $option) { + $form[$field . '_' . $option]['#attributes']['class'] = array('webform-set-active'); + $form[$field . '_option'][$option]['#theme_wrappers'] = array('webform_inline_radio'); + $form[$field . '_option'][$option]['#inline_element'] = drupal_render($form[$field . '_' . $option]); + } + if (isset($form[$field . '_option']['#options']['default'])) { + $form[$field . '_option']['default']['#theme_wrappers'] = array('webform_inline_radio'); + } + } + + $details = ''; + $details .= drupal_render($form['subject_option']); + $details .= drupal_render($form['from_address_option']); + $details .= drupal_render($form['from_name_option']); + $form['details'] = array( + '#type' => 'fieldset', + '#title' => t('E-mail header details'), + '#weight' => 10, + '#children' => $details, + '#collapsible' => FALSE, + '#parents' => array('details'), + '#groups' => array('details' => array()), + '#attributes' => array(), + ); + + // Ensure templates are completely hidden. + $form['templates']['#prefix'] = ''; + + // Re-sort the elements since we added the details fieldset. + $form['#sorted'] = FALSE; + $children = element_children($form, TRUE); + return drupal_render_children($form, $children); +} + +/** + * Validate handler for webform_email_edit_form() and webform_emails_form(). + */ +function webform_email_address_validate($form, &$form_state) { + if ($form_state['values']['email_option'] == 'custom') { + $email = trim($form_state['values']['email_custom']); + if (empty($email)) { + form_set_error('email_custom', t('When adding a new custom e-mail, the e-mail field is required.')); + } + else { + $emails = array_filter(explode(',', $email)); + foreach ($emails as $email) { + if (!valid_email_address(trim($email))) { + form_set_error('email_custom', t('The entered e-mail address "@email" does not appear valid.', array('@email' => $email))); + } + } + } + } +} + +/** + * Validate handler for webform_email_edit_form(). + */ +function webform_email_edit_form_validate($form, &$form_state) { + if ($form_state['values']['from_address_option'] == 'custom' && !valid_email_address($form_state['values']['from_address_custom'])) { + form_set_error('from_address_custom', t('The entered e-mail address "@email" does not appear valid.', array('@email' => $form_state['values']['from_address_custom']))); + } +} + +/** + * Submit handler for webform_email_edit_form(). + */ +function webform_email_edit_form_submit($form, &$form_state) { + // Ensure a webform record exists. + $node = $form_state['values']['node']; + webform_ensure_record($node); + + // Merge the e-mail, name, address, and subject options into single values. + $email = array( + 'eid' => $form_state['values']['eid'], + 'nid' => $node->nid, + ); + + foreach (array('email', 'from_name', 'from_address', 'subject') as $field) { + $option = $form_state['values'][$field . '_option']; + if ($option == 'default') { + $email[$field] = 'default'; + } + else { + $email[$field] = $form_state['values'][$field . '_' . $option]; + } + } + + // Ensure templates are unaffected by differences in line breaks. + $form_state['values']['template'] = str_replace(array("\r", "\n"), array('', "\n"), $form_state['values']['template']); + $form_state['values']['templates']['default'] = str_replace(array("\r", "\n"), array('', "\n"), $form_state['values']['templates']['default']); + + // Set the template value. + // TODO: Support reuse of templates. + if (strcmp(trim($form_state['values']['templates']['default']), trim($form_state['values']['template'])) == 0) { + $email['template'] = 'default'; + } + else { + $email['template'] = $form_state['values']['template']; + } + + // Save the attachment and HTML options provided by MIME mail. + $email['html'] = empty($form_state['values']['html']) ? 0 : 1; + $email['attachments'] = empty($form_state['values']['attachments']) ? 0 : 1; + + // Save the list of included components. + // We actually maintain an *exclusion* list, so any new components will + // default to being included in the %email_values token until unchecked. + $included = array_keys(array_filter((array) $form_state['values']['components'])); + $excluded = array_diff(array_keys($node->webform['components']), $included); + $email['excluded_components'] = $excluded; + + if (empty($form_state['values']['eid'])) { + drupal_set_message(t('Email settings added.')); + $form_state['values']['eid'] = webform_email_insert($email); + } + else { + drupal_set_message(t('Email settings updated.')); + webform_email_update($email); + } + + // Clear the entity cache if Entity Cache module is installed. + if (module_exists('entitycache')) { + cache_clear_all($node->nid, 'cache_entity_node'); + } + + $form_state['redirect'] = array('node/' . $node->nid . '/webform/emails'); +} + +/** + * Form for deleting an e-mail setting. + */ +function webform_email_delete_form($form, $form_state, $node, $email) { + $eid = $email['eid']; + + $form['node'] = array( + '#type' => 'value', + '#value' => $node, + ); + $form['email'] = array( + '#type' => 'value', + '#value' => $email, + ); + + $question = t('Delete e-mail settings?'); + if (is_numeric($email['email'])) { + $description = t('This will immediately delete the e-mail settings based on the @component component.', array('@component' => $email['email'])); + } + else { + $description = t('This will immediately delete the e-mail settings sending to the @address address.', array('@address' => $email['email'])); + } + + return confirm_form($form, $question, 'node/' . $node->nid . '/webform/emails', $description, t('Delete')); +} + +/** + * Submit handler for webform_email_delete_form(). + */ +function webform_email_delete_form_submit($form, &$form_state) { + // Delete the e-mail settings. + $node = $form_state['values']['node']; + $email = $form_state['values']['email']; + webform_email_delete($node, $email); + drupal_set_message(t('E-mail settings deleted.')); + + // Check if this webform still contains any information. + unset($node->webform['emails'][$email['eid']]); + webform_check_record($node); + + // Clear the entity cache if Entity Cache module is installed. + if (module_exists('entitycache')) { + cache_clear_all($node->nid, 'cache_entity_node'); + } + + $form_state['redirect'] = 'node/' . $node->nid . '/webform/emails'; +} + +/** + * Load an e-mail setting from the database or initialize a new e-mail. + */ +function webform_email_load($eid, $nid) { + $node = node_load($nid); + if ($eid == 'new') { + $email = array( + 'email' => '', + 'subject' => 'default', + 'from_name' => 'default', + 'from_address' => 'default', + 'template' => 'default', + 'excluded_components' => array(), + 'html' => variable_get('webform_default_format', 0), + 'attachments' => 0, + ); + } + else { + $email = isset($node->webform['emails'][$eid]) ? $node->webform['emails'][$eid] : FALSE; + if (variable_get('webform_format_override', 0)) { + $email['html'] = variable_get('webform_default_format', 0); + } + } + + return $email; +} + +/** + * Insert a new e-mail setting into the database. + * + * @param $email + * An array of settings for sending an e-mail. + */ +function webform_email_insert($email) { + // TODO: This is not race-condition safe. Switch to using transactions? + if (!isset($email['eid'])) { + $next_id_query = db_select('webform_emails')->condition('nid', $email['nid']); + $next_id_query->addExpression('MAX(eid) + 1', 'eid'); + $email['eid'] = $next_id_query->execute()->fetchField(); + if ($email['eid'] == NULL) { + $email['eid'] = 1; + } + } + + $email['excluded_components'] = implode(',', $email['excluded_components']); + $success = drupal_write_record('webform_emails', $email); + + return $success ? $email['eid'] : FALSE; +} + +/** + * Update an existing e-mail setting with new values. + * + * @param $email + * An array of settings for sending an e-mail containing a nid, eid, and all + * other fields from the e-mail form. + */ +function webform_email_update($email) { + $email['excluded_components'] = implode(',', $email['excluded_components']); + return drupal_write_record('webform_emails', $email, array('nid', 'eid')); +} + +/** + * Delete an e-mail setting. + */ +function webform_email_delete($node, $email) { + db_delete('webform_emails') + ->condition('nid', $node->nid) + ->condition('eid', $email['eid']) + ->execute(); +} diff -Naurw webform_old/includes/webform.export.inc webform/includes/webform.export.inc --- webform_old/includes/webform.export.inc 1970-01-01 01:00:00.000000000 +0100 +++ webform/includes/webform.export.inc 2013-07-22 17:25:57.000000000 +0100 @@ -0,0 +1,170 @@ + array( + 'title' => t('Delimited text'), + 'description' => t('A plain text file delimited by commas, tabs, or other characters.'), + 'handler' => 'webform_exporter_delimited', + ), + 'excel' => array( + 'title' => t('Microsoft Excel'), + 'description' => t('A file readable by Microsoft Excel.'), + 'handler' => 'webform_exporter_excel', + ), + ); +} + +/** + * Return a list of exporters suitable for display in a select list. + */ +function webform_export_list() { + $exporters = webform_export_fetch_definition(); + $list = array(); + foreach ($exporters as $name => $exporter) { + $list[$name] = $exporter['title']; + } + return $list; +} + +/** + * Returns a Webform exporter definition. + */ +function webform_export_fetch_definition($format = NULL) { + static $cache; + if (!isset($cache)) { + $cache = module_invoke_all('webform_exporters'); + } + + if (isset($format)) { + if (isset($cache[$format])) { + return $cache[$format]; + } + } + else { + return $cache; + } +} + +/** + * Instantiates a new Webform handler based on the format. + */ +function webform_export_create_handler($format, $options) { + $definition = webform_export_fetch_definition($format); + if (isset($definition) && class_exists($definition['handler'])) { + $handler = new $definition['handler']($options); + } + else { + // TODO: Create a default broken exporter. + $handler = new webform_exporter_broken($options); + } + + return $handler; +} + +class webform_exporter { + function add_row(&$file_handle, $data) { + } + + function set_headers($filename) { + drupal_add_http_header('Content-Type', 'application/force-download'); + drupal_add_http_header('Pragma', 'public'); + drupal_add_http_header('Cache-Control', 'max-age=0'); + } + + function bof(&$file_handle) { + } + + function eof(&$file_handle) { + } +} + +class webform_exporter_delimited extends webform_exporter { + var $delimiter; + + function webform_exporter_delimited($options) { + $this->delimiter = isset($options['delimiter']) ? $options['delimiter'] : ','; + // Convert tabs. + if ($this->delimiter == '\t') { + $this->delimiter = "\t"; + } + } + + function bof(&$file_handle) { + $output = ''; + + // Include at BOM at the beginning of the file for Little Endian. + // This makes tab-separated imports work correctly in MS Excel. + if (function_exists('mb_convert_encoding') && $this->delimiter == "\t") { + $output = chr(255) . chr(254); + } + @fwrite($file_handle, $output); + } + + function add_row(&$file_handle, $data) { + foreach ($data as $key => $value) { + // Escape inner quotes and wrap all contents in new quotes. + $data[$key] = '"' . str_replace('"', '""', $data[$key]) . '"'; + + // Remove