"; killme();
+ }
$a->save_timestamp($stamp1, "rendering");
@@ -51,7 +55,7 @@ function random_string($size = 64,$type = RANDOM_STRING_HEX) {
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
@@ -260,75 +264,113 @@ function hex2bin($s) {
}}
-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="") {
+
+ $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'));
- if($a->pager['total'] > $a->pager['itemspage']) {
- $o .= '
'."\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')) {
@@ -339,34 +381,18 @@ 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 .= '
 . '/images/friendica-16.png)
 . '/images/smiley-facepalm.gif)
',
' . '/images/like.gif)
',
' . '/images/dislike.gif)
',
- '~friendica  . '/images/rhash-16.png)
'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1245,11 +1276,42 @@ if(! function_exists('prepare_body')) {
* @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[] = "#".$tag["term"]."";
+ $prefix = "#";
+ } elseif ($tag["type"] == TERM_MENTION) {
+ $mentions[] = "@".$tag["term"]."";
+ $prefix = "@";
+ }
+ $tags[] = $prefix."".$tag["term"]."";
+ }
+ }
+
+ $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']));
@@ -1306,8 +1368,12 @@ function prepare_body($item,$attach = false) {
if(strpos($mime, 'video') !== false) {
if(!$vhead) {
$vhead = true;
- $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array());
- $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array());
+ $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
+ '$baseurl' => $a->get_baseurl(),
+ ));
+ $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
+ '$baseurl' => $a->get_baseurl(),
+ ));
}
$id = end(explode('/', $the_url));
@@ -1495,7 +1561,7 @@ if(! function_exists('feed_hublinks')) {
* @return string hub link xml elements
*/
function feed_hublinks() {
-
+ $a = get_app();
$hub = get_config('system','huburl');
$hubxml = '';
@@ -1506,6 +1572,8 @@ function feed_hublinks() {
$h = trim($h);
if(! strlen($h))
continue;
+ if ($h === '[internal]')
+ $h = $a->get_baseurl() . '/pubsubhubbub';
$hubxml .= '' . "\n" ;
}
}