Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-22 04:55:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/z into dev

Browse source
This commit is contained in:
nobody 2020-12-01 17:30:20 -08:00
commit e5313d0d69
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Zotlabs/Widget/Site_projects.php
View file

@ -44,7 +44,7 @@ class Site_projects {
static function site_sort($a,$b) {
if ($a['site_type'] === $b['site_type']) {
return stricmp($a['site_project'],$b['site_project']);
return strcasecmp($b['site_project'],$a['site_project']);
}
return (($a['site_type'] < $b['site_type']) ? -1 : 1);
}

2
boot.php
View file

@ -16,7 +16,7 @@ use Zotlabs\Daemon\Run;
* @brief This file defines some global constants and includes the central App class.
*/
define ( 'STD_VERSION', '20.12.01' );
define ( 'STD_VERSION', '20.12.02' );
define ( 'ZOT_REVISION', '6.0' );
define ( 'DB_UPDATE_VERSION', 1246 );

13
include/bbcode.php
View file

@ -1088,6 +1088,15 @@ function bb_fonttag($matches) {
return '<span style="font-family: ' . bb_xss($matches[1]) . ';">' . $matches[2] . '</span>';
}
function bb_sizetag($matches) {
return '<span style="font-size: ' . bb_xss($matches[1]) . ';">' . $matches[2] . '</span>';
}
function bb_hltag($matches) {
return '<span style="background-color: ' . bb_xss($matches[1]) . ';">' . $matches[2] . '</span>';
}
function bb_xss($s) {
// don't allow functions of any kind
@ -1519,14 +1528,14 @@ function bbcode($Text, $options = []) {
// Check for highlighted text
if (strpos($Text,'[/hl]') !== false) {
$Text = preg_replace("(\[hl\](.*?)\[\/hl\])ism", "<span style=\"background-color: yellow;\">$1</span>", $Text);
$Text = preg_replace("(\[hl=(.*?)\](.*?)\[\/hl\])ism", "<span style=\"background-color: $1;\">$2</span>", $Text);
$Text = preg_replace_callback("(\[hl=(.*?)\](.*?)\[\/hl\])ism", 'bb_hltag', $Text);
}
// Check for sized text
// [size=50] --> font-size: 50px (with the unit).
if (strpos($Text,'[/size]') !== false) {
$Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1px;\">$2</span>", $Text);
$Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1;\">$2</span>", $Text);
$Text = preg_replace_callback("(\[size=(.*?)\](.*?)\[\/size\])ism", 'bb_sizetag', $Text);
}
// Check for h1
if (strpos($Text,'[h1]') !== false) {