* @return string substituted string
*/
function replace_macros($s,$r) {
-
+
$stamp1 = microtime(true);
$a = get_app();
$t = $a->template_engine();
- $output = $t->replace_macros($s,$r);
+ try {
+ $output = $t->replace_macros($s,$r);
+ } catch (Exception $e) {
+ echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
+ }
$a->save_timestamp($stamp1, "rendering");
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;
}}
}}
-if(! function_exists('paginate')) {
+if(! function_exists('paginate_data')) {
/**
- * Automatic pagination.
+ * Automatica pagination data.
*
- * To use, get the count of total items.
- * Then call $a->set_pager_total($number_items);
- * Optionally call $a->set_pager_itemspage($n) to the number of items to display on each page
- * Then call paginate($a) after the end of the display loop to insert the pager block on the page
- * (assuming there are enough items to paginate).
- * When using with SQL, the setting LIMIT %d, %d => $a->pager['start'],$a->pager['itemspage']
- * will limit the results to the correct items for the current page.
- * The actual page handling is then accomplished at the application layer.
- *
* @param App $a App instance
- * @return string html for pagination #FIXME remove html
+ * @param int $count [optional] item count (used with alt pager)
+ * @return Array data for pagination template
*/
-function paginate(&$a) {
- $o = '';
+function paginate_data(&$a, $count=null) {
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
-// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
-
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];
+
+ 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="") {
- if($a->pager['total'] > $a->pager['itemspage']) {
- $o .= '<div class="pager">';
- if($a->pager['page'] != 1)
- $o .= '<span class="pager_prev">'."<a href=\"$url".'&page='.($a->pager['page'] - 1).'">' . t('prev') . '</a></span> ';
+ $d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class);
+ }
+
+ if (!is_null($count)){
+ // alt pager
+ if($a->pager['page']>1)
+ _l($data, "prev", $url.'&page='.($a->pager['page'] - 1), t('newer'));
+ if($count>0)
+ _l($data, "next", $url.'&page='.($a->pager['page'] + 1), t('older'));
+ } else {
+ // full pager
+ if($a->pager['total'] > $a->pager['itemspage']) {
+ if($a->pager['page'] != 1)
+ _l($data, "prev", $url.'&page='.($a->pager['page'] - 1), t('prev'));
+
+ _l($data, "first", $url."&page=1", t('first'));
- $o .= "<span class=\"pager_first\"><a href=\"$url"."&page=1\">" . t('first') . "</a></span> ";
- $numpages = $a->pager['total'] / $a->pager['itemspage'];
+ $numpages = $a->pager['total'] / $a->pager['itemspage'];
$numstart = 1;
- $numstop = $numpages;
+ $numstop = $numpages;
- if($numpages > 14) {
- $numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
- $numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
- }
-
- for($i = $numstart; $i <= $numstop; $i++){
- if($i == $a->pager['page'])
- $o .= '<span class="pager_current">'.(($i < 10) ? ' '.$i : $i);
- else
- $o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? ' '.$i : $i)."</a>";
- $o .= '</span> ';
- }
+ if($numpages > 14) {
+ $numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
+ $numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
+ }
- if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
- if($i == $a->pager['page'])
- $o .= '<span class="pager_current">'.(($i < 10) ? ' '.$i : $i);
- else
- $o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? ' '.$i : $i)."</a>";
- $o .= '</span> ';
- }
+ $pages = array();
+
+ for($i = $numstart; $i <= $numstop; $i++){
+ if($i == $a->pager['page'])
+ _l($pages, $i, "#", $i, "current");
+ else
+ _l($pages, $i, $url."&page=$i", $i, "n");
+ }
+
+ if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
+ if($i == $a->pager['page'])
+ _l($pages, $i, "#", $i, "current");
+ else
+ _l($pages, $i, $url."&page=$i", $i, "n");
+ }
+
+ $data['pages'] = $pages;
- $lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
- $o .= "<span class=\"pager_last\"><a href=\"$url"."&page=$lastpage\">" . t('last') . "</a></span> ";
+ $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)
- $o .= '<span class="pager_next">'."<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('next') . '</a></span>';
- $o .= '</div>'."\r\n";
+ if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
+ _l($data, "next", $url."&page=".($a->pager['page'] + 1), t('next'));
+
+ }
}
- return $o;
+ return $data;
+
+}}
+
+if(! function_exists('paginate')) {
+/**
+ * Automatic pagination.
+ *
+ * To use, get the count of total items.
+ * Then call $a->set_pager_total($number_items);
+ * Optionally call $a->set_pager_itemspage($n) to the number of items to display on each page
+ * Then call paginate($a) after the end of the display loop to insert the pager block on the page
+ * (assuming there are enough items to paginate).
+ * When using with SQL, the setting LIMIT %d, %d => $a->pager['start'],$a->pager['itemspage']
+ * will limit the results to the correct items for the current page.
+ * The actual page handling is then accomplished at the application layer.
+ *
+ * @param App $a App instance
+ * @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));
+
}}
if(! function_exists('alt_pager')) {
* @return string html for pagination #FIXME remove html
*/
function alt_pager(&$a, $i) {
- $o = '';
- $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
- $stripped = str_replace('q=','',$stripped);
- $stripped = trim($stripped,'/');
- $pagenum = $a->pager['page'];
- $url = $a->get_baseurl() . '/' . $stripped;
- $o .= '<div class="pager">';
+ $data = paginate_data($a, $i);
+ $tpl = get_markup_template("paginate.tpl");
+ return replace_macros($tpl, array('pager' => $data));
- if($a->pager['page']>1)
- $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'" class="pager_newer">' . t('newer') . '</a>';
- if($i>0) {
- if($a->pager['page']>1)
- $o .= " - ";
- $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'" class="pager_older">' . t('older') . '</a>';
- }
-
-
- $o .= '</div>'."\r\n";
-
- return $o;
}}
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
$a = get_app();
$t = $a->template_engine();
-
- $template = $t->get_template_file($s, $root);
+ try {
+ $template = $t->get_template_file($s, $root);
+ } catch (Exception $e) {
+ echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
+ }
$a->save_timestamp($stamp1, "file");
* @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) {
$a = get_app();
call_hooks('prepare_body_init', $item);
+ $searchpath = $a->get_baseurl()."/search?tag=";
+
+ $tags=array();
+ $hashtags = array();
+ $mentions = array();
+
+ if (!get_config('system','suppress_tags')) {
+ $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
+ intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
+
+ foreach($taglist as $tag) {
+
+ if ($tag["url"] == "")
+ $tag["url"] = $searchpath.strtolower($tag["term"]);
+
+ if ($tag["type"] == TERM_HASHTAG) {
+ $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
+ $prefix = "#";
+ } elseif ($tag["type"] == TERM_MENTION) {
+ $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
+ $prefix = "@";
+ }
+ $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
+ }
+ }
+
+ $item['tags'] = $tags;
+ $item['hashtags'] = $hashtags;
+ $item['mentions'] = $mentions;
+
+
//$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
$cachefile = get_cachefile($item["guid"]."-".hash("md5", $item['body']));
$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 string hub link xml elements
*/
function feed_hublinks() {
-
+ $a = get_app();
$hub = get_config('system','huburl');
$hubxml = '';
$h = trim($h);
if(! strlen($h))
continue;
+ if ($h === '[internal]')
+ $h = $a->get_baseurl() . '/pubsubhubbub';
$hubxml .= '<link rel="hub" href="' . xmlify($h) . '" />' . "\n" ;
}
}
* @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');
projects / friendica.git / blobdiff