- Remove tinyMCE mentions or convert to addeditortext()
- Remove $editselect template value
This commit is contained in:
Hypolite Petovan
parent
a2740d2034
commit
9d5384f107
19 changed files with 122 additions and 623 deletions
|
|
@ -67,10 +67,6 @@ function cal_init(App $a) {
|
|||
function cal_content(App $a) {
|
||||
nav_set_selected('events');
|
||||
|
||||
$editselect = 'none';
|
||||
if( feature_enabled(local_user(), 'richtext') )
|
||||
$editselect = 'textareas';
|
||||
|
||||
// First day of the week (0 = Sunday)
|
||||
$firstDay = get_pconfig(local_user(),'system','first_day_of_week');
|
||||
if ($firstDay === false) $firstDay=0;
|
||||
|
|
@ -84,13 +80,11 @@ function cal_content(App $a) {
|
|||
'$module_url' => '/cal/' . $a->data['user']['nickname'],
|
||||
'$modparams' => 2,
|
||||
'$i18n' => $i18n,
|
||||
'$editselect' => $editselect
|
||||
));
|
||||
|
||||
$etpl = get_markup_template('event_end.tpl');
|
||||
$a->page['end'] .= replace_macros($etpl,array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$editselect' => $editselect
|
||||
));
|
||||
|
||||
$o ="";
|
||||
|
|
|
|||
|
|
@ -489,17 +489,11 @@ function contacts_content(App $a) {
|
|||
$contact_id = $a->data['contact']['id'];
|
||||
$contact = $a->data['contact'];
|
||||
|
||||
$editselect = 'none';
|
||||
if( feature_enabled(local_user(),'richtext') )
|
||||
$editselect = 'exact';
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => $editselect,
|
||||
));
|
||||
$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => $editselect,
|
||||
));
|
||||
|
||||
require_once('include/contact_selectors.php');
|
||||
|
|
|
|||
|
|
@ -28,14 +28,6 @@ function editpost_content(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
/* $plaintext = false;
|
||||
if( local_user() && intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') )
|
||||
$plaintext = true;*/
|
||||
$plaintext = true;
|
||||
if( local_user() && feature_enabled(local_user(),'richtext') )
|
||||
$plaintext = false;
|
||||
|
||||
|
||||
$o .= replace_macros(get_markup_template("section_title.tpl"),array(
|
||||
'$title' => t('Edit post')
|
||||
));
|
||||
|
|
@ -43,7 +35,6 @@ function editpost_content(App $a) {
|
|||
$tpl = get_markup_template('jot-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $a->user['nickname']
|
||||
|
|
@ -52,7 +43,6 @@ function editpost_content(App $a) {
|
|||
$tpl = get_markup_template('jot-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $a->user['nickname']
|
||||
|
|
|
|||
|
|
@ -220,11 +220,6 @@ function events_content(App $a) {
|
|||
nav_set_selected('events');
|
||||
}
|
||||
|
||||
$editselect = 'none';
|
||||
if ( feature_enabled(local_user(), 'richtext') ) {
|
||||
$editselect = 'textareas';
|
||||
}
|
||||
|
||||
// get the translation strings for the callendar
|
||||
$i18n = get_event_strings();
|
||||
|
||||
|
|
@ -234,13 +229,11 @@ function events_content(App $a) {
|
|||
'$module_url' => '/events',
|
||||
'$modparams' => 1,
|
||||
'$i18n' => $i18n,
|
||||
'$editselect' => $editselect
|
||||
));
|
||||
|
||||
$etpl = get_markup_template('event_end.tpl');
|
||||
$a->page['end'] .= replace_macros($etpl,array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$editselect' => $editselect
|
||||
));
|
||||
|
||||
$o ="";
|
||||
|
|
|
|||
|
|
@ -275,18 +275,9 @@ function message_content(App $a) {
|
|||
|
||||
$o .= $header;
|
||||
|
||||
/* $plaintext = false;
|
||||
if(intval(get_pconfig(local_user(),'system','plaintext')))
|
||||
$plaintext = true;*/
|
||||
$plaintext = true;
|
||||
if( local_user() && feature_enabled(local_user(),'richtext') )
|
||||
$plaintext = false;
|
||||
|
||||
|
||||
$tpl = get_markup_template('msg-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
|
@ -294,7 +285,6 @@ function message_content(App $a) {
|
|||
$tpl = get_markup_template('msg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
|
@ -397,10 +387,6 @@ function message_content(App $a) {
|
|||
|
||||
$o .= $header;
|
||||
|
||||
$plaintext = true;
|
||||
if( local_user() && feature_enabled(local_user(),'richtext') )
|
||||
$plaintext = false;
|
||||
|
||||
$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
|
||||
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
|
||||
WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
|
||||
|
|
@ -439,7 +425,6 @@ function message_content(App $a) {
|
|||
$tpl = get_markup_template('msg-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
|
@ -447,12 +432,10 @@ function message_content(App $a) {
|
|||
$tpl = get_markup_template('msg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
||||
|
||||
$mails = array();
|
||||
$seen = 0;
|
||||
$unknown = false;
|
||||
|
|
|
|||
|
|
@ -623,23 +623,13 @@ function profiles_content(App $a) {
|
|||
require_once('include/profile_selectors.php');
|
||||
|
||||
|
||||
/* $editselect = 'textareas';
|
||||
if( intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') )
|
||||
$editselect = 'none';*/
|
||||
$editselect = 'none';
|
||||
if( feature_enabled(local_user(),'richtext') )
|
||||
$editselect = 'textareas';
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => $editselect,
|
||||
));
|
||||
$a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$editselect' => $editselect,
|
||||
));
|
||||
|
||||
|
||||
$opt_tpl = get_markup_template("profile-hide-friends.tpl");
|
||||
$hide_friends = replace_macros($opt_tpl,array(
|
||||
'$yesno' => array(
|
||||
|
|
|
|||
|
|
@ -113,16 +113,9 @@ function wallmessage_content(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
$editselect = 'none';
|
||||
if( feature_enabled(local_user(), 'richtext') )
|
||||
$editselect = '/(profile-jot-text|prvmail-text)/';
|
||||
|
||||
$tpl = get_markup_template('wallmsg-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => $a->get_baseurl(true),
|
||||
'$editselect' => $editselect,
|
||||
'$nickname' => $user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
|
@ -130,13 +123,10 @@ function wallmessage_content(App $a) {
|
|||
$tpl = get_markup_template('wallmsg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => $a->get_baseurl(true),
|
||||
'$editselect' => $editselect,
|
||||
'$nickname' => $user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
||||
|
||||
|
||||
$tpl = get_markup_template('wallmessage.tpl');
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$header' => t('Send Private Message'),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue