') !== false && x($item, 'coord')) {
- $x = generate_map(trim($item['coord']));
+ $x = Map::byCoordinates(trim($item['coord']));
if ($x) {
- $s = preg_replace('/\
/','$0' . $x,$s);
+ $s = preg_replace('/\
/', '$0' . $x, $s);
}
}
- // Look for spoiler
+ // Look for spoiler.
$spoilersearch = '
';
- // Remove line breaks before the spoiler
+ // Remove line breaks before the spoiler.
while ((strpos($s, "\n" . $spoilersearch) !== false)) {
$s = str_replace("\n" . $spoilersearch, $spoilersearch, $s);
}
@@ -1458,7 +1415,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
$s = substr($s, 0, $pos) . $spoilerreplace . substr($s, $pos + strlen($spoilersearch));
}
- // Look for quote with author
+ // Look for quote with author.
$authorsearch = '';
while ((strpos($s, $authorsearch) !== false)) {
@@ -1469,25 +1426,23 @@ function prepare_body(&$item, $attach = false, $preview = false) {
$s = substr($s, 0, $pos) . $authorreplace . substr($s, $pos + strlen($authorsearch));
}
- // replace friendica image url size with theme preference
+ // Replace friendica image url size with theme preference.
if (x($a->theme_info, 'item_image_size')){
$ps = $a->theme_info['item_image_size'];
$s = preg_replace('|(]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
}
- $prep_arr = array('item' => $item, 'html' => $s);
- call_hooks('prepare_body_final', $prep_arr);
+ $prep_arr = ['item' => $item, 'html' => $s];
+ Addon::callHooks('prepare_body_final', $prep_arr);
return $prep_arr['html'];
-}}
-
+}
-if (! function_exists('prepare_text')) {
/**
- * Given a text string, convert from bbcode to html and add smilie icons.
+ * @brief Given a text string, convert from bbcode to html and add smilie icons.
*
- * @param string $text
- * @return string
+ * @param string $text String with bbcode.
+ * @return string Formattet HTML.
*/
function prepare_text($text) {
@@ -1500,9 +1455,7 @@ function prepare_text($text) {
}
return trim($s);
-}}
-
-
+}
/**
* return array with details for categories and folders for an item
@@ -1531,24 +1484,23 @@ function prepare_text($text) {
* ]
* ]
*/
-function get_cats_and_terms($item) {
-
- $a = get_app();
- $categories = array();
- $folders = array();
+function get_cats_and_terms($item)
+{
+ $categories = [];
+ $folders = [];
$matches = false;
$first = true;
$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
if ($cnt) {
foreach ($matches as $mtch) {
- $categories[] = array(
+ $categories[] = [
'name' => xmlify(file_tag_decode($mtch[1])),
'url' => "#",
'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
'first' => $first,
'last' => false
- );
+ ];
$first = false;
}
}
@@ -1563,13 +1515,13 @@ function get_cats_and_terms($item) {
$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
if ($cnt) {
foreach ($matches as $mtch) {
- $folders[] = array(
+ $folders[] = [
'name' => xmlify(file_tag_decode($mtch[1])),
'url' => "#",
'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])) : ""),
'first' => $first,
'last' => false
- );
+ ];
$first = false;
}
}
@@ -1579,10 +1531,10 @@ function get_cats_and_terms($item) {
$folders[count($folders) - 1]['last'] = true;
}
- return array($categories, $folders);
+ return [$categories, $folders];
}
-if (! function_exists('get_plink')) {
+
/**
* get private link for item
* @param array $item
@@ -1592,13 +1544,13 @@ function get_plink($item) {
$a = get_app();
if ($a->user['nickname'] != "") {
- $ret = array(
+ $ret = [
//'href' => "display/" . $a->user['nickname'] . "/" . $item['id'],
'href' => "display/" . $item['guid'],
'orig' => "display/" . $item['guid'],
'title' => t('View on separate page'),
'orig_title' => t('view on separate page'),
- );
+ ];
if (x($item, 'plink')) {
$ret["href"] = $a->remove_baseurl($item['plink']);
@@ -1606,19 +1558,19 @@ function get_plink($item) {
}
} elseif (x($item, 'plink') && ($item['private'] != 1)) {
- $ret = array(
+ $ret = [
'href' => $item['plink'],
'orig' => $item['plink'],
'title' => t('link to source'),
- );
+ ];
} else {
- $ret = array();
+ $ret = [];
}
return $ret;
-}}
+}
+
-if (! function_exists('unamp')) {
/**
* replace html amp entity with amp char
* @param string $s
@@ -1626,23 +1578,23 @@ if (! function_exists('unamp')) {
*/
function unamp($s) {
return str_replace('&', '&', $s);
-}}
+}
-if (! function_exists('return_bytes')) {
/**
* return number of bytes in size (K, M, G)
* @param string $size_str
* @return number
*/
-function return_bytes ($size_str) {
+function return_bytes($size_str) {
switch (substr ($size_str, -1)) {
case 'M': case 'm': return (int)$size_str * 1048576;
case 'K': case 'k': return (int)$size_str * 1024;
case 'G': case 'g': return (int)$size_str * 1073741824;
default: return $size_str;
}
-}}
+}
+
/**
* @return string
@@ -1654,7 +1606,7 @@ function generate_user_guid() {
$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
dbesc($guid)
);
- if (! dbm::is_result($x)) {
+ if (! DBM::is_result($x)) {
$found = false;
}
} while ($found == true);
@@ -1710,73 +1662,6 @@ function base64url_decode($s) {
}
-if (!function_exists('str_getcsv')) {
- /**
- * Parse csv string
- *
- * @param string $input
- * @param string $delimiter
- * @param string $enclosure
- * @param string $escape
- * @param string $eol
- * @return boolean|array False on error, otherwise array[row][column]
- */
-function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') {
- if (is_string($input) && !empty($input)) {
- $output = array();
- $tmp = preg_split("/".$eol."/",$input);
- if (is_array($tmp) && !empty($tmp)) {
- while (list($line_num, $line) = each($tmp)) {
- if (preg_match("/".$escape.$enclosure."/",$line)) {
- while ($strlen = strlen($line)) {
- $pos_delimiter = strpos($line,$delimiter);
- $pos_enclosure_start = strpos($line,$enclosure);
- if (
- is_int($pos_delimiter) && is_int($pos_enclosure_start)
- && ($pos_enclosure_start < $pos_delimiter)
- ) {
- $enclosed_str = substr($line,1);
- $pos_enclosure_end = strpos($enclosed_str,$enclosure);
- $enclosed_str = substr($enclosed_str,0,$pos_enclosure_end);
- $output[$line_num][] = $enclosed_str;
- $offset = $pos_enclosure_end+3;
- } else {
- if (empty($pos_delimiter) && empty($pos_enclosure_start)) {
- $output[$line_num][] = substr($line,0);
- $offset = strlen($line);
- } else {
- $output[$line_num][] = substr($line,0,$pos_delimiter);
- $offset = (
- !empty($pos_enclosure_start)
- && ($pos_enclosure_start < $pos_delimiter)
- )
- ?$pos_enclosure_start
- :$pos_delimiter+1;
- }
- }
- $line = substr($line,$offset);
- }
- } else {
- $line = preg_split("/".$delimiter."/",$line);
-
- /*
- * Validating against pesky extra line breaks creating false rows.
- */
- if (is_array($line) && !empty($line[0])) {
- $output[$line_num] = $line;
- }
- }
- }
- return $output;
- } else {
- return false;
- }
- } else {
- return false;
- }
-}
-}
-
/**
* return div element with class 'clear'
* @return string
@@ -1832,7 +1717,7 @@ function array_xmlify($val){
/**
- * transorm link href and img src from relative to absolute
+ * transform link href and img src from relative to absolute
*
* @param string $text
* @param string $base base url
@@ -1896,19 +1781,19 @@ function item_post_type($item) {
// To do this we need to escape these characters if they appear in our tag.
function file_tag_encode($s) {
- return str_replace(array('<','>','[',']'),array('%3c','%3e','%5b','%5d'),$s);
+ return str_replace(['<','>','[',']'],['%3c','%3e','%5b','%5d'],$s);
}
function file_tag_decode($s) {
- return str_replace(array('%3c', '%3e', '%5b', '%5d'), array('<', '>', '[', ']'), $s);
+ return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s);
}
function file_tag_file_query($table,$s,$type = 'file') {
if ($type == 'file') {
- $str = preg_quote( '[' . str_replace('%', '%%', file_tag_encode($s)) . ']' );
+ $str = preg_quote('[' . str_replace('%', '%%', file_tag_encode($s)) . ']');
} 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) . "' ";
}
@@ -1960,20 +1845,20 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
// $file_old - categories previously associated with an item
// $file_new - new list of categories for an item
- if (! intval($uid))
+ if (!intval($uid)) {
return false;
-
- if ($file_old == $file_new)
+ }
+ if ($file_old == $file_new) {
return true;
+ }
- $saved = get_pconfig($uid,'system','filetags');
+ $saved = PConfig::get($uid, 'system', 'filetags');
if (strlen($saved)) {
if ($type == 'file') {
$lbracket = '[';
$rbracket = ']';
$termtype = TERM_FILE;
- }
- else {
+ } else {
$lbracket = '<';
$rbracket = '>';
$termtype = TERM_CATEGORY;
@@ -1982,7 +1867,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
$filetags_updated = $saved;
// check for new tags to be added as filetags in pconfig
- $new_tags = array();
+ $new_tags = [];
$check_new_tags = explode(",",file_tag_file_to_list($file_new,$type));
foreach ($check_new_tags as $tag) {
@@ -1993,7 +1878,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
$filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type);
// check for deleted tags to be removed from filetags in pconfig
- $deleted_tags = array();
+ $deleted_tags = [];
$check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type));
foreach ($check_deleted_tags as $tag) {
@@ -2008,37 +1893,34 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
intval($termtype),
intval($uid));
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
unset($deleted_tags[$key]);
- }
- else {
+ } else {
$filetags_updated = str_replace($lbracket . file_tag_encode($tag) . $rbracket,'',$filetags_updated);
}
}
if ($saved != $filetags_updated) {
- set_pconfig($uid, 'system', 'filetags', $filetags_updated);
+ PConfig::set($uid, 'system', 'filetags', $filetags_updated);
}
return true;
+ } elseif (strlen($file_new)) {
+ PConfig::set($uid, 'system', 'filetags', $file_new);
}
- else
- if (strlen($file_new)) {
- set_pconfig($uid, 'system', 'filetags', $file_new);
- }
- return true;
+ return true;
}
-function file_tag_save_file($uid, $item, $file) {
- require_once "include/files.php";
-
- $result = false;
- if (! intval($uid))
+function file_tag_save_file($uid, $item, $file)
+{
+ if (! intval($uid)) {
return false;
+ }
+
$r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item),
intval($uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) {
q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
@@ -2047,23 +1929,22 @@ function file_tag_save_file($uid, $item, $file) {
);
}
- create_files_from_item($item);
+ Term::createFromItem($item);
- $saved = get_pconfig($uid,'system','filetags');
- if ((! strlen($saved)) || (! stristr($saved, '[' . file_tag_encode($file) . ']'))) {
- set_pconfig($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
+ $saved = PConfig::get($uid, 'system', 'filetags');
+ if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
+ PConfig::set($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
}
- info( t('Item filed') );
+ info(t('Item filed'));
}
return true;
}
-function file_tag_unsave_file($uid, $item, $file, $cat = false) {
- require_once "include/files.php";
-
- $result = false;
- if (! intval($uid))
+function file_tag_unsave_file($uid, $item, $file, $cat = false)
+{
+ if (! intval($uid)) {
return false;
+ }
if ($cat == true) {
$pattern = '<' . file_tag_encode($file) . '>' ;
@@ -2073,12 +1954,11 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
$termtype = TERM_FILE;
}
-
$r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item),
intval($uid)
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
return false;
}
@@ -2088,24 +1968,24 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
intval($uid)
);
- create_files_from_item($item);
+ Term::createFromItem($item);
$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
dbesc($file),
intval(TERM_OBJ_POST),
intval($termtype),
- intval($uid));
-
- if (! dbm::is_result($r)) {
- $saved = get_pconfig($uid,'system','filetags');
- set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
+ intval($uid)
+ );
+ if (!DBM::is_result($r)) {
+ $saved = PConfig::get($uid, 'system', 'filetags');
+ PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
}
return true;
}
function normalise_openid($s) {
- return trim(str_replace(array('http://', 'https://'), array('', ''), $s), '/');
+ return trim(str_replace(['http://', 'https://'], ['', ''], $s), '/');
}
@@ -2144,7 +2024,7 @@ function is_a_date_arg($s) {
function deindent($text, $chr = "[\t ]", $count = NULL) {
$lines = explode("\n", $text);
if (is_null($count)) {
- $m = array();
+ $m = [];
$k = 0;
while ($k < count($lines) && strlen($lines[$k]) == 0) {
$k++;
@@ -2160,7 +2040,7 @@ function deindent($text, $chr = "[\t ]", $count = NULL) {
}
function formatBytes($bytes, $precision = 2) {
- $units = array('B', 'KB', 'MB', 'GB', 'TB');
+ $units = ['B', 'KB', 'MB', 'GB', 'TB'];
$bytes = max($bytes, 0);
$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
@@ -2182,16 +2062,14 @@ function formatBytes($bytes, $precision = 2) {
*/
function format_network_name($network, $url = 0) {
if ($network != "") {
- require_once 'include/contact_selectors.php';
if ($url != "") {
- $network_name = ''.network_to_name($network, $url)."";
+ $network_name = ''.ContactSelector::networkToName($network, $url)."";
} else {
- $network_name = network_to_name($network);
+ $network_name = ContactSelector::networkToName($network);
}
return $network_name;
}
-
}
/**
@@ -2210,10 +2088,10 @@ function text_highlight($s, $lang) {
// Autoload the library to make constants available
class_exists('Text_Highlighter_Renderer_Html');
- $options = array(
+ $options = [
'numbers' => HL_NUMBERS_LI,
'tabsize' => 4,
- );
+ ];
$tag_added = false;
$s = trim(html_entity_decode($s, ENT_COMPAT));
@@ -2230,7 +2108,8 @@ function text_highlight($s, $lang) {
}
$renderer = new Text_Highlighter_Renderer_Html($options);
- $hl = Text_Highlighter::factory($lang);
+ $factory = new Text_Highlighter();
+ $hl = $factory->factory($lang);
$hl->setRenderer($renderer);
$o = $hl->highlight($s);
$o = str_replace("\n", '', $o);