Skip to content

Commit

Permalink
Revert "Поддержка сторонных бб кодов"
Browse files Browse the repository at this point in the history 
This reverts commit ac77223.

# Conflicts:
#	engine/includes/inc/consts.inc.php
  • Loading branch information
@ROZARD
ROZARD committed Nov 29, 2016
1 parent 0519611 commit 3554bb2
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 58 deletions.
14 changes: 4 additions & 10 deletions engine/actions/configuration.php
View file
@@ -1,7 +1,7 @@
<?php

//
// Copyright (C) 2006-2016 Next Generation CMS (http://ngcms.ru/)
// Copyright (C) 2006-2014 Next Generation CMS (http://ngcms.ru/)
// Name: configuration.php
// Description: Configuration managment
// Author: Vitaly Ponomarev, Alexey Zinchenko
Expand Down Expand Up @@ -111,7 +111,7 @@ function systemConfigSave(){
//
// Show configuration form
function systemConfigEditForm(){
global $lang, $AUTH_CAPABILITIES, $LIST_BBCODE, $PHP_SELF, $twig, $multiconfig;
global $lang, $AUTH_CAPABILITIES, $PHP_SELF, $twig, $multiconfig;

// Check for token
if (!checkPermission(array('plugin' => '#admin', 'item' => 'configuration'), null, 'details')) {
Expand All @@ -120,19 +120,14 @@ function systemConfigEditForm(){
return false;
}

$bbcode = array();
$LIST_BBCODE = array_merge(array($lang['bbcode_standart'] => $lang['bbcode_standart']), $LIST_BBCODE);
foreach ($LIST_BBCODE as $k => $v) {
$bbcode[$k] = $k;
}

$auth_modules = array();
$auth_dbs = array();

foreach ($AUTH_CAPABILITIES as $k => $v) {
if ($v['login']) { $auth_modules[$k] = $k; }
if ($v['db']) { $auth_dbs[$k] = $k; }
}

// Load config file from configuration
// Now in $config we have original version of configuration data
include confroot.'config.php';
Expand Down Expand Up @@ -160,7 +155,6 @@ function systemConfigEditForm(){
'default_lang' => ListFiles('lang', ''),
'wm_image' => ListFiles('trash', array('gif', 'png'), 2),
'auth_module' => $auth_modules,
'bbcode' => $bbcode,
'auth_db' => $auth_dbs,
'timezoneList' => timezone_identifiers_list(),
),
Expand Down
2 changes: 1 addition & 1 deletion engine/actions/news.php
View file
Expand Up @@ -16,7 +16,7 @@
LoadLang('editnews', 'admin');
LoadLang('editnews', 'admin', 'editnews');
LoadLang('addnews', 'admin', 'addnews');
includeBBCODE();


// ======================================================================================================
// Edit news form
Expand Down
4 changes: 1 addition & 3 deletions engine/core.php
View file
Expand Up @@ -15,7 +15,7 @@
// Global variables definition
// ============================================================================
global $PLUGINS, $EXTRA_HTML_VARS, $EXTRA_CSS;
global $AUTH_METHOD, $LIST_BBCODE, $AUTH_CAPABILITIES, $PPAGES, $PFILTERS, $RPCFUNC, $TWIGFUNC;
global $AUTH_METHOD, $AUTH_CAPABILITIES, $PPAGES, $PFILTERS, $RPCFUNC, $TWIGFUNC;
global $RPCADMFUNC, $SUPRESS_TEMPLATE_SHOW, $SUPRESS_MAINBLOCK_SHOW, $SYSTEM_FLAGS;
global $DSlist, $PERM, $confPerm, $confPermUser, $systemAccessURL, $cron;
global $timer, $mysql, $ip, $parse, $tpl, $lang;
Expand All @@ -42,8 +42,6 @@
$PERM = array(); // PERMISSIONS
$UGROUP = array(); // USER GROUPS

$LIST_BBCODE = array();

$SUPRESS_TEMPLATE_SHOW = 0;
$SUPRESS_MAINBLOCK_SHOW = 0;

Expand Down
6 changes: 5 additions & 1 deletion engine/includes/inc/consts.inc.php
View file
Expand Up @@ -17,9 +17,13 @@
@define('NGCMS', true);

@define('engineName', 'NGCMS');
<<<<<<< HEAD
@define('engineVersion', '0.9.4.RC3');
=======
@define('engineVersion', '0.9.4.RC2');
>>>>>>> parent of ac77223... Поддержка сторонных бб кодов
@define('engineVersionType', 'GIT');
@define('engineVersionBuild', '20161129');
@define('engineVersionBuild', '20160614');

@define('prefix', $config['prefix']);
@define('uprefix',$config['uprefix']);
Expand Down
12 changes: 1 addition & 11 deletions engine/includes/inc/functions.inc.php
View file
Expand Up @@ -1421,7 +1421,6 @@ function newsFillVariables($row, $fullMode, $page = 0, $disablePagination = 0, $
list ($short, $full) = explode('<!--more-->', $row['content'], 2);
$more = '';
}

// Default page number
$page = 1;

Expand Down Expand Up @@ -1501,6 +1500,7 @@ function newsFillVariables($row, $fullMode, $page = 0, $disablePagination = 0, $
// [TWIG] news.title
$tvars['vars']['news']['title'] = $row['title'];


// Make conversion
if ($config['blocks_for_reg']) { $short = $parse -> userblocks($short); $full = $parse -> userblocks($full); }
if ($config['use_bbcodes']) { $short = $parse -> bbcodes($short); $full = $parse -> bbcodes($full); }
Expand Down Expand Up @@ -2897,16 +2897,6 @@ function twigTruncateHTML($string, $len = 70, $finisher = '') {
return $parse->truncateHTML($string, $len, $finisher);
}

function includeBBCODE(){
global $LIST_BBCODE, $config;

//print '<pre>'.var_export($LIST_BBCODE).'</pre>';
//print '<pre>'.var_export($config['bbcode']).'</pre>';
//print '<pre>'.var_export($LIST_BBCODE[$config['bbcode']]).'</pre>';

if(isset($LIST_BBCODE[$config['bbcode']]))
register_filter('news','wysiwyg', $LIST_BBCODE[$config['bbcode']]);
}

function jsonFormatter($json) {

Expand Down
3 changes: 0 additions & 3 deletions engine/lang/english/admin/configuration.ini
View file
Expand Up @@ -254,9 +254,6 @@ news_multicat_url = "URL style when news is a part of several categories"
news_multicat_url#desc = "<b>Main</b> - only main category is shown in URL<br/><b>all</b> - all caregories will be in URL"
news_multicat:0 = "all"
news_multicat:1 = "main"
bbcode = "Visual editor"
bbcode_desc = "You need to install the necessary plugin"
bbcode_standart = "Standart"
syslog = "Save activity log of all users"
syslog_desc = "Activity log (system log) is stored in SQL table ng_syslog for 1 month"
load = "Collect load counters"
Expand Down
3 changes: 0 additions & 3 deletions engine/lang/russian/admin/configuration.ini
View file
Expand Up @@ -256,9 +256,6 @@ news_multicat_url = "
news_multicat_url#desc = "<b>главная</b> - в URL попадает только главная категория<br/><b>все</b> - в URL попадают все категории"
news_multicat:0 = "все"
news_multicat:1 = "главная"
bbcode = "Визуальный редактор"
bbcode_desc = "Нужно установить необходимый плагин"
bbcode_standart = "Стандартный"
syslog = "Сохранение журнала последних действий пользователей"
syslog_desc = "Журнал всех действий пользователей сохраняется в SQL таблице ng_syslog и хранится в течении 1 месяца"
load = "Сбор данных о нагрузке на сайт"
Expand Down
4 changes: 0 additions & 4 deletions engine/skins/default/tpl/configuration.tpl
View file
Expand Up @@ -395,10 +395,6 @@ function ngCheckEmail() {
<td class="contentEntry2" valign="middle"><input type="text" name='save_con[newsNavigationsCount]' value='{{ config['newsNavigationsCount'] }}' size="6" /></td>
</tr>
<tr>
<td class="contentEntry1">{{ lang['bbcode'] }}<br /><small>{{ lang['bbcode_desc'] }}</small></td>
<td class="contentEntry2" valign="middle">{{ mkSelect({'name' : 'save_con[bbcode]', 'value' : config['bbcode'], 'values' : list['bbcode'] }) }}</td>
</tr>
<tr>
<td class="contentEntry1">{{ lang['category_counters'] }}<br /><small>{{ lang['category_counters_desc'] }}</small></td>
<td class="contentEntry2" valign="middle">{{ mkSelectYN({'name' : 'save_con[category_counters]', 'value' : config['category_counters'] }) }}</td>
</tr>
Expand Down
16 changes: 5 additions & 11 deletions engine/skins/default/tpl/news/add.tpl
View file
Expand Up @@ -43,13 +43,7 @@ function changeActive(name) {
}
}
</script>
{% for entry in js_array %}
<script type="text/javascript" src="{{ entry }}"></script>
{% endfor %}
{% for entry in css_array %}
<link rel="stylesheet" href="{{ entry }}" type="text/css" media="screen" />
{% endfor %}
{{ include_bb }}

<form name="DATA_tmp_storage" action="" id="DATA_tmp_storage">
<input type="hidden" name="area" value="" />
</form>
Expand Down Expand Up @@ -89,13 +83,13 @@ function changeActive(name) {
<td><input type="text" class="important" size="79" id="newsTitle" name="title" value="" tabindex="1" /></td>
</tr>
<tr>
<td valign="top" colspan=3>{% if (not tag_bb) %}{{ quicktags }}<br /> {{ smilies }}<br />{% endif %}
<td valign="top" colspan=3>{{ quicktags }}<br /> {{ smilies }}<br />
{% if (flags.edit_split) %}
<div id="container.content.short" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('short');" onfocus="changeActive('short');" name="ng_news_content_short" id="{% if (tag_bb) %}{{ tag_bb }}{% else %}ng_news_content_short{% endif %}" rows="10" tabindex="2"></textarea></div>
<div id="container.content.short" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('short');" onfocus="changeActive('short');" name="ng_news_content_short" id="ng_news_content_short" rows="10" tabindex="2"></textarea></div>
{% if (flags.extended_more) %} <table cellspacing="2" cellpadding="0" width="100%"><tr><td nowrap>{{ lang.addnews['editor.divider'] }}: &nbsp;</td><td style="width: 90%"><input tabindex="2" type="text" name="content_delimiter" style="width: 99%;" value=""/></td></tr></table>{% endif %}
<div id="container.content.full" class="contentInactive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('full');" onfocus="changeActive('full');" name="ng_news_content_full" id="{% if (tag_bb) %}{{ tag_bb }}{% else %}ng_news_content_full{% endif %}" rows="10" tabindex="2"></textarea></div>
<div id="container.content.full" class="contentInactive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('full');" onfocus="changeActive('full');" name="ng_news_content_full" id="ng_news_content_full" rows="10" tabindex="2"></textarea></div>
{% else %}
<div id="container.content" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" name="ng_news_content" id="{% if (tag_bb) %}{{ tag_bb }}{% else %}ng_news_content{% endif %}" rows="10" tabindex="2"></textarea></div>
<div id="container.content" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" name="ng_news_content" id="ng_news_content" rows="10" tabindex="2"></textarea></div>
{% endif %}
</td>
</tr>
Expand Down
16 changes: 5 additions & 11 deletions engine/skins/default/tpl/news/edit.tpl
View file
Expand Up @@ -43,13 +43,7 @@ function changeActive(name) {
}
}
</script>
{% for entry in js_array %}
<script type="text/javascript" src="{{ entry }}"></script>
{% endfor %}
{% for entry in css_array %}
<link rel="stylesheet" href="{{ entry }}" type="text/css" media="screen" />
{% endfor %}
{{ include_bb }}

<!-- Hidden SUGGEST div -->
<div id="suggestWindow" class="suggestWindow">
<table id="suggestBlock" cellspacing="0" cellpadding="0" width="100%"></table>
Expand Down Expand Up @@ -101,13 +95,13 @@ function changeActive(name) {
<td><input type="text" class="important" size="79" id="newsTitle" name="title" value="{{ title }}" tabindex="1" /></td>
</tr>
<tr>
<td valign="top" colspan=3>{% if (not tag_bb) %}{{ quicktags }}<br /> {{ smilies }}<br />{% endif %}
<td valign="top" colspan=3>{{ quicktags }}<br /> {{ smilies }}<br />
{% if (flags.edit_split) %}
<div id="container.content.short" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('short');" onfocus="changeActive('short');" name="ng_news_content_short" id="{% if (tag_bb) %}{{ tag_bb }}{% else %}ng_news_content_short{% endif %}" rows="10" tabindex="2">{{ content.short }}</textarea></div>
<div id="container.content.short" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('short');" onfocus="changeActive('short');" name="ng_news_content_short" id="ng_news_content_short" rows="10" tabindex="2">{{ content.short }}</textarea></div>
{% if (flags.extended_more) %} <table cellspacing="2" cellpadding="0" width="100%"><tr><td nowrap>{{ lang.editnews['editor.divider'] }}: &nbsp;</td><td style="width: 90%"><input tabindex="2" type="text" name="content_delimiter" style="width: 99%;" value="{{ content.delimiter }}"/></td></tr></table>{% endif %}
<div id="container.content.full" class="contentInactive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('full');" onfocus="changeActive('full');" name="ng_news_content_full" id="{% if (tag_bb) %}{{ tag_bb }}{% else %}ng_news_content_full{% endif %}" rows="10" tabindex="2">{{ content.full }}</textarea></div>
<div id="container.content.full" class="contentInactive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('full');" onfocus="changeActive('full');" name="ng_news_content_full" id="ng_news_content_full" rows="10" tabindex="2">{{ content.full }}</textarea></div>
{% else %}
<div id="container.content" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" name="ng_news_content" id="{% if (tag_bb) %}{{ tag_bb }}{% else %}ng_news_content{% endif %}" rows="10" tabindex="2">{{ content.short }}</textarea></div>
<div id="container.content" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" name="ng_news_content" id="ng_news_content" rows="10" tabindex="2">{{ content.short }}</textarea></div>
{% endif %}
</td>
</tr>
Expand Down

0 comments on commit 3554bb2

Please sign in to comment.