<?php
-// This is our template processor.
-// $s is the string requiring macro substitution.
-// $r is an array of key value pairs (search => replace)
-// returns substituted string.
-// WARNING: this is pretty basic, and doesn't properly handle search strings that are substrings of each other.
-// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing,
-// depending on the order in which they were declared in the array.
-
require_once("include/template_processor.php");
require_once("include/friendica_smarty.php");
* @return string substituted string
*/
function replace_macros($s,$r) {
-
+
$stamp1 = microtime(true);
$a = get_app();
if(! function_exists('notags')) {
/**
- * This is our primary input filter.
+ * This is our primary input filter.
*
* The high bit hack only involved some old IE browser, forget which (IE5/Mac?)
* that had an XSS attack vector due to stripping the high-bit on an 8-bit character
break;
}
}*/
-
+ /*
$buffer = mb_ereg_replace("&", "&", $str);
$buffer = mb_ereg_replace("'", "'", $buffer);
- $buffer = mb_ereg_replace("\"", """, $buffer);
+ $buffer = mb_ereg_replace('"', """, $buffer);
$buffer = mb_ereg_replace("<", "<", $buffer);
$buffer = mb_ereg_replace(">", ">", $buffer);
-
+ */
+ $buffer = htmlspecialchars($str, ENT_QUOTES);
$buffer = trim($buffer);
+
return($buffer);
}}
function unxmlify($s) {
// $ret = str_replace('&','&', $s);
// $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret);
- $ret = mb_ereg_replace('&', '&', $s);
+ /*$ret = mb_ereg_replace('&', '&', $s);
$ret = mb_ereg_replace(''', "'", $ret);
$ret = mb_ereg_replace('"', '"', $ret);
$ret = mb_ereg_replace('<', "<", $ret);
$ret = mb_ereg_replace('>', ">", $ret);
+ */
+ $ret = htmlspecialchars_decode($s, ENT_QUOTES);
return $ret;
}}
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];
- $url = $a->get_baseurl() . '/' . $stripped;
+ if (($a->page_offset != "") AND !strstr($stripped, "&offset="))
+ $stripped .= "&offset=".urlencode($a->page_offset);
+ if (!strpos($stripped, "?")) {
+ if ($pos = strpos($stripped, "&"))
+ $stripped = substr($stripped, 0, $pos)."?".substr($stripped, $pos + 1);
+ }
+
+ $url = $a->get_baseurl() . '/' . $stripped;
$data = array();
- function _l(&$d, $name, $url, $text, $class="") {
-
+ function _l(&$d, $name, $url, $text, $class="") {
+
$d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class);
}
_l($data, "first", $url."&page=1", t('first'));
-
+
$numpages = $a->pager['total'] / $a->pager['itemspage'];
$numstart = 1;
$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
_l($data, "last", $url."&page=$lastpage", t('last'));
-
+
if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
_l($data, "next", $url."&page=".($a->pager['page'] + 1), t('next'));
- }
+ }
}
return $data;
* @return string html for pagination #FIXME remove html
*/
function paginate(&$a) {
-
+
$data = paginate_data($a);
$tpl = get_markup_template("paginate.tpl");
return replace_macros($tpl, array("pager" => $data));
$data = paginate_data($a, $i);
$tpl = get_markup_template("paginate.tpl");
return replace_macros($tpl, array('pager' => $data));
-
+
}}
if(! function_exists('expand_acl')) {
/**
* Turn user/group ACLs stored as angle bracketed text into arrays
- *
+ *
* @param string $s
* @return array
*/
/**
* Generate a guaranteed unique photo ID.
* safe from birthday paradox
- *
+ *
* @return string
- */
+ */
function photo_new_resource() {
do {
* @deprecated
* wrapper to load a view template, checking for alternate
* languages before falling back to the default
- *
+ *
* @global string $lang
* @global App $a
* @param string $s view name
}}
if(! function_exists('logger')) {
+/* setup int->string log level map */
+$LOGGER_LEVELS = array();
+
/**
* log levels:
* LOGGER_NORMAL (default)
// turn off logger in install mode
global $a;
global $db;
-
+ global $LOGGER_LEVELS;
+
if(($a->module == 'install') || (! ($db && $db->connected))) return;
+ if (count($LOGGER_LEVEL)==0){
+ foreach (get_defined_constants() as $k=>$v){
+ if (substr($k,0,7)=="LOGGER_") $LOGGER_LEVELS[$v] = substr($k,7,7);
+ }
+ }
+
$debugging = get_config('system','debugging');
$loglevel = intval(get_config('system','loglevel'));
$logfile = get_config('system','logfile');
if((! $debugging) || (! $logfile) || ($level > $loglevel))
return;
+ $callers = debug_backtrace();
+ $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
+ datetime_convert(),
+ session_id(),
+ $LOGGER_LEVELS[$level],
+ basename($callers[0]['file']),
+ $callers[0]['line'],
+ $callers[1]['function'],
+ $msg
+ );
+
$stamp1 = microtime(true);
- @file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND);
+ @file_put_contents($logfile, $logline, FILE_APPEND);
$a->save_timestamp($stamp1, "file");
return;
}}
// Otherwise pull out single word tags. These can be @nickname, @first_last
// and #hash tags.
- if(preg_match_all('/([@#][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) {
+ if(preg_match_all('/([!#@][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) {
foreach($match[1] as $mtch) {
if(strstr($mtch,"]")) {
// we might be inside a bbcode color tag - leave it alone
* @param string $s
*/
function linkify($s) {
- $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="external-link">$1</a>', $s);
+ $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="_blank">$1</a>', $s);
$s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s);
return($s);
}}
'<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
- '<a href="http://
friendica.com">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
+ '<a href="http://
redmatrix.me/">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
* @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)
*/
-function prepare_body(&$item,$attach = false) {
+function prepare_body(&$item,$attach = false, $preview = false) {
$a = get_app();
call_hooks('prepare_body_init', $item);
$tag["url"] = $searchpath.strtolower($tag["term"]);
if ($tag["type"] == TERM_HASHTAG) {
- $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
+ $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
$prefix = "#";
} elseif ($tag["type"] == TERM_MENTION) {
- $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
+ $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
$prefix = "@";
}
- $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
+ $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
}
}
}
- $prep_arr = array('item' => $item, 'html' => $s);
+ $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
call_hooks('prepare_body', $prep_arr);
$s = $prep_arr['html'];
$title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
$title .= ' ' . $mtch[2] . ' ' . t('bytes');
- $as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
+ $as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" >' . $icon . '</a>';
}
}
}
* @return boolean|array False if item has not plink, otherwise array('href'=>plink url, 'title'=>translated title)
*/
function get_plink($item) {
- $a = get_app();
- if (x($item,'plink') && ($item['private'] != 1)) {
- return array(
- 'href' => $item['plink'],
- 'title' => t('link to source'),
- );
- }
- else {
- return false;
- }
+ $a = get_app();
+
+ if ($a->user['nickname'] != "") {
+ $ret = array(
+ 'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'],
+ 'title' => t('link to source'),
+ );
+ $ret["orig"] = $ret["href"];
+
+ if (x($item,'plink'))
+ $ret["href"] = $item['plink'];
+
+ } elseif (x($item,'plink') && ($item['private'] != 1))
+ $ret = array(
+ 'href' => $item['plink'],
+ 'orig' => $item['plink'],
+ 'title' => t('link to source'),
+ );
+ else
+ $ret = array();
+
+ //if (x($item,'plink') && ($item['private'] != 1))
+
+ return($ret);
}}
if(! function_exists('unamp')) {
if($type == 'file') {
$lbracket = '[';
$rbracket = ']';
+ $termtype = TERM_FILE;
}
else {
$lbracket = '<';
$rbracket = '>';
+ $termtype = TERM_CATEGORY;
}
$filetags_updated = $saved;
}
foreach($deleted_tags as $key => $tag) {
- $r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
- intval($uid)
- );
+ $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
+ dbesc($tag),
+ intval(TERM_OBJ_POST),
+ intval($termtype),
+ intval($uid));
+
+ //$r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
+ // intval($uid)
+ //);
if(count($r)) {
unset($deleted_tags[$key]);
}
function file_tag_save_file($uid,$item,$file) {
+ require_once("include/files.php");
+
$result = false;
if(! intval($uid))
return false;
);
if(count($r)) {
if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
+ q("update item set file = '%s' where id = %d and uid = %d",
dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
intval($item),
intval($uid)
);
+
+ create_files_from_item($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) . ']');
}
function file_tag_unsave_file($uid,$item,$file,$cat = false) {
+ require_once("include/files.php");
+
$result = false;
if(! intval($uid))
return false;
- if($cat == true)
+ if($cat == true) {
$pattern = '<' . file_tag_encode($file) . '>' ;
- else
+ $termtype = TERM_CATEGORY;
+ } else {
$pattern = '[' . file_tag_encode($file) . ']' ;
+ $termtype = TERM_FILE;
+ }
$r = q("select file from item where id = %d and uid = %d limit 1",
if(! count($r))
return false;
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
+ q("update item set file = '%s' where id = %d and uid = %d",
dbesc(str_replace($pattern,'',$r[0]['file'])),
intval($item),
intval($uid)
);
- $r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
- intval($uid)
- );
+ create_files_from_item($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));
+
+ //$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
+ //);
if(! count($r)) {
$saved = get_pconfig($uid,'system','filetags');
function undo_post_tagging($s) {
$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) {
foreach($matches as $mtch) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
projects / friendica.git / blobdiff