Fix #6688 - unsubscribe warning

diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs
index 3dd0bd6..c74ae34 100644 (file)
--- a/Pman.Dialog.CoreEmail.bjs
+++ b/Pman.Dialog.CoreEmail.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.CoreEmail",
  "parent" : "",
  "title" : "",
- "path" : "/home/johns/gitlive/Pman.Core/Pman.Dialog.CoreEmail.bjs",
+ "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreEmail.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -12,14 +12,15 @@
   "b357b524e740bc85b9790a0712d84a30" : "Email address",
   "962b90039a542a29cedd51d87a9f28a1" : "Html Editor",
   "72d6d7a1885885bb55a565fd1070581a" : "Import",
+  "28690be026c0bb9003aa58e45e5662ca" : "Enabled - will be sent out",
   "ea30b40c3caf28acb29198d20d243e54" : "Images / Attachments >>",
   "31fde7b05ac8952dacf4af8a704074ec" : "Preview",
   "b337c8a67244afb6551ee1f8f9717676" : "Test Class <BR/> (for system reference only)",
   "884df8e413319ff51a3f5f528606238a" : "Use template",
   "e6b391a8d2c4d45902a23a8b6585703d" : "URL",
-  "2393ad754ba179442d85e415d1d5167c" : "Displayorder",
   "6f16a5f8ff5d75ab84c018adacdfcbb7" : "Field",
   "ec211f7c20af43e742bf2570c3cb84f9" : "Add",
+  "2393ad754ba179442d85e415d1d5167c" : "Displayorder",
   "e9968623956c15023d54335ea3699855" : "Convert Html to Text",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "5b8ef4e762c00a15a41cfc26dc3ef99c" : "Send me a test copy",
@@ -45,6 +46,23 @@
   "4c2a8fe7eaf24721cc7a9f0175115bd4" : "Message",
   "fff0d600f8a0b5e19e88bfb821dd1157" : "Images"
  },
+ "named_strings" : {
+  "active_boxLabel" : "28690be026c0bb9003aa58e45e5662ca",
+  "template_fieldLabel" : "278c491bdd8a53618c149c4ac790da34",
+  "name_fieldLabel" : "b20a8b77b05d53b4e695738731400c85",
+  "bcc_group_id_name_qtip" : "2c466a2c159463f1d9ef5a7b57b52827",
+  "bcc_group_id_name_emptyText" : "2c466a2c159463f1d9ef5a7b57b52827",
+  "template_qtip" : "31bb2f6e9b8fb11cbb7fb63c6025223f",
+  "template_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "from_email_fieldLabel" : "b357b524e740bc85b9790a0712d84a30",
+  "template_emptyText" : "31bb2f6e9b8fb11cbb7fb63c6025223f",
+  "active_value" : "c4ca4238a0b923820dcc509a6f75849b",
+  "from_name_fieldLabel" : "5da618e8e4b89c66fe86e32cdafde142",
+  "bcc_group_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "bcc_group_id_name_fieldLabel" : "68b00d723d37122f64da8d9939f836f0",
+  "subject_fieldLabel" : "c7892ebbb139886662c6f2fc8c450710",
+  "test_class_fieldLabel" : "b337c8a67244afb6551ee1f8f9717676"
+ },
  "items" : [
   {
    "listeners" : {
@@ -62,14 +80,14 @@
    "items" : [
     {
      "xtype" : "LayoutRegion",
-     "tabPosition" : "top",
      "$ xns" : "Roo",
+     "tabPosition" : "top",
      "* prop" : "center"
     },
     {
      "hidden" : true,
-     "title" : "Images / Attachments",
      "xtype" : "LayoutRegion",
+     "title" : "Images / Attachments",
      "width" : 500,
      "$ xns" : "Roo",
      "split" : true,
@@ -78,8 +96,8 @@
     },
     {
      "autoScroll" : false,
-     "fitToFrame" : true,
      "region" : "center",
+     "fitToFrame" : true,
      "xtype" : "NestedLayoutPanel",
      "fitContainer" : true,
      "$ xns" : "Roo",
@@ -180,8 +198,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Core/MailTemplateList.php'",
-             "xtype" : "HttpProxy",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -229,8 +247,8 @@
           "render" : "function (_self, width, height)\n{\n    \n      Roo.log(\"RESIZE, \" + width + ',' + height);\n    \n    var ew = Math.max(250, width-50);\n    var eh = Math.max(250,height-50) ;\n    \n   \n\n}"
          },
          "autoScroll" : false,
-         "background" : false,
          "fitToFrame" : true,
+         "background" : false,
          "region" : "center",
          "title" : "Message",
          "xtype" : "ContentPanel",
@@ -242,9 +260,9 @@
             "|actioncomplete" : "function(_self,action)\n{\n   \n    if (action.type == 'setdata') {\n    \n        setInterval(_this.form.findField('bodytext').autosave, 5000);\n        \n        _this.data.module = _this.data.module || 'crm_mailing_list_message';\n        \n        _this.form.url = baseURL + '/Roo/' + _this.data.module;\n        \n        _this.html_preview.hide();\n        _this.preview_btn.hide();\n            \n        if(_this.data.id*1 > 0){\n            _this.dialog.el.mask(\"Loading\");\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }});\n            _this.html_preview.show();\n            _this.preview_btn.show();\n            \n        } else {\n            _this.form.setValues({\n                'from_name' : Pman.Login.authUser.name,\n                'from_email' : Pman.Login.authUser.email\n            });\n        }\n       return;\n    }\n    if (action.type == 'load') {\n        _this.dialog.el.unmask();\n        \n        _this.form.findField('bodytext').originalValue = _this.form.findField('bodytext').getValue();\n        \n        return;\n    }\n    if (action.type =='submit') {\n    \n        _this.dialog.el.unmask();\n        _this.dialog.hide();\n    \n         if (_this.callback) {\n            _this.callback.call(_this, action.result.data);\n         }\n         _this.form.reset();\n         return;\n    }\n}\n",
             "|rendered" : "function (form)\n{\n    _this.form= form;\n}\n"
            },
+           "$ preValidate" : "function(done_callback) {\n    \n    Roo.MessageBox.progress(\"Uploading Images\", \"Uploading\");\n    \n    if(!_this.form.findField('bodytext').editorcore.sourceEditMode){\n        _this.form.findField('bodytext').syncValue();\n    }else{\n        _this.form.findField('bodytext').pushValue();\n    }\n    \n    var html = _this.form.findField('bodytext').getValue();\n    \n    var s = Roo.get(_this.form.findField('bodytext').editorcore.doc.documentElement);\n    \n    var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';\n    \n    var nodes = [];\n    s.select('img[src]').each(function(i) {\n        nodes.push(i.dom);\n    });\n    var total = nodes.length;\n    var mkimg = function() {\n    \n        if (!nodes.length) {\n              Roo.MessageBox.hide();\n              _this.form.findField('bodytext').syncValue();\n              done_callback(true);\n           //    _this.form.doAction(\"submit\");\n              return;\n        }\n        var i = nodes.pop(); \n        \n        var n = i.getAttribute('src').match(/(baseURL|server_baseurl)/);\n        \n        if(n){\n            mkimg();\n            return;\n        }\n        \n        n = i.getAttribute('src').match(/^http(.*)/);\n       \n        if(!n ){\n            mkimg();\n            return;\n        }\n        \n        new Pman.Request({\n            url : baseURL + '/Roo/Images.php',\n            method : 'POST',\n            params : {\n                onid : _this.form.findField('id').getValue(),\n                ontable : ontable ,\n                _remote_upload : i.src\n            },\n            success : function(res){\n                if(res.success == true){      \n                    i.setAttribute('src', res.data);\n                    Roo.MessageBox.updateProgress( (total - nodes.length) / total , \"Done \" + (total - nodes.length) + '/' + total);\n                }\n                mkimg();\n            }\n        });\n       \n    }\n    \n    if (!_this.form.findField('bodytext').getValue().match(/unsubscribe/i)) {\n        Roo.MessageBox.confirm(\"Missing unusubscribe\",\n            \"There is no unsubscribe link on the email  are you sure you want to save it\",\n            function(res) {\n                if (res == 'no') {\n                    return;\n                }\n                mkimg();\n            }\n        );\n\n        return;\n    }\n    \n    mkimg();\n}\n",
            "$ url" : "baseURL + '/Roo/crm_mailing_list_message.php'",
            "labelAlign" : "right",
-           "$ preValidate" : "function(done_callback) {\n    \n    Roo.MessageBox.progress(\"Uploading Images\", \"Uploading\");\n    \n    if(!_this.form.findField('bodytext').editorcore.sourceEditMode){\n        _this.form.findField('bodytext').syncValue();\n    }else{\n        _this.form.findField('bodytext').pushValue();\n    }\n    \n    var html = _this.form.findField('bodytext').getValue();\n    \n    var s = Roo.get(_this.form.findField('bodytext').editorcore.doc.documentElement);\n    \n    var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';\n    \n    var nodes = [];\n    s.select('img[src]').each(function(i) {\n        nodes.push(i.dom);\n    });\n    var total = nodes.length;\n    var mkimg = function() {\n    \n        if (!nodes.length) {\n              Roo.MessageBox.hide();\n              _this.form.findField('bodytext').syncValue();\n              done_callback(true);\n           //    _this.form.doAction(\"submit\");\n              return;\n        }\n        var i = nodes.pop(); \n        \n        var n = i.getAttribute('src').match(/(baseURL|server_baseurl)/);\n        \n        if(n){\n            mkimg();\n            return;\n        }\n        \n        n = i.getAttribute('src').match(/^http(.*)/);\n       \n        if(!n ){\n            mkimg();\n            return;\n        }\n        \n        new Pman.Request({\n            url : baseURL + '/Roo/Images.php',\n            method : 'POST',\n            params : {\n                onid : _this.form.findField('id').getValue(),\n                ontable : ontable ,\n                _remote_upload : i.src\n            },\n            success : function(res){\n                if(res.success == true){      \n                    i.setAttribute('src', res.data);\n                    Roo.MessageBox.updateProgress( (total - nodes.length) / total , \"Done \" + (total - nodes.length) + '/' + total);\n                }\n                mkimg();\n            }\n        });\n       \n    }\n    mkimg();\n}\n",
            "method" : "POST",
            "style" : "margin:10px",
            "xtype" : "Form",
@@ -340,8 +358,8 @@
                  "items" : [
                   {
                    "$ url" : "baseURL + '/Roo/Core_group'",
-                   "method" : "GET",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -375,8 +393,8 @@
              "items" : [
               {
                "hideLabels" : true,
-               "style" : "text-align:center;",
                "legend" : "Html Editor",
+               "style" : "text-align:center;",
                "xtype" : "FieldSet",
                "$ xns" : "Roo.form",
                "items" : [
@@ -385,9 +403,9 @@
                   "savedpreview" : "function (_self)\n{\n    var id = _this.form.findField('id').getValue() * 1;\n    \n    var successFn = function(res){\n        return res.data.POST.source;\n    };\n    \n    var params = {\n        action : 'AUTOSAVE',\n        remarks : 'BODY',\n        on_id : (id < 1) ? 0 : id,\n        on_table : 'crm_mailing_list_message',\n        successFn : successFn\n    };\n    \n    \n    Pman.Dialog.CoreAutoSavePreview.show(params, function(res){\n        _self.setValue(res);\n        _self.originalValue = res;\n    });\n}",
                   "autosave" : "function (_self)\n{\n    Roo.log('autosave');\n    \n    var id = _this.form.findField('id').getValue() * 1;\n    \n    /*\n    if(!_self.editorcore.sourceEditMode){\n        _self.syncValue();\n    }else{\n        _self.pushValue();\n    }\n    */\n    \n    new Pman.Request({\n        url : baseURL + '/Roo/Events.php',\n        method :'POST',\n        params : {\n            id : 0,\n            action : 'AUTOSAVE',\n            on_id : (id > 0) ? id : 0,\n            on_table : 'crm_mailing_list_message',\n            remarks : 'BODY',\n            source: _self.getValue()\n        },\n        success : function() {\n            _self.originalValue = _self.getValue();\n            \n        },\n        failure : function() \n        {\n            Roo.log('body autosave failed?!');\n        }\n    });\n    \n}"
                  },
+                 "xtype" : "HtmlEditor",
                  "$ cwhite" : "[ \n    'margin',\n    'padding',\n    'text-align',\n    'background',\n    'height',\n    'width',\n    'background-color',\n    'font-size',\n    'line-height',\n    'color',\n    'outline',\n    'text-decoration',\n    'position',\n    'clear',\n    'overflow',\n    'margin-top',\n    'border-bottom',\n    'top',\n    'list-style',\n    'margin-left',\n    'border',\n    'float' ,\n    'margin-right',\n    'padding-top',\n    'min-height',\n    'left',\n    'padding-left',\n    'font-weight',\n    'font-family',\n    'display',\n    'margin-bottom',\n    'padding-bottom',\n    'vertical-align',\n    'cursor',\n    'z-index',\n    'right'\n ]",
                  "| function autosave" : "function() {\n    \n    var body = _this.form.findField('bodytext');\n    \n    if(!body.wrap.isVisible(true) || body.getValue() == '' || !body.isDirty()){\n        Roo.log('body not dirty');\n        return;\n    }\n    \n    Roo.log('body dirty, auto save!');\n    \n    body.fireEvent('autosave', body);\n   \n}\n",
-                 "xtype" : "HtmlEditor",
                  "$ xns" : "Roo.form",
                  "resizable" : "s",
                  "name" : "bodytext",
@@ -443,8 +461,8 @@
                        "items" : [
                         {
                          "$ url" : "baseURL + '/Roo/Images.php'",
-                         "method" : "GET",
                          "xtype" : "HttpProxy",
+                         "method" : "GET",
                          "$ xns" : "Roo.data",
                          "* prop" : "proxy"
                         },
@@ -541,8 +559,8 @@
              "items" : [
               {
                "hideLabels" : true,
-               "style" : "text-align:center;",
                "legend" : "Plain Text",
+               "style" : "text-align:center;",
                "xtype" : "FieldSet",
                "$ xns" : "Roo.form",
                "items" : [
@@ -589,8 +607,8 @@
       "|activate" : "function() {\n    _this.ipanel = this;\n    if (_this.igrid) {\n       _this.igrid.ds.load({});\n    }\n}"
      },
      "autoScroll" : false,
-     "background" : false,
      "fitToframe" : true,
+     "background" : false,
      "region" : "east",
      "title" : "Images / Attachments",
      "xtype" : "GridPanel",
@@ -620,8 +638,8 @@
          "items" : [
           {
            "$ url" : "baseURL + '/Roo/Images.php'",
-           "method" : "GET",
            "xtype" : "HttpProxy",
+           "method" : "GET",
            "$ xns" : "Roo.data",
            "* prop" : "proxy"
           },
@@ -665,8 +683,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "Filename",
          "width" : 300,
+         "header" : "Filename",
          "$ renderer" : "function(v,x,r)\n{\n    var width = r.data.width;\n    var height = r.data.height;\n    \n    if(width > 50){\n        height = Math.round(height * 50 / width);\n        width = 50;\n    }\n    \n   return '<img src=\"' + baseURL + '/Images/' + r.data.id + '/' + r.data.filename + '\" width=\"' + width + '\" height=\"' + height + '\" />';\n}",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -674,8 +692,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "width" : 75,
          "header" : "Displayorder",
+         "width" : 75,
          "$ renderer" : "function(v) { return String.format('{0}', v); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -683,8 +701,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "Title",
          "width" : 75,
+         "header" : "Title",
          "$ renderer" : "function(v) { return String.format('{0}', v); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",

diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index fb2be9a..280b803 100644 (file)
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -13,14 +13,15 @@ Pman.Dialog.CoreEmail = {
   'b357b524e740bc85b9790a0712d84a30' :"Email address",
   '962b90039a542a29cedd51d87a9f28a1' :"Html Editor",
   '72d6d7a1885885bb55a565fd1070581a' :"Import",
+  '28690be026c0bb9003aa58e45e5662ca' :"Enabled - will be sent out",
   'ea30b40c3caf28acb29198d20d243e54' :"Images / Attachments >>",
   '31fde7b05ac8952dacf4af8a704074ec' :"Preview",
   'b337c8a67244afb6551ee1f8f9717676' :"Test Class <BR/> (for system reference only)",
   '884df8e413319ff51a3f5f528606238a' :"Use template",
   'e6b391a8d2c4d45902a23a8b6585703d' :"URL",
-  '2393ad754ba179442d85e415d1d5167c' :"Displayorder",
   '6f16a5f8ff5d75ab84c018adacdfcbb7' :"Field",
   'ec211f7c20af43e742bf2570c3cb84f9' :"Add",
+  '2393ad754ba179442d85e415d1d5167c' :"Displayorder",
   'e9968623956c15023d54335ea3699855' :"Convert Html to Text",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '5b8ef4e762c00a15a41cfc26dc3ef99c' :"Send me a test copy",
@@ -46,6 +47,23 @@ Pman.Dialog.CoreEmail = {
   '4c2a8fe7eaf24721cc7a9f0175115bd4' :"Message",
   'fff0d600f8a0b5e19e88bfb821dd1157' :"Images"
  },
+ _named_strings : {
+  'active_boxLabel' : '28690be026c0bb9003aa58e45e5662ca' /* Enabled - will be sent out */ ,
+  'template_fieldLabel' : '278c491bdd8a53618c149c4ac790da34' /* Template */ ,
+  'name_fieldLabel' : 'b20a8b77b05d53b4e695738731400c85' /* Mailout Name */ ,
+  'bcc_group_id_name_qtip' : '2c466a2c159463f1d9ef5a7b57b52827' /* Select BCC Group */ ,
+  'bcc_group_id_name_emptyText' : '2c466a2c159463f1d9ef5a7b57b52827' /* Select BCC Group */ ,
+  'template_qtip' : '31bb2f6e9b8fb11cbb7fb63c6025223f' /* Select Template */ ,
+  'template_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
+  'from_email_fieldLabel' : 'b357b524e740bc85b9790a0712d84a30' /* Email address */ ,
+  'template_emptyText' : '31bb2f6e9b8fb11cbb7fb63c6025223f' /* Select Template */ ,
+  'active_value' : 'c4ca4238a0b923820dcc509a6f75849b' /* 1 */ ,
+  'from_name_fieldLabel' : '5da618e8e4b89c66fe86e32cdafde142' /* From */ ,
+  'bcc_group_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
+  'bcc_group_id_name_fieldLabel' : '68b00d723d37122f64da8d9939f836f0' /* BCC Group */ ,
+  'subject_fieldLabel' : 'c7892ebbb139886662c6f2fc8c450710' /* Subject */ ,
+  'test_class_fieldLabel' : 'b337c8a67244afb6551ee1f8f9717676' /* Test Class <BR/> (for system reference only) */ 
+ },
 
  dialog : false,
  callback:  false,
@@ -538,6 +556,21 @@ Pman.Dialog.CoreEmail = {
                    });
                   
                }
+               
+               if (!_this.form.findField('bodytext').getValue().match(/unsubscribe/i)) {
+                   Roo.MessageBox.confirm("Missing unusubscribe",
+                       "There is no unsubscribe link on the email  are you sure you want to save it",
+                       function(res) {
+                           if (res == 'no') {
+                               return;
+                           }
+                           mkimg();
+                       }
+                   );
+           
+                   return;
+               }
+               
                mkimg();
            },
            style : 'margin:10px',
@@ -620,7 +653,7 @@ Pman.Dialog.CoreEmail = {
                items  : [
                 {
                  xtype : 'Checkbox',
-                 boxLabel : 'Enabled - will be sent out',
+                 boxLabel : _this._strings['28690be026c0bb9003aa58e45e5662ca'] /* Enabled - will be sent out */,
                  checked : true,
                  name : 'active',
                  value : 1,