keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some improvements

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-05-22 13:04:30 +02:00
parent b6648215b8
commit 291af19f25
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 45 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
include/text.php
View file

@ -425,9 +425,9 @@ function expand_acl($s) {
$ret = array(); $ret = array();
if (strlen($s)) { if (strlen($s)) {
$t = str_replace('<','',$s); $t = str_replace('<', '', $s);
$a = explode('>',$t); $a = explode('>', $t);
foreach($a as $aa) { foreach ($a as $aa) {
if (intval($aa)) { if (intval($aa)) {
$ret[] = intval($aa); $ret[] = intval($aa);
} }
@ -469,8 +469,8 @@ function perms2str($p) {
} }
if (is_array($tmp)) { if (is_array($tmp)) {
array_walk($tmp,'sanitise_acl'); array_walk($tmp, 'sanitise_acl');
$ret = implode('',$tmp); $ret = implode('', $tmp);
} }
return $ret; return $ret;
}} }}
@ -1246,7 +1246,7 @@ if (! function_exists('link_compare')) {
* @return boolean True if the URLs match, otherwise False * @return boolean True if the URLs match, otherwise False
* *
*/ */
function link_compare($a,$b) { function link_compare($a, $b) {
return (strcasecmp(normalise_link($a), normalise_link($b)) === 0); return (strcasecmp(normalise_link($a), normalise_link($b)) === 0);
}} }}
@ -1312,14 +1312,14 @@ if (! function_exists('prepare_body')) {
* @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html * @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html
* @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author) * @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author)
*/ */
function prepare_body(&$item,$attach = false, $preview = false) { function prepare_body(&$item, $attach = false, $preview = false) {
$a = get_app(); $a = get_app();
call_hooks('prepare_body_init', $item); call_hooks('prepare_body_init', $item);
$searchpath = z_root()."/search?tag="; $searchpath = z_root() . "/search?tag=";
$tags=array(); $tags = array();
$hashtags = array(); $hashtags = array();
$mentions = array(); $mentions = array();
@ -1550,8 +1550,9 @@ function get_cats_and_terms($item) {
$categories = array(); $categories = array();
$folders = array(); $folders = array();
$matches = false; $first = true; $matches = false;
$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); $first = true;
$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
$categories[] = array( $categories[] = array(
@ -1570,8 +1571,9 @@ function get_cats_and_terms($item) {
} }
if (local_user() == $item['uid']) { if (local_user() == $item['uid']) {
$matches = false; $first = true; $matches = false;
$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); $first = true;
$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
$folders[] = array( $folders[] = array(
@ -1626,9 +1628,7 @@ function get_plink($item) {
$ret = array(); $ret = array();
} }
//if (x($item,'plink') && ($item['private'] != 1)) return $ret;
return($ret);
}} }}
if (! function_exists('unamp')) { if (! function_exists('unamp')) {
@ -1913,15 +1913,16 @@ function file_tag_encode($s) {
} }
function file_tag_decode($s) { function file_tag_decode($s) {
return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s); return str_replace(array('%3c', '%3e', '%5b', '%5d'), array('<', '>', '[', ']'), $s);
} }
function file_tag_file_query($table,$s,$type = 'file') { function file_tag_file_query($table,$s,$type = 'file') {
if ($type == 'file') if ($type == 'file') {
$str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' ); $str = preg_quote( '[' . str_replace('%', '%%', file_tag_encode($s)) . ']' );
else } else {
$str = preg_quote( '<' . str_replace('%','%%',file_tag_encode($s)) . '>' ); $str = preg_quote( '<' . str_replace('%', '%%', file_tag_encode($s)) . '>' );
}
return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' ";
} }
@ -1953,10 +1954,9 @@ function file_tag_file_to_list($file,$type = 'file') {
$matches = false; $matches = false;
$list = ''; $list = '';
if ($type == 'file') { if ($type == 'file') {
$cnt = preg_match_all('/\[(.*?)\]/',$file,$matches,PREG_SET_ORDER); $cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER);
} } else {
else { $cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER);
$cnt = preg_match_all('/<(.*?)>/',$file,$matches,PREG_SET_ORDER);
} }
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
@ -1969,7 +1969,7 @@ function file_tag_file_to_list($file,$type = 'file') {
return $list; return $list;
} }
function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
// $file_old - categories previously associated with an item // $file_old - categories previously associated with an item
// $file_new - new list of categories for an item // $file_new - new list of categories for an item
@ -2021,10 +2021,6 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
intval($termtype), intval($termtype),
intval($uid)); intval($uid));
//$r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
// intval($uid)
//);
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
unset($deleted_tags[$key]); unset($deleted_tags[$key]);
} }
@ -2034,19 +2030,19 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
} }
if ($saved != $filetags_updated) { if ($saved != $filetags_updated) {
set_pconfig($uid,'system','filetags', $filetags_updated); set_pconfig($uid, 'system', 'filetags', $filetags_updated);
} }
return true; return true;
} }
else else
if (strlen($file_new)) { if (strlen($file_new)) {
set_pconfig($uid,'system','filetags', $file_new); set_pconfig($uid, 'system', 'filetags', $file_new);
} }
return true; return true;
} }
function file_tag_save_file($uid,$item,$file) { function file_tag_save_file($uid, $item, $file) {
require_once("include/files.php"); require_once "include/files.php";
$result = false; $result = false;
if (! intval($uid)) if (! intval($uid))
@ -2056,25 +2052,27 @@ function file_tag_save_file($uid,$item,$file) {
intval($uid) intval($uid)
); );
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) {
q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'), dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
intval($item), intval($item),
intval($uid) intval($uid)
); );
}
create_files_from_item($item); create_files_from_item($item);
$saved = get_pconfig($uid,'system','filetags'); $saved = get_pconfig($uid,'system','filetags');
if ((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']'))) if ((! strlen($saved)) || (! stristr($saved, '[' . file_tag_encode($file) . ']'))) {
set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']'); set_pconfig($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
}
info( t('Item filed') ); info( t('Item filed') );
} }
return true; return true;
} }
function file_tag_unsave_file($uid,$item,$file,$cat = false) { function file_tag_unsave_file($uid, $item, $file, $cat = false) {
require_once("include/files.php"); require_once "include/files.php";
$result = false; $result = false;
if (! intval($uid)) if (! intval($uid))
@ -2111,25 +2109,22 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
intval($termtype), intval($termtype),
intval($uid)); intval($uid));
//$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
//);
if (! dbm::is_result($r)) { if (! dbm::is_result($r)) {
$saved = get_pconfig($uid,'system','filetags'); $saved = get_pconfig($uid,'system','filetags');
set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved)); set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
} }
return true; return true;
} }
function normalise_openid($s) { function normalise_openid($s) {
return trim(str_replace(array('http://','https://'),array('',''),$s),'/'); return trim(str_replace(array('http://', 'https://'), array('', ''), $s), '/');
} }
function undo_post_tagging($s) { function undo_post_tagging($s) {
$matches = null; $matches = null;
$cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER); $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $s, $matches, PREG_SET_ORDER);
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s); $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
@ -2170,7 +2165,7 @@ function deindent($text, $chr = "[\t ]", $count = NULL) {
preg_match("|^" . $chr . "*|", $lines[$k], $m); preg_match("|^" . $chr . "*|", $lines[$k], $m);
$count = strlen($m[0]); $count = strlen($m[0]);
} }
for ($k=0; $k < count($lines); $k++) { for ($k = 0; $k < count($lines); $k++) {
$lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]); $lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]);
} }
@ -2200,11 +2195,12 @@ function formatBytes($bytes, $precision = 2) {
*/ */
function format_network_name($network, $url = 0) { function format_network_name($network, $url = 0) {
if ($network != "") { if ($network != "") {
require_once('include/contact_selectors.php'); require_once 'include/contact_selectors.php';
if ($url != "") if ($url != "") {
$network_name = '<a href="'.$url.'">'.network_to_name($network, $url)."</a>"; $network_name = '<a href="'.$url.'">'.network_to_name($network, $url)."</a>";
else } else {
$network_name = network_to_name($network); $network_name = network_to_name($network);
}
return $network_name; return $network_name;
} }