bcc_group_id = {$cgm}.group_id
) AS bcc_group_member_count
");
-
if (!empty($_REQUEST['_hide_system_emails'])) {
$this->whereAddIn("!{$this->tableName()}.name", array('EVENT_ERRORS_REPORT'), 'string');
}
+ function beforeUpdate($old, $q, $roo)
+ {
+ if (!empty($q['_rescan'])){
+ if ($this->filetype != 'html') {
+ $roo->jerr("can not update a php source file currently - TDOD");
+ }
+ $pg = HTML_FlexyFramework::get()->page;
+
+ $this->syncTemplatePage(array(
+ 'template_dir' => $pg->rootDir . '/'. str_replace('.', '/', $this->view_name). '/templates',
+ 'template' => $this->template,
+ 'base' => $this->view_name,
+ 'force' => true
+ ));
+ // update the different langage versions of this page.
+ $x = DB_Dataobject::Factory('core_templatestr');
+ $x->selectAdd();
+ $x->selectAdd('distinct(lang) as lang');
+ $x->whereAdd("lang != ''");
+ $langs = $x->fetchAll('lang');
+ foreach($langs as $l) {
+ $x = DB_Dataobject::Factory('core_templatestr');
+ $x->syncLang($l, $this->id);
+ }
+
+
+ $roo->jok("updated -" . $this->template);
+ }
+ }
+
+
+
+
/*
* @param base (should be full path to template directory)
* @param subdir = empty for top or subpath.
* @param template_dir << the path to the template dir ... Pman/XXX/template ...
* @param template << name of template used by name field)
* @param base << view name (module ? + templates?)
+ * @param force << optional - forces even if database is newer.
*
*
*/
ini_set('memory_limit', '512M');
//var_dump($n);
- $n= $pgdata['template']; // remove trailing slash..
+ $n = $pgdata['template']; // remove trailing slash..
$fopts = HTML_FlexyFramework::get()->HTML_Template_Flexy;
$opts = HTML_FlexyFramework::get()->Pman_Core;
$tmpl->filetype = 'html';
$tmpl->update($oo);
}
-
-
-
- return $tmpl;
+ if (empty($pgdata['force'])) {
+ return $tmpl;
+ }
}
}
-
+ //die("got here");
try {
$r = $flexy->compile($pgdata['template']);
+
+
} catch(Exception $e) {
$old = clone($tmpl);
$tmpl->updated = date('Y-m-d H:i:s',filemtime($flexy->resolvePath ($pgdata['template'])));
//print_r($words);exit;
// grab original
$tt = DB_DataObject::factory($this->tableName());
-
-
- $t = DB_DataObject::factory($this->tableName());
+
+ $t = clone($tt);
$t->template_id = $tmpl->id;
$t->whereAdd("lang = ''");
$opts = HTML_FlexyFramework::get()->Pman;
$deldir = $opts['storedir']. '/_deleted_images_';
+ clearstatcache();
if (!file_exists( $deldir )) {
- mkdir($deldir, 0755);
+ @mkdir($deldir, 0755); // not sure why we are erroring here.. after checking - maybe permissions?
}
$fn = $this->getStoreName();
$img = DB_DataObjecT::factory('Images');
- if (!$id || !$img->get($id)) {
+ if (!$id || !$img->get($id) || !$img->exists()) {
$this->imgErr("image has been removed or deleted.",$s);
}
"dc0de523c25be298ba751c63c694109e" : "Responsive Email (1)",
"396ecabf0cd1f9503e591418851ef406" : "Edit / Create Message",
"b9c49611cfda3259a2b837b39489e650" : "Add Image",
+ "cafbb1cfc96d63acd85e7de928e1636b" : "To Group <BR/> (for system reference only)",
"ea4788705e6873b424c65e91c2846b19" : "Cancel",
"68b00d723d37122f64da8d9939f836f0" : "BCC Group",
"c4ca4238a0b923820dcc509a6f75849b" : "1",
},
"named_strings" : {
"active_boxLabel" : "28690be026c0bb9003aa58e45e5662ca",
+ "to_group_id_name_fieldLabel" : "cafbb1cfc96d63acd85e7de928e1636b",
"template_fieldLabel" : "278c491bdd8a53618c149c4ac790da34",
"name_fieldLabel" : "b20a8b77b05d53b4e695738731400c85",
"bcc_group_id_name_qtip" : "2c466a2c159463f1d9ef5a7b57b52827",
"items" : [
{
"xtype" : "LayoutRegion",
- "$ xns" : "Roo",
"tabPosition" : "top",
+ "$ xns" : "Roo",
"* prop" : "center"
},
{
"hidden" : true,
- "xtype" : "LayoutRegion",
"title" : "Images / Attachments",
+ "xtype" : "LayoutRegion",
"width" : 500,
"$ xns" : "Roo",
"split" : true,
},
{
"autoScroll" : false,
- "region" : "center",
"fitToFrame" : true,
+ "region" : "center",
"xtype" : "NestedLayoutPanel",
"fitContainer" : true,
"$ xns" : "Roo",
"items" : [
{
"$ url" : "baseURL + '/Core/MailTemplateList.php'",
- "method" : "GET",
"xtype" : "HttpProxy",
+ "method" : "GET",
"$ xns" : "Roo.data",
"* prop" : "proxy"
},
"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,
- "fitToFrame" : true,
"background" : false,
+ "fitToFrame" : true,
"region" : "center",
"title" : "Message",
"xtype" : "ContentPanel",
"|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"
},
- "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 \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",
"method" : "POST",
"style" : "margin:10px",
"xtype" : "Form",
"items" : [
{
"$ url" : "baseURL + '/Roo/Core_group'",
- "xtype" : "HttpProxy",
"method" : "GET",
+ "xtype" : "HttpProxy",
"$ xns" : "Roo.data",
"* prop" : "proxy"
},
"items" : [
{
"hideLabels" : true,
- "legend" : "Html Editor",
"style" : "text-align:center;",
+ "legend" : "Html Editor",
"xtype" : "FieldSet",
"$ xns" : "Roo.form",
"items" : [
"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}"
},
"bool allowComments" : true,
- "xtype" : "HtmlEditor",
"| 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",
"$ cwhite" : "[ \n 'background',\n 'background-color',\n 'border',\n 'border-radius',\n 'border-bottom',\n 'border-left',\n 'border-right',\n 'border-top',\n 'border-collapse',\n 'border-color',\n 'border-style',\n 'border-width',\n\n \n 'box-shadow',\n 'clear',\n 'color',\n 'cursor',\n 'display',\n 'float' ,\n 'font-family',\n 'font-size',\n 'font-style', \n 'font-weight',\n\n 'height',\n 'left',\n 'line-height',\n 'list-style',\n 'margin',\n 'margin-bottom',\n 'margin-left',\n 'margin-right',\n 'margin-top',\n 'max-width',\n 'min-height',\n '-ms-interpolation-mode',\n 'mso-table-rspace',\n '-ms-text-size-adjust',\n 'outline',\n 'overflow',\n 'padding',\n 'padding-bottom',\n 'padding-left',\n 'padding-right',\n 'padding-top',\n 'position',\n 'right',\n 'text-align',\n 'text-decoration',\n 'top',\n 'vertical-align',\n '-webkit-text-size-adjust',\n 'width',\n 'width',\n 'z-index'\n ]",
"boolean autoClean" : false,
"$ xns" : "Roo.form",
"items" : [
{
"$ url" : "baseURL + '/Roo/Images.php'",
- "xtype" : "HttpProxy",
"method" : "GET",
+ "xtype" : "HttpProxy",
"$ xns" : "Roo.data",
"* prop" : "proxy"
},
"items" : [
{
"hideLabels" : true,
- "legend" : "Plain Text",
"style" : "text-align:center;",
+ "legend" : "Plain Text",
"xtype" : "FieldSet",
"$ xns" : "Roo.form",
"items" : [
}
]
},
+ {
+ "xtype" : "Row",
+ "$ xns" : "Roo.form",
+ "items" : [
+ {
+ "fieldLabel" : "To Group <BR/> (for system reference only)",
+ "Boolean readOnly" : true,
+ "xtype" : "TextField",
+ "allowBlank" : true,
+ "width" : 300,
+ "$ xns" : "Roo.form",
+ "name" : "to_group_id_name"
+ }
+ ]
+ },
{
"xtype" : "Hidden",
"$ xns" : "Roo.form",
"|activate" : "function() {\n _this.ipanel = this;\n if (_this.igrid) {\n _this.igrid.ds.load({});\n }\n}"
},
"autoScroll" : false,
- "fitToframe" : true,
"background" : false,
+ "fitToframe" : true,
"region" : "east",
"title" : "Images / Attachments",
"xtype" : "GridPanel",
"items" : [
{
"$ url" : "baseURL + '/Roo/Images.php'",
- "xtype" : "HttpProxy",
"method" : "GET",
+ "xtype" : "HttpProxy",
"$ xns" : "Roo.data",
"* prop" : "proxy"
},
},
{
"xtype" : "ColumnModel",
- "width" : 300,
"header" : "Filename",
+ "width" : 300,
"$ 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[]",
},
{
"xtype" : "ColumnModel",
- "header" : "Displayorder",
"width" : 75,
+ "header" : "Displayorder",
"$ renderer" : "function(v) { return String.format('{0}', v); }",
"$ xns" : "Roo.grid",
"* prop" : "colModel[]",
},
{
"xtype" : "ColumnModel",
- "width" : 75,
"header" : "Title",
+ "width" : 75,
"$ renderer" : "function(v) { return String.format('{0}', v); }",
"$ xns" : "Roo.grid",
"* prop" : "colModel[]",
'dc0de523c25be298ba751c63c694109e' :"Responsive Email (1)",
'396ecabf0cd1f9503e591418851ef406' :"Edit / Create Message",
'b9c49611cfda3259a2b837b39489e650' :"Add Image",
+ 'cafbb1cfc96d63acd85e7de928e1636b' :"To Group <BR/> (for system reference only)",
'ea4788705e6873b424c65e91c2846b19' :"Cancel",
'68b00d723d37122f64da8d9939f836f0' :"BCC Group",
'c4ca4238a0b923820dcc509a6f75849b' :"1",
},
_named_strings : {
'active_boxLabel' : '28690be026c0bb9003aa58e45e5662ca' /* Enabled - will be sent out */ ,
+ 'to_group_id_name_fieldLabel' : 'cafbb1cfc96d63acd85e7de928e1636b' /* To Group <BR/> (for system reference only) */ ,
'template_fieldLabel' : '278c491bdd8a53618c149c4ac790da34' /* Template */ ,
'name_fieldLabel' : 'b20a8b77b05d53b4e695738731400c85' /* Mailout Name */ ,
'bcc_group_id_name_qtip' : '2c466a2c159463f1d9ef5a7b57b52827' /* Select BCC Group */ ,
}
]
},
+ {
+ xtype : 'Row',
+ xns : Roo.form,
+ '|xns' : 'Roo.form',
+ items : [
+ {
+ xtype : 'TextField',
+ allowBlank : true,
+ fieldLabel : _this._strings['cafbb1cfc96d63acd85e7de928e1636b'] /* To Group <BR/> (for system reference only) */,
+ name : 'to_group_id_name',
+ readOnly : true,
+ width : 300,
+ xns : Roo.form,
+ '|xns' : 'Roo.form'
+ }
+ ]
+ },
{
xtype : 'Hidden',
name : 'id',
"name" : "Pman.Dialog.CorePersonContact",
"parent" : "",
"title" : "",
- "path" : "/home/johns/gitlive/Pman.Core/Pman.Dialog.CorePersonContact.bjs",
+ "path" : "/home/leon/gitlive/web.MediaOutreach/Pman/Core/Pman.Dialog.CorePersonContact.bjs",
"permname" : "",
"modOrder" : "001",
"strings" : {
"c9cc8cce247e49bae79f15173ce97354" : "Save",
"9810aa2b9f44401be4bf73188ef2b67d" : "Fax"
},
+ "named_strings" : {
+ "company_id_code_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+ "role_fieldLabel" : "bbbabdbe1b262f75d99d62880b953be1",
+ "fax_fieldLabel" : "9810aa2b9f44401be4bf73188ef2b67d",
+ "office_id_name_emptyText" : "c373dd4bd4ba0b5d3e0c7522c5629880",
+ "name_fieldLabel" : "49ee3087348e8d44e1feda1917443987",
+ "phone_fieldLabel" : "bcc254b55c4a1babdf1dcb82c207506b",
+ "office_id_name_fieldLabel" : "df814135652a5a308fea15bff37ea284",
+ "office_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+ "company_id_code_qtip" : "9675747b5ab12d05f18518761e68a533",
+ "office_id_name_qtip" : "c373dd4bd4ba0b5d3e0c7522c5629880",
+ "email_fieldLabel" : "ce8ae9da5b7cd6c3df2929543a9af92d",
+ "company_id_code_emptyText" : "9675747b5ab12d05f18518761e68a533",
+ "company_id_code_fieldLabel" : "1c76cbfe21c6f44c1d1e59d54f3e4420"
+ },
"items" : [
{
"collapsible" : false,
- "title" : "Edit / Create Contact Details",
"xtype" : "LayoutDialog",
+ "title" : "Edit / Create Contact Details",
"width" : 450,
"$ xns" : "Roo",
"closable" : false,
"|rendered" : "function (form)\n{\n _this.form= form;\n}\n"
},
"$ url" : "baseURL + '/Roo/core_person'",
- "xtype" : "Form",
"method" : "POST",
+ "xtype" : "Form",
"style" : "margin:10px;",
"$ xns" : "Roo.form",
"items" : [
"items" : [
{
"$ url" : "baseURL + '/Roo/core_company.php'",
- "method" : "GET",
"xtype" : "HttpProxy",
+ "method" : "GET",
"$ xns" : "Roo.data",
"* prop" : "proxy"
},
"items" : [
{
"$ url" : "baseURL + '/Roo/Office.php'",
- "method" : "GET",
"xtype" : "HttpProxy",
+ "method" : "GET",
"$ xns" : "Roo.data",
"* prop" : "proxy"
},
'c9cc8cce247e49bae79f15173ce97354' :"Save",
'9810aa2b9f44401be4bf73188ef2b67d' :"Fax"
},
+ _named_strings : {
+ 'company_id_code_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
+ 'role_fieldLabel' : 'bbbabdbe1b262f75d99d62880b953be1' /* Role */ ,
+ 'fax_fieldLabel' : '9810aa2b9f44401be4bf73188ef2b67d' /* Fax */ ,
+ 'office_id_name_emptyText' : 'c373dd4bd4ba0b5d3e0c7522c5629880' /* Select Office */ ,
+ 'name_fieldLabel' : '49ee3087348e8d44e1feda1917443987' /* Name */ ,
+ 'phone_fieldLabel' : 'bcc254b55c4a1babdf1dcb82c207506b' /* Phone */ ,
+ 'office_id_name_fieldLabel' : 'df814135652a5a308fea15bff37ea284' /* Office */ ,
+ 'office_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
+ 'company_id_code_qtip' : '9675747b5ab12d05f18518761e68a533' /* Select Companies */ ,
+ 'office_id_name_qtip' : 'c373dd4bd4ba0b5d3e0c7522c5629880' /* Select Office */ ,
+ 'email_fieldLabel' : 'ce8ae9da5b7cd6c3df2929543a9af92d' /* Email */ ,
+ 'company_id_code_emptyText' : '9675747b5ab12d05f18518761e68a533' /* Select Companies */ ,
+ 'company_id_code_fieldLabel' : '1c76cbfe21c6f44c1d1e59d54f3e4420' /* Company */
+ },
dialog : false,
callback: false,
ALTER TABLE core_person ADD COLUMN deleted_by INT(11) NOT NULL default 0 ;
-ALTER TABLE core_person ADD COLUMN deleted_dt DATETIME no null default '1000-01-01 00:00:00';
+ALTER TABLE core_person ADD COLUMN deleted_dt DATETIME NOT null default '1000-01-01 00:00:00';
-- social
projects / Pman.Core / commitdiff