harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cleanups.

Browse Source 
Fixed dbesc_identifier(), but it is not used yet.
Corrected some other variable names and variable initialization before
using them.
This commit is contained in:
Klaus Weidenbach
2015-03-13 00:16:19 +01:00
parent c6162c4c88
commit 124b17dcf4
3 changed files with 99 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/text.php
View File

@@ -110,8 +110,6 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
function purify_html($s) {
require_once('library/HTMLPurifier.auto.php');
require_once('include/html2bbcode.php');
@@ -360,8 +358,6 @@ function paginate(&$a) {
function alt_pager(&$a, $i, $more = '', $less = '') {
$o = '';
if(! $more)
$more = t('older');
if(! $less)
@@ -370,10 +366,10 @@ function alt_pager(&$a, $i, $more = '', $less = '') {
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];
//$pagenum = $a->pager['page'];
$url = $a->get_baseurl() . '/' . $stripped;
return replace_macros(get_markup_template('alt_pager.tpl'),array(
return replace_macros(get_markup_template('alt_pager.tpl'), array(
'$has_less' => (($a->pager['page'] > 1) ? true : false),
'$has_more' => (($i > 0 && $i >= $a->pager['itemspage']) ? true : false),
'$less' => $less,
@@ -600,6 +596,7 @@ function activity_match($haystack,$needle) {
function get_tags($s) {
$ret = array();
$match = array();
// ignore anything in a code block
@@ -1061,7 +1058,6 @@ function list_smilies() {
*
*/
function smilies($s, $sample = false) {
$a = get_app();
if(intval(get_config('system','no_smilies'))
|| (local_channel() && intval(get_pconfig(local_channel(),'system','no_smilies'))))
@@ -2111,6 +2107,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
$replaced = false;
$r = null;
$match = array();
$termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN);
$termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype);
@@ -2354,7 +2351,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
function linkify_tags($a, &$body, $uid) {
$str_tags = '';
$tagged = array();
$result = array();
$results = array();
$tags = get_tags($body);
@@ -2375,18 +2372,23 @@ function linkify_tags($a, &$body, $uid) {
if($fullnametagged)
continue;
// @FIXME which $profile_uid? It's not set anywhere.
$success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : $profile_uid , $tag);
$results[] = array('success' => $success, 'access_tag' => $access_tag);
if($success['replaced']) $tagged[] = $tag;
}
}
return $results;
}
/**
* @brief returns icon name for use with e.g. font-awesome based on mime-type
* @brief returns icon name for use with e.g. font-awesome based on mime-type.
*
* @param string $type
* These are the the font-awesome names of version 3.2.1. The newer font-awesome
* 4 has different names.
*
* @param string $type mime type
* @return string
*/
function getIconFromType($type) {
@@ -2439,10 +2441,10 @@ function getIconFromType($type) {
* @brief Returns a human readable formatted string for filesizes.
*
* @param int $size filesize in bytes
* @return string
* @return string human readable formatted filesize
*/
function userReadableSize($size) {
$ret = "";
$ret = '';
if (is_numeric($size)) {
$incr = 0;
$k = 1024;
@@ -2451,7 +2453,8 @@ function userReadableSize($size) {
$incr++;
$size = round($size / $k, 2);
}
$ret = $size . " " . $unit[$incr];
$ret = $size . ' ' . $unit[$incr];
}
return $ret;
}