1.1.0

formtools · May 15, 2014 · 7cfbfad · 7cfbfad
1 parent 78b4b3a
commit 7cfbfad
Show file tree

Hide file tree

Showing 10 changed files with 219 additions and 218 deletions.
diff --git a/index.php b/index.php
@@ -7,14 +7,15 @@
 require_once("$folder/library.php");
 
 $page = ft_load_module_field("swift_mailer", "page", "tab", "settings");
+$php_self = ft_get_clean_php_self();
 $tabs = array(
   "settings" => array(
       "tab_label" => $LANG["word_settings"],
-      "tab_link" => "{$_SERVER["PHP_SELF"]}?page=settings"
+      "tab_link" => "$php_self?page=settings"
         ),
   "test" => array(
       "tab_label" => $L["word_test"],
-      "tab_link" => "{$_SERVER["PHP_SELF"]}?page=test"
+      "tab_link" => "$php_self?page=test"
         ),
     );
 
@@ -30,4 +31,4 @@
   default:
     require("tab_settings.php");
     break;
-}
+}
diff --git a/lang/en_us.php b/lang/en_us.php
@@ -67,4 +67,8 @@
 $L["validation_no_username"] = "Please enter the username.";
 $L["validation_no_password"] = "Please enter the password.";
 $L["validation_no_authentication_procedure"] = "Please indicate the authentication procedure.";
-$L["validation_no_encryption_type"] = "Please select the encryption type.";
+$L["validation_no_encryption_type"] = "Please select the encryption type.";
+
+$L["validation_invalid_recipient_email"] = "Please enter a valid recipient email address.";
+$L["validation_invalid_sender_email"] = "Please enter a valid sender email address.";
+
diff --git a/library.php b/library.php
@@ -411,7 +411,7 @@ function swift_mailer__install($module_id)
     email_template_id MEDIUMINT NOT NULL,
     return_path VARCHAR(255) NOT NULL,
     PRIMARY KEY (email_template_id)
-    ) TYPE=MyISAM";
+    )";
 
   foreach ($queries as $query)
   {
@@ -473,7 +473,7 @@ function swift_mailer__upgrade($old_version, $new_version)
       email_template_id MEDIUMINT NOT NULL,
       return_path VARCHAR(255) NOT NULL,
       PRIMARY KEY (email_template_id)
-      ) TYPE=MyISAM");
+      )");
 
     ft_register_hook("template", "swift_mailer", "edit_template_tab2", "", "swift_display_extra_fields_tab2");
     ft_register_hook("code", "swift_mailer", "end", "ft_create_blank_email_template", "swift_map_email_template_field");
@@ -512,4 +512,4 @@ function swift_mailer__upgrade($old_version, $new_version)
   {
     @mysql_query("ALTER TABLE {$g_table_prefix}module_swift_mailer_email_template_fields TYPE=MyISAM");
   }
-}
+}
diff --git a/module.php b/module.php
@@ -7,14 +7,13 @@
 $MODULE["author"]          = "Encore Web Studios";
 $MODULE["author_email"]    = "formtools@encorewebstudios.com";
 $MODULE["author_link"]     = "http://modules.formtools.org";
-$MODULE["version"]         = "1.0.4";
-$MODULE["date"]            = "2010-10-02";
+$MODULE["version"]         = "1.1.0";
+$MODULE["date"]            = "2011-06-18";
 $MODULE["origin_language"] = "en_us";
-$MODULE["supports_ft_versions"] = "2.0.3";
 
 // define the module navigation - the keys are keys defined in the language file. This lets
 // the navigation - like everything else - be customized to the users language
 $MODULE["nav"] = array(
   "module_name" => array("index.php", false),
-  "word_help" => array("help.php", false)
+  "word_help"   => array("help.php", true)
 );
diff --git a/tab_settings.php b/tab_settings.php
@@ -14,63 +14,46 @@
 $page_vars["tabs"] = $tabs;
 $page_vars["remember_advanced_settings"] = $remember_advanced_settings;
 $page_vars["sm_settings"] = $settings;
-$page_vars["text_settings_desc"] = ft_eval_smarty_string($L["ft_eval_smarty_string"], array("php_version"=> phpversion()));
+$page_vars["text_settings_desc"] = ft_eval_smarty_string($L["text_settings_desc"], array("php_version"=> phpversion()));
 $page_vars["head_js"] =<<<EOF
 var rules = [];
 rules.push("if:swiftmailer_enabled=yes,required,smtp_server,{$L["validation_no_smtp_server"]}");
 rules.push("if:requires_authentication=yes,required,username,{$L["validation_no_username"]}");
 rules.push("if:requires_authentication=yes,required,password,{$L["validation_no_password"]}");
 rules.push("if:requires_authentication=yes,required,authentication_procedure,{$L["validation_no_authentication_procedure"]}");
-rules.push("if:use_encryption=yes,required,encryption_type,{$L["validation_no_encryption_type"]});
-
-var page_ns = {};
-page_ns.toggle_enabled_fields = function(is_checked)
-{
-  $('smtp_server').disabled = !is_checked;
-  $('port').disabled = !is_checked;
-}
-
-page_ns.toggle_authentication_fields = function(is_checked)
-{
-  $('username').disabled = !is_checked;
-  $('password').disabled = !is_checked;
-  $('ap1').disabled = !is_checked;
-  $('ap2').disabled = !is_checked;
-  $('ap3').disabled = !is_checked;
-}
-
-page_ns.toggle_encryption_fields = function(is_checked)
-{
-  $('et1').disabled = !is_checked;
-  $('et2').disabled = !is_checked;
-}
-
-page_ns.toggle_antiflooding_fields = function(is_checked)
-{
-  $('anti_flooding_email_batch_size').disabled = !is_checked;
-  $('anti_flooding_email_batch_wait_time').disabled = !is_checked;
-}
-
-page_ns.toggle_advanced_settings = function()
-{
-  var display_setting = $('advanced_settings').getStyle('display');
-  var is_visible = false;
-
-  if (display_setting == 'none')
-  {
-    Effect.BlindDown($('advanced_settings'));
-    is_visible = true;
+rules.push("if:use_encryption=yes,required,encryption_type,{$L["validation_no_encryption_type"]}");
+
+var page_ns = {
+  toggle_enabled_fields: function(is_checked) {
+    $("#smtp_server,#port").attr("disabled", (is_checked) ? "" : "disabled");
+  },
+  toggle_authentication_fields: function(is_checked) {
+    $("#username, #password, #ap1, #ap2, #ap3").attr("disabled", (is_checked) ? "" : "disabled");
+  },
+  toggle_encryption_fields: function(is_checked) {
+    $("#et1, #et2").attr("disabled", (is_checked) ? "" : "disabled");
+  },
+  toggle_antiflooding_fields: function(is_checked) {
+    $("#anti_flooding_email_batch_size, #anti_flooding_email_batch_wait_time").attr("disabled", (is_checked) ? "" : "disabled");
+  },
+  toggle_advanced_settings: function() {
+    var display_setting = $("#advanced_settings").css("display");
+    var is_visible = false;
+    if (display_setting == "none") {
+      $("#advanced_settings").show("slow");
+      is_visible = true;
+    } else {
+      $("#advanced_settings").hide("slow");
+    }
+
+    $.ajax({
+      url:  g.root_url + "/modules/swift_mailer/actions.php",
+      data: { action: "remember_advanced_settings", remember_advanced_settings: is_visible },
+      type: "POST"
+    });
+
+    return false;
   }
-  else
-    Effect.BlindUp($('advanced_settings'));
-
-  var page_url = g.root_url + "/modules/swift_mailer/actions.php";
-  new Ajax.Request(page_url, {
-    parameters: { action: "remember_advanced_settings", remember_advanced_settings: is_visible },
-    method: 'post'
-  });
-
-	return false;
 }
 EOF;
 

diff --git a/tab_test.php b/tab_test.php
@@ -16,10 +16,12 @@
 $page_vars["from_email"] = $from_email;
 $page_vars["sm_settings"] = $settings;
 $page_vars["php_version"] = phpversion();
-$page_vars["js"] =<<<EOF
+$page_vars["head_js"] =<<<EOF
 var rules = [];
-rules.push("required,email_recipient,{$L["validation_no_recipient_email"]});
-rules.push("required,email_from,{$L["validation_no_sender_email"]}");
+rules.push("required,recipient_email,{$L["validation_no_recipient_email"]}");
+rules.push("valid_email,recipient_email,{$L["validation_invalid_recipient_email"]}");
+rules.push("required,from_email,{$L["validation_no_sender_email"]}");
+rules.push("valid_email,from_email,{$L["validation_invalid_sender_email"]}");
 EOF;
 
 ft_display_module_page("templates/index.tpl", $page_vars);
diff --git a/templates/help.tpl b/templates/help.tpl
@@ -1,6 +1,15 @@
 {include file='modules_header.tpl'}
 
-	<div class="title">{$L.word_help|upper}</div>
+  <table cellpadding="0" cellspacing="0">
+  <tr>
+    <td width="45"><a href="./"><img src="images/icon_swift_mailer.gif" border="0" width="34" height="34" /></a></td>
+    <td class="title">
+      <a href="../../admin/modules">{$LANG.word_modules}</a>
+      <span class="joiner">&raquo;</span>
+      {$L.word_help}
+    </td>
+  </tr>
+  </table>
 
   <p>
     {$L.text_help}

diff --git a/templates/index.tpl b/templates/index.tpl
@@ -2,21 +2,25 @@
 
   <table cellpadding="0" cellspacing="0" class="margin_bottom_large">
   <tr>
-    <td width="45"><img src="images/icon_swift_mailer.gif" width="34" height="34" /></td>
-    <td class="title">{$L.module_name|upper}</td>
+    <td width="45"><a href="./"><img src="images/icon_swift_mailer.gif" border="0" width="34" height="34" /></a></td>
+    <td class="title">
+      <a href="../../admin/modules">{$LANG.word_modules}</a>
+      <span class="joiner">&raquo;</span>
+      {$L.module_name}
+    </td>
   </tr>
   </table>
 
-	{include file='tabset_open.tpl'}
+  {include file='tabset_open.tpl'}
 
-		{if $page == "settings"}
-			{include file='../../modules/swift_mailer/templates/tab_settings.tpl'}
-		{elseif $page == "test"}
-			{include file='../../modules/swift_mailer/templates/tab_test.tpl'}
-		{else}
-			{include file='../../modules/swift_mailer/templates/tab_settings.tpl'}
-		{/if}
+    {if $page == "settings"}
+      {include file='../../modules/swift_mailer/templates/tab_settings.tpl'}
+    {elseif $page == "test"}
+      {include file='../../modules/swift_mailer/templates/tab_test.tpl'}
+    {else}
+      {include file='../../modules/swift_mailer/templates/tab_settings.tpl'}
+    {/if}
 
-	{include file='tabset_close.tpl'}
+  {include file='tabset_close.tpl'}
 
-{include file='modules_footer.tpl'}
+{include file='modules_footer.tpl'}