mirror of
https://github.com/e107inc/e107.git
synced 2025-08-13 18:14:26 +02:00
- Custom Pages: new fields for SEF string and meta data, admin validation and data control, front-end SEO (meta data), additional 'safe' URL config (for migrated installs); some new useful helper methods;
- More typography and layout control: new class based paragraph, heading, nobr, br and block bbcodes (awaiting new icons) - Overall improvements and stability fixes
This commit is contained in:
secretr
1
e107_core/bbcodes/_br.bb
Normal file
1
e107_core/bbcodes/_br.bb
Normal file
@@ -0,0 +1 @@
|
||||
return '<br />';
|
||||
62
e107_core/bbcodes/bb_block.php
Normal file
62
e107_core/bbcodes/bb_block.php
Normal file
@@ -0,0 +1,62 @@
|
||||
<?php
|
||||
/**
|
||||
* Copyright (C) e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id$
|
||||
*
|
||||
* DIV block bbcode
|
||||
*/
|
||||
|
||||
if (!defined('e107_INIT')) { exit; }
|
||||
|
||||
/**
|
||||
* Div HTML blocks handling
|
||||
*
|
||||
* [block=class=xxx&style=xxx&id=xxx]$content[/block]
|
||||
* [block=xxx]$content[/block] equals to [block=class=xxx]$content[/block]
|
||||
* If $content is missing, HTML comment will be used - '<!-- -->'
|
||||
*/
|
||||
class bb_block extends e_bb_base
|
||||
{
|
||||
/**
|
||||
* Called prior to save
|
||||
*
|
||||
*/
|
||||
function toDB($code_text, $parm)
|
||||
{
|
||||
// just for now
|
||||
if(!ADMIN) return $code_text; // TODO - pref
|
||||
|
||||
// transform to class, equal sign at 0 position is not well formed parm string
|
||||
if($parm && !strpos($parm, '=')) $parm = 'class='.$parm;
|
||||
$parms = eHelper::scParams($parm);
|
||||
$safe = array();
|
||||
|
||||
if(varsettrue($parms['class'])) $safe['class'] = eHelper::secureClassAttr($parms['class']);
|
||||
if(varsettrue($parms['id'])) $safe['id'] = eHelper::secureIdAttr($parms['id']);
|
||||
if(varsettrue($parms['style'])) $safe['style'] = eHelper::secureStyleAttr($parms['style']);
|
||||
if($safe)
|
||||
{
|
||||
return '[block='.eHelper::buildAttr($safe).']'.$code_text.'[/block]';
|
||||
}
|
||||
return '[block]'.$code_text.'[/block]';
|
||||
}
|
||||
|
||||
/**
|
||||
* Translate youtube bbcode into the appropriate HTML
|
||||
*/
|
||||
function toHTML($code_text, $parm)
|
||||
{
|
||||
// transform to class, equal sign at 0 position is not well formed parm string
|
||||
if($parm && !strpos($parm, '=')) $parm = 'class='.$parm;
|
||||
$parms = eHelper::scParams($parm);
|
||||
|
||||
$class = varsettrue($parms['class']) ? ' class="'.eHelper::secureClassAttr($parms['class']).'"' : '';
|
||||
if(!$class) $class = ' class="bbcode"';
|
||||
|
||||
$id = varsettrue($parms['id']) ? ' id='.eHelper::secureIdAttr($parms['id']) : '';
|
||||
$style = varsettrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
|
||||
|
||||
if(empty($code_text)) $code_text = '<!-- -->';
|
||||
return '<div'.$id.$class.$style.'>'.$code_text.'</div>';
|
||||
}
|
||||
}
|
||||
76
e107_core/bbcodes/bb_h.php
Normal file
76
e107_core/bbcodes/bb_h.php
Normal file
@@ -0,0 +1,76 @@
|
||||
<?php
|
||||
/**
|
||||
* Copyright (C) e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id$
|
||||
*
|
||||
* Heading bb code
|
||||
*/
|
||||
|
||||
if (!defined('e107_INIT')) { exit; }
|
||||
|
||||
/**
|
||||
* Basic usage [h=2]text[/h]
|
||||
* The same [h]text[/h] as heading number defaults to '2'
|
||||
* Advanced usage [h=2|class=className&id=element-id&style=some: style; and: moresStyle]text[/h]
|
||||
* 'class' defaults to 'bbcode' (if left empty)
|
||||
*/
|
||||
class bb_h extends e_bb_base
|
||||
{
|
||||
/**
|
||||
* Called prior to save
|
||||
* Sanitize and re-assemble the bbcode
|
||||
*/
|
||||
function toDB($code_text, $parm)
|
||||
{
|
||||
$code_text = trim($code_text);
|
||||
if(empty($code_text)) return '';
|
||||
|
||||
$bparms = eHelper::scDualParams($parm);
|
||||
|
||||
$h = $bparms[1] ? intval($bparms[1]) : 2;
|
||||
$parms = $bparms[2];
|
||||
unset($bparms);
|
||||
|
||||
if(vartrue($parms['class']))
|
||||
{
|
||||
$safe['class'] = eHelper::secureClassAttr($parms['class']);
|
||||
}
|
||||
if(vartrue($parms['id']))
|
||||
{
|
||||
$safe['id'] = eHelper::secureIdAttr($parms['id']);
|
||||
}
|
||||
if(vartrue($parms['style']))
|
||||
{
|
||||
$safe['style'] = eHelper::secureStyleAttr($parms['style']);
|
||||
}
|
||||
if($safe)
|
||||
{
|
||||
return '[h='.$h.'|'.eHelper::buildAttr($safe).']'.$code_text.'[/h]';
|
||||
}
|
||||
return '[h='.$h.']'.$code_text.'[/h]';
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Translate to <h*> tag
|
||||
*/
|
||||
function toHTML($code_text, $parm)
|
||||
{
|
||||
$code_text = trim($code_text);
|
||||
if(empty($code_text)) return '';
|
||||
$bparms = eHelper::scDualParams($parm);
|
||||
|
||||
$h = 'h'.($bparms[1] ? intval($bparms[1]) : 2);
|
||||
$parms = $bparms[2];
|
||||
unset($bparms);
|
||||
|
||||
$class = varsettrue($parms['class']) ? ' class="'.eHelper::secureClassAttr($parms['class']).'"' : '';
|
||||
if(!$class) $class = ' class="bbcode"';
|
||||
|
||||
$id = varsettrue($parms['id']) ? ' id='.eHelper::secureIdAttr($parms['id']) : '';
|
||||
$style = varsettrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
|
||||
|
||||
return "<{$h}{$id}{$class}{$style}>".$code_text."</{$h}>";
|
||||
}
|
||||
}
|
||||
35
e107_core/bbcodes/bb_nobr.php
Normal file
35
e107_core/bbcodes/bb_nobr.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
/**
|
||||
* Copyright (C) e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id$
|
||||
*
|
||||
* Strip HTML new lines bbcode
|
||||
*/
|
||||
|
||||
if (!defined('e107_INIT')) { exit; }
|
||||
|
||||
/**
|
||||
* Does nothing when saving in DB
|
||||
* Removes new lines produced by nl2br when translating to HTML
|
||||
*/
|
||||
class bb_nobr extends e_bb_base
|
||||
{
|
||||
private $_nobrRegEx = '#[^\w\s\-]#';
|
||||
|
||||
/**
|
||||
* Called prior to save
|
||||
* Re-assemble the bbcode
|
||||
*/
|
||||
function toDB($code_text, $parm)
|
||||
{
|
||||
return '[nobr]'.$code_text.'[/nobr]';
|
||||
}
|
||||
|
||||
/**
|
||||
* Strip new lines
|
||||
*/
|
||||
function toHTML($code_text, $parm)
|
||||
{
|
||||
return str_replace(E_NL, "\n", trim($code_text));
|
||||
}
|
||||
}
|
||||
71
e107_core/bbcodes/bb_p.php
Normal file
71
e107_core/bbcodes/bb_p.php
Normal file
@@ -0,0 +1,71 @@
|
||||
<?php
|
||||
/**
|
||||
* Copyright (C) e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id$
|
||||
*
|
||||
* Paragraph bbcode
|
||||
*/
|
||||
|
||||
if (!defined('e107_INIT')) { exit; }
|
||||
|
||||
/**
|
||||
* Basic usage [p=CSS-className]text[/p]
|
||||
* Advanced usage [p=class=className&id=element-id&style=some: style; and: moresStyle]text[/p]
|
||||
* 'class' defaults to 'bbcode' (if left empty)
|
||||
*/
|
||||
class bb_p extends e_bb_base
|
||||
{
|
||||
/**
|
||||
* Called prior to save
|
||||
* Sanitize and re-assemble the bbcode
|
||||
*/
|
||||
function toDB($code_text, $parm)
|
||||
{
|
||||
$code_text = trim($code_text);
|
||||
if(empty($code_text)) return '';
|
||||
|
||||
if($parm && !strpos($parm, '=')) $parm = 'class='.$parm;
|
||||
|
||||
$parms = eHelper::scParams($parm);
|
||||
$safe = array();
|
||||
|
||||
if(vartrue($parms['class']))
|
||||
{
|
||||
$safe['class'] = eHelper::secureClassAttr($parms['class']);
|
||||
}
|
||||
if(vartrue($parms['id']))
|
||||
{
|
||||
$safe['id'] = eHelper::secureIdAttr($parms['id']);
|
||||
}
|
||||
if(vartrue($parms['style']))
|
||||
{
|
||||
$safe['style'] = eHelper::secureStyleAttr($parms['style']);
|
||||
}
|
||||
if($safe)
|
||||
{
|
||||
return '[p='.eHelper::buildAttr($safe).']'.$code_text.'[/p]';
|
||||
}
|
||||
return '[p]'.$code_text.'[/p]';
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Translate to <p> tag
|
||||
*/
|
||||
function toHTML($code_text, $parm)
|
||||
{
|
||||
if($parm && !strpos($parm, '=')) $parm = 'class='.$parm;
|
||||
$code_text = trim($code_text);
|
||||
|
||||
$parms = eHelper::scParams($parm);
|
||||
|
||||
$class = varsettrue($parms['class']) ? ' class="'.eHelper::secureClassAttr($parms['class']).'"' : '';
|
||||
if(!$class) $class = ' class="bbcode"';
|
||||
|
||||
$id = varsettrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
|
||||
$style = varsettrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
|
||||
|
||||
return "<p{$id}{$class}{$style}>".$code_text.'</p>';
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user