Code format

composer.json

@@ -11,4 +11,4 @@
     "require": {
         "composer/installers": "~1.0"
     }
-}
+}

controllers/AmForms_ExportsController.php

@@ -157,4 +157,4 @@ public function actionDownloadExport()
         readfile($export->file);
         die();
     }
-}
+}

controllers/AmForms_FieldsController.php

@@ -95,21 +95,21 @@ public function actionSaveField()
     }
 
     /**
-	 * Delete a field.
-	 */
-	public function actionDeleteField()
-	{
-		$this->requirePostRequest();
-		$this->requireAjaxRequest();
+     * Delete a field.
+     */
+    public function actionDeleteField()
+    {
+        $this->requirePostRequest();
+        $this->requireAjaxRequest();
 
         // Override Craft's default context and content
         craft()->content->fieldContext = AmFormsModel::FieldContext;
         craft()->content->contentTable = AmFormsModel::FieldContent;
 
         // Delete field
-		$fieldId = craft()->request->getRequiredPost('id');
-		$success = craft()->fields->deleteFieldById($fieldId);
+        $fieldId = craft()->request->getRequiredPost('id');
+        $success = craft()->fields->deleteFieldById($fieldId);
 
-		$this->returnJson(array('success' => $success));
-	}
+        $this->returnJson(array('success' => $success));
+    }
 }

controllers/AmForms_FormsController.php

@@ -139,4 +139,4 @@ public function actionDeleteForm()
 
         $this->redirectToPostedUrl($form);
     }
-}
+}

controllers/AmForms_SettingsController.php

@@ -95,4 +95,4 @@ private function _saveSettings($type)
             craft()->userSession->setError(Craft::t('Couldn’t save settings.'));
         }
     }
-}
+}

elementtypes/AmForms_FormElementType.php

@@ -193,4 +193,4 @@ public function populateElementModel($row)
     {
         return AmForms_FormModel::populateModel($row);
     }
-}
+}

fieldtypes/AmForms_FormFieldType.php

@@ -18,4 +18,4 @@ protected function getAddButtonLabel()
     {
         return Craft::t('Add a form');
     }
-}
+}

models/AmForms_FormModel.php

@@ -112,4 +112,4 @@ public function displayForm()
     {
         return craft()->amForms_forms->displayForm($this);
     }
-}
+}

models/AmForms_SettingModel.php

@@ -14,4 +14,4 @@ protected function defineAttributes()
             'value'   => AttributeType::Mixed
         );
     }
-}
+}

records/AmForms_FormRecord.php

@@ -74,4 +74,4 @@ public function defineRelations()
             'submissions' => array(static::HAS_MANY, 'AmForms_SubmissionRecord', 'submissionId')
         );
     }
-}
+}

records/AmForms_SettingRecord.php

@@ -36,4 +36,4 @@ public function scopes()
             'ordered' => array('order' => 'handle')
         );
     }
-}
+}

services/AmFormsService.php

@@ -90,4 +90,4 @@ public function renderDisplayTemplate($defaultTemplate, $overrideTemplate, $vari
         // Return rendered template!
         return $html;
     }
-}
+}

services/AmForms_AntispamService.php

@@ -267,4 +267,4 @@ private function _getHash($str)
     {
         return md5(sha1($str));
     }
-}
+}

services/AmForms_FieldsService.php

@@ -78,4 +78,4 @@ public function getUnsupportedFieldTypes()
             'Matrix'
         );
     }
-}
+}

services/AmForms_FormsService.php

@@ -287,4 +287,4 @@ public function displayForm(AmForms_FormModel $form)
         // Parse form
         return new \Twig_Markup($formHtml, craft()->templates->getTwig()->getCharset());
     }
-}
+}

services/AmForms_RecaptchaService.php

@@ -81,4 +81,4 @@ public function verify()
 
         return false;
     }
-}
+}

services/AmForms_SubmissionsService.php

@@ -342,4 +342,4 @@ public function onEmailSubmission(Event $event)
     {
         $this->raiseEvent('onEmailSubmission', $event);
     }
-}
+}

tasks/AmForms_ExportTask.php

@@ -90,4 +90,4 @@ public function runStep($step)
 
         return $result;
     }
-}
+}

templates/_display/templates/_antispam/honeypot.twig

@@ -3,4 +3,4 @@
     <label>{{ 'Leave this field blank'|t }}</label>
     <input type="text" id="{{ fieldName }}" name="{{ fieldName }}" value="">
 </div>
-<style>#{{ fieldName }}__wrapper{ display: none; }</style>
+<style>#{{ fieldName }}__wrapper{ display: none; }</style>

templates/_display/templates/_antispam/origin.twig

@@ -1,2 +1,2 @@
 <input type="hidden" id="__UAHOME" name="__UAHOME" value="{{ domain }}" />
-<input type="hidden" id="__UAHASH" name="__UAHASH" value="{{ userAgent }}"/>
+<input type="hidden" id="__UAHASH" name="__UAHASH" value="{{ userAgent }}"/>

templates/_display/templates/_antispam/time.twig

@@ -1 +1 @@
-<input type="hidden" id="__UATIME" name="__UATIME" value="{{ time }}" />
+<input type="hidden" id="__UATIME" name="__UATIME" value="{{ time }}" />

templates/_display/templates/email.twig

@@ -29,7 +29,15 @@
                         <td width="25%">{{ field.name }}:</td>
                         <td>
                             {% if value is not iterable and value is not empty -%}
-                                {{ value }}
+                                {% if field.type == 'Lightswitch' %}
+                                    {% if value == '1' %}
+                                        {{ 'Yes'|t }}
+                                    {% else %}
+                                        {{ 'No'|t }}
+                                    {% endif %}
+                                {% else %}
+                                    {{ value }}
+                                {% endif %}
                             {% else -%}
                                 <ul style="margin-left:0;">
                                     {% for item in value %}
@@ -43,4 +51,4 @@
             {% endfor %}
         </table>
     </body>
-</html>
+</html>

templates/_display/templates/errorList.twig

@@ -4,4 +4,4 @@
             <li>{{ error }}</li>
         {% endfor %}
     </ul>
-{%- endif %}
+{%- endif %}

templates/_display/templates/field.twig

@@ -41,4 +41,4 @@
             </ul>
         {%- endif %}
     </div>
-{% endnamespace %}
+{% endnamespace %}

templates/_display/templates/form.twig

@@ -41,4 +41,4 @@
     <div class="submit">
         <input type="submit" value="{{ submitValue }}">
     </div>
-</form>
+</form>

templates/_display/templates/recaptcha.twig

@@ -1 +1 @@
-<div class="g-recaptcha" data-sitekey="{{ siteKey }}"></div>
+<div class="g-recaptcha" data-sitekey="{{ siteKey }}"></div>

templates/_display/templates/tab.twig

@@ -3,4 +3,4 @@
     <div class="tab">
         {{ tab.fields|join|raw }}
     </div>
-{% endfor %}
+{% endfor %}

templates/_layouts/overview.twig

@@ -31,4 +31,4 @@
     {% set extraPageHeaderHtml %}
       <a class="btn settings icon" href="{{ url('amforms/settings') }}" title="{{ 'Settings'|t }}"></a>
     {% endset %}
-{% endif %}
+{% endif %}

templates/_layouts/settings.twig

@@ -27,4 +27,4 @@
             <input type="submit" class="btn submit" value="{{ 'Save'|t }}">
         </div>
     </form>
-{% endset %}
+{% endset %}

templates/exports/_edit.twig

@@ -84,4 +84,4 @@
             </div>
         </form>
     {% endif %}
-{% endset %}
+{% endset %}

templates/exports/index.twig

@@ -61,4 +61,4 @@
         deleteAction: 'amForms/exports/deleteExport'
     });
 {% endset %}
-{% includeJs js %}
+{% includeJs js %}

templates/fields/_edit.twig

@@ -111,4 +111,4 @@
 
 {% if fieldId is not defined %}
     {% includeJs "new Craft.HandleGenerator('#name', '#handle');" %}
-{% endif %}
+{% endif %}

templates/forms/_edit.twig

@@ -68,4 +68,4 @@
             </div>
         </div>
     </form>
-{% endblock %}
+{% endblock %}

templates/forms/_fields/form.twig

@@ -75,4 +75,4 @@
 {% set js %}
     {% if not form.handle %}new Craft.HandleGenerator('#name', '#handle');{% endif %}
 {% endset %}
-{% includeJs js %}
+{% includeJs js %}

templates/forms/_fields/notifications.twig

@@ -48,4 +48,4 @@
     value: form.notificationReplyToEmail,
     errors: form.getErrors('notificationReplyToEmail'),
     instructions: 'The reply to email address of your notification email.'|t
-}) }}
+}) }}

templates/forms/_fields/templates.twig

@@ -33,4 +33,4 @@
     errors: form.getErrors('notificationTemplate'),
     placeholder: '_amforms/email',
     instructions: 'Override default template with your own template. Enter the folder (with template), e.g.: {template}'|t({'template': '_amforms'})
-}) }}
+}) }}

templates/forms/index.twig

@@ -8,4 +8,4 @@
     </div>
 
     {{ parent() }}
-{% endblock %}
+{% endblock %}

templates/index.twig

@@ -1 +1 @@
-{% redirect 'amforms/submissions' %}
+{% redirect 'amforms/submissions' %}

templates/settings/antispam.twig

@@ -49,4 +49,4 @@
         on: antispam.originCheckEnabled.value,
         instructions: 'Check the domain and user agent.'|t
     }) }}
-{% endblock %}
+{% endblock %}

templates/settings/recaptcha.twig

@@ -25,4 +25,4 @@
         value: recaptcha.secretKey.value,
         instructions: 'Go to Google reCAPTCHA and register the site. Use the secret key that is given.'|t
     }) }}
-{% endblock %}
+{% endblock %}

templates/submissions/_edit.twig

@@ -59,4 +59,4 @@
             </div>
         </div>
     </form>
-{% endblock %}
+{% endblock %}

templates/submissions/index.twig

@@ -1,3 +1,3 @@
 {% extends 'amforms/_layouts/overview' %}
 
-{% set selectedTab = 'submissions' %}
+{% set selectedTab = 'submissions' %}

variables/AmFormsVariable.php

@@ -116,4 +116,4 @@ public function displayRecaptcha()
     {
         return craft()->amForms_recaptcha->render();
     }
-}
+}