* @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
$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
*/
'<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);
* @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" ;
}
}