-
+
@@ -447,7 +447,7 @@
fields[''][''] = ''
-
+
@@ -525,7 +525,7 @@
|
|
-
+
|
Index: branches/RC/core/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -r11612 -r11760
--- branches/RC/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 11612)
+++ branches/RC/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 11760)
@@ -111,8 +111,8 @@
'Fields' => Array(
'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
- 'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
- 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
+ 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
+ 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0),
),
Index: branches/RC/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r11750 -r11760
--- branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11750)
+++ branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11760)
@@ -1811,6 +1811,11 @@
$event->status = erSTOP;
$string = unhtmlentities($this->Application->GetVar('preview_content'));
+ $category_helper =& $this->Application->recallObject('CategoryHelper');
+ /* @var $category_helper CategoryHelper */
+
+ $string = $category_helper->replacePageIds($string);
+
$this->Application->StoreVar('_editor_preview_content_', $string);
}
}
Index: branches/RC/core/units/selectors/selectors_config.php
===================================================================
diff -u -r11538 -r11760
--- branches/RC/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 11538)
+++ branches/RC/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 11760)
@@ -92,9 +92,9 @@
'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1),
'SelectorData' => Array('type' => 'string', 'not_null' => '1','default' => ''),
- 'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
+ 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
- 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
+ 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => 1, 'default' => 0),
),
Index: branches/RC/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -r11623 -r11760
--- branches/RC/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 11623)
+++ branches/RC/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 11760)
@@ -39,7 +39,7 @@
-
+
Index: branches/RC/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r11758 -r11760
--- branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11758)
+++ branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11760)
@@ -2135,6 +2135,7 @@
function FCKEditor($params)
{
$params['no_special'] = 1;
+ $params['format'] = array_key_exists('format', $params) ? $params['format'] . ';fck_ready' : 'fck_ready';
$value = $this->Field($params);
$name = array_key_exists('name', $params) ? $params['name'] : $this->InputName($params);
@@ -2151,16 +2152,19 @@
$bgcolor = '#ffffff';
}
- $url = '';
- $st_id = $this->Application->GetVar('st_id');
- if ($st_id) {
+ $preview_url = '';
+ $page_id = $this->Application->GetVar('c_id');
+ $content_id = $this->Application->GetVar('content_id');
+ if ($page_id && $content_id) {
+ // editing content block from Front-End, not category in admin
$sql = 'SELECT NamedParentPath
- FROM ' . $this->Application->getUnitOption('st', 'TableName') . '
- WHERE ' . $this->Application->getUnitOption('st', 'IDField') . ' = ' . $st_id;
- $tpl = $this->Conn->GetOne($sql);
+ FROM ' . $this->Application->getUnitOption('c', 'TableName') . '
+ WHERE ' . $this->Application->getUnitOption('c', 'IDField') . ' = ' . $page_id;
+ $template = strtolower( $this->Conn->GetOne($sql) );
- $url_params = Array ('pass' => 'm', 'm_cat_id' => $st_id, 'index_file' => 'index.php');
- $url = $this->Application->HREF($tpl, '_FRONT_END_', $url_params);
+ $url_params = Array ('m_cat_id' => $page_id, 'no_amp' => 1, 'editing_mode' => EDITING_MODE_CMS, 'pass' => 'm');
+ $preview_url = $this->Application->HREF($template, '_FRONT_END_', $url_params, 'index.php');
+ $preview_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $preview_url);
}
include_once(FULL_PATH . EDITOR_PATH . 'fckeditor.php');
@@ -2171,9 +2175,9 @@
$oFCKeditor->BasePath = BASE_PATH . EDITOR_PATH;
$oFCKeditor->Width = $params['width'] ;
$oFCKeditor->Height = $params['height'] ;
- $oFCKeditor->ToolbarSet = $st_id ? 'Advanced' : 'Default';
+ $oFCKeditor->ToolbarSet = $page_id && $content_id ? 'Advanced' : 'Default';
$oFCKeditor->Value = $value;
- $oFCKeditor->PreviewUrl = $url;
+ $oFCKeditor->PreviewUrl = $preview_url;
$oFCKeditor->DefaultLanguage = $this->SetFCKDefaultLanguage();
$oFCKeditor->LateLoad = array_key_exists('late_load', $params) && $params['late_load'];
$oFCKeditor->Config = Array (
@@ -2187,7 +2191,7 @@
'Admin' => 1,
'K4' => 1,
'newBgColor' => $bgcolor,
- 'PreviewUrl' => $url,
+ 'PreviewUrl' => $preview_url,
'BaseUrl' => BASE_PATH . '/',
'DefaultLanguage' => $this->SetFCKDefaultLanguage(),
'EditorAreaStyles' => 'body { background-color: '.$bgcolor.' }',
Index: branches/RC/core/kernel/utility/formatters/formatter.php
===================================================================
diff -u -r10832 -r11760
--- branches/RC/core/kernel/utility/formatters/formatter.php (.../formatter.php) (revision 10832)
+++ branches/RC/core/kernel/utility/formatters/formatter.php (.../formatter.php) (revision 11760)
@@ -2,8 +2,39 @@
class kFormatter extends kBase {
+ /**
+ * Reference to category helper
+ *
+ * @var CategoryHelper
+ */
+ var $_categoryHelper = null;
+ function kFormatter()
+ {
+ parent::kBase();
+
+ $this->_categoryHelper =& $this->Application->recallObject('CategoryHelper');
+ }
+
/**
+ * Replace FCK links like "@@ID@@" to real page urls, when "using_fck" option is set.
+ *
+ * @param string $text
+ * @param Array $options
+ * @param string $format
+ * @return string
+ */
+ function _replaceFCKLinks(&$value, $options, $format = null)
+ {
+ if ((isset($format) && strpos($format, 'fck_ready') !== false) || (!array_key_exists('using_fck', $options) || !$options['using_fck'])) {
+ // in textarea, where fck will be used OR not using fck
+ return $value;
+ }
+
+ return $this->_categoryHelper->replacePageIds($value);
+ }
+
+ /**
* Convert's value to match type from config
*
* @param mixed $value
@@ -70,25 +101,42 @@
}
//function Format($value, $options, &$errors)
- function Format($value, $field_name, &$object, $format=null)
+ function Format($value, $field_name, &$object, $format = null)
{
- if ( is_null($value) ) return '';
+ if ( is_null($value) ) {
+ return '';
+ }
$options = $object->GetFieldOptions($field_name);
- if ( isset($format) ) $options['format'] = $format;
- $tc_value = $value; // $this->TypeCast($value,$options);
- if( ($tc_value === false) || ("$tc_value" != "$value") ) return $value; // for leaving badly formatted date on the form
+ if (!isset($format) && array_key_exists('format', $options)) {
+ $format = $options['format'];
+ }
- if (isset($options['format'])) {
- $tc_value = sprintf($options['format'], $tc_value);
+ if ($value === false) {
+ // used ?
+ return $value; // for leaving badly formatted date on the form
}
+ $original_format = $format;
+ if (isset($format)) {
+ if (strpos($format, 'fck_ready') !== false) {
+ $format = trim(str_replace('fck_ready', '', $format), ';');
+ }
+ }
+
+ if (isset($format) && $format) {
+ $value = sprintf($format, $value);
+ }
+
if (preg_match('#int|integer|double|float|real|numeric#', $options['type'])) {
$lang =& $this->Application->recallObject('lang.current');
- return $lang->formatNumber($tc_value);
+ return $lang->formatNumber($value);
}
+ elseif ($options['type'] == 'string') {
+ $value = $this->_replaceFCKLinks($value, $options, $original_format);
+ }
- return $tc_value;
+ return $value;
}
/**
@@ -101,11 +149,15 @@
*/
function Parse($value, $field_name, &$object)
{
- if ($value == '') return NULL;
+ if ($value == '') {
+ return NULL;
+ }
$options = $object->GetFieldOptions($field_name);
$tc_value = $this->TypeCast($value,$options);
- if($tc_value === false) return $value; // for leaving badly formatted date on the form
+ if ($tc_value === false) {
+ return $value; // for leaving badly formatted date on the form
+ }
if(isset($options['type'])) {
if (preg_match('#double|float|real|numeric#', $options['type'])) {
Index: branches/RC/core/editor/editor/plugins/MyPreview/fckplugin.js
===================================================================
diff -u -r10974 -r11760
--- branches/RC/core/editor/editor/plugins/MyPreview/fckplugin.js (.../fckplugin.js) (revision 10974)
+++ branches/RC/core/editor/editor/plugins/MyPreview/fckplugin.js (.../fckplugin.js) (revision 11760)
@@ -7,18 +7,18 @@
{
initXmlHTTP();
xmlHTTP.onreadystatechange = OnGetAnswerPost;
-
+
// the path is NOT /admin, otherwise content will be stored in admin session !
- xmlHTTP.open("POST", FCKConfig.ProjectPath+'index.php?env=-dummy:st--OnUpdatePreviewBlock---&admin=1&ajax=yes', true);
- xmlHTTP.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- xmlHTTP.send("&preview_content="+escape( FCK.GetXHTML() )+"&st_event=OnUpdatePreviewBlock");
-}
+ xmlHTTP.open('POST', FCKConfig.ProjectPath+'index.php?t=dummy&events[c]=OnUpdatePreviewBlock&ajax=yes', true);
+ xmlHTTP.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+ xmlHTTP.send('&preview_content=' + encodeURIComponent(FCK.GetXHTML()));
+}
MyPreviewCommand.prototype.GetState = function()
{
return FCK_TRISTATE_OFF;
}
-
+
function initXmlHTTP(){
//if (xmlHTTP) return;
try {
Index: branches/RC/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -r11623 -r11760
--- branches/RC/core/admin_templates/forms/form_field_edit.tpl (.../form_field_edit.tpl) (revision 11623)
+++ branches/RC/core/admin_templates/forms/form_field_edit.tpl (.../form_field_edit.tpl) (revision 11760)
@@ -42,7 +42,7 @@
-
+
Index: branches/RC/core/units/mailing_lists/mailing_lists_config.php
===================================================================
diff -u -r11612 -r11760
--- branches/RC/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 11612)
+++ branches/RC/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 11760)
@@ -90,8 +90,8 @@
),
'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required' => 1, 'default' => ''),
- 'MessageText' => Array ('type' => 'string', 'default' => NULL),
- 'MessageHtml' => Array ('type' => 'string', 'default' => NULL),
+ 'MessageText' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+ 'MessageHtml' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
'Status' => Array (
'type' => 'int',