static App

1 files changed, 40 insertions, 40 deletions

diff --git a/include/text.php b/include/text.php
index 7af5db22d..a1a1cfb1c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -27,7 +27,7 @@ function replace_macros($s, $r) {
 	$arr = array('template' => $s, 'params' => $r);
 	call_hooks('replace_macros', $arr);
 
-	$t = $a->template_engine();
+	$t = App::template_engine();
 	$output = $t->replace_macros($arr['template'],$arr['params']);
 
 	return $output;
@@ -99,7 +99,7 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
 		return escape_tags($s);
 
 	$a = get_app();
-	if($a->is_sys) {
+	if(App::$is_sys) {
 		return $s;
 	}
 
@@ -368,34 +368,34 @@ function hex2bin($s) {
 
 // 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 App::set_pager_total($number_items);
+// Optionally call App::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']
+// When using with SQL, the setting LIMIT %d, %d => App::$pager['start'],App::$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. 
 
 
 function paginate(&$a) {
 	$o = '';
-	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+	$stripped = preg_replace('/(&page=[0-9]*)/','',App::$query_string);
 
 //	$stripped = preg_replace('/&zid=(.*?)([\?&]|$)/ism','',$stripped);
 
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
-	$pagenum = $a->pager['page'];
+	$pagenum = App::$pager['page'];
 	$url = z_root() . '/' . $stripped;
 
-	if($a->pager['total'] > $a->pager['itemspage']) {
+	if(App::$pager['total'] > App::$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> ';
+		if(App::$pager['page'] != 1)
+			$o .= '<span class="pager_prev">'."<a href=\"$url".'&page='.(App::$pager['page'] - 1).'">' . t('prev') . '</a></span> ';
 
 		$o .=  "<span class=\"pager_first\"><a href=\"$url"."&page=1\">" . t('first') . "</a></span> ";
 
-			$numpages = $a->pager['total'] / $a->pager['itemspage'];
+			$numpages = App::$pager['total'] / App::$pager['itemspage'];
 
 			$numstart = 1;
 			$numstop = $numpages;
@@ -406,15 +406,15 @@ function paginate(&$a) {
 			}
 
 		for($i = $numstart; $i <= $numstop; $i++){
-			if($i == $a->pager['page'])
+			if($i == App::$pager['page'])
 				$o .= '<span class="pager_current">'.(($i < 10) ? '&nbsp;'.$i : $i);
 			else
 				$o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? '&nbsp;'.$i : $i)."</a>";
 			$o .= '</span> ';
 		}
 
-		if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
-			if($i == $a->pager['page'])
+		if((App::$pager['total'] % App::$pager['itemspage']) != 0) {
+			if($i == App::$pager['page'])
 				$o .= '<span class="pager_current">'.(($i < 10) ? '&nbsp;'.$i : $i);
 			else
 				$o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? '&nbsp;'.$i : $i)."</a>";
@@ -424,8 +424,8 @@ function paginate(&$a) {
 		$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
 		$o .= "<span class=\"pager_last\"><a href=\"$url"."&page=$lastpage\">" . t('last') . "</a></span> ";
 
-		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>';
+		if((App::$pager['total'] - (App::$pager['itemspage'] * App::$pager['page'])) > 0)
+			$o .= '<span class="pager_next">'."<a href=\"$url"."&page=".(App::$pager['page'] + 1).'">' . t('next') . '</a></span>';
 		$o .= '</div>'."\r\n";
 	}
 	return $o;
@@ -439,20 +439,20 @@ function alt_pager(&$a, $i, $more = '', $less = '') {
 	if(! $less)
 		$less = t('newer');
 
-	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+	$stripped = preg_replace('/(&page=[0-9]*)/','',App::$query_string);
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
-	//$pagenum = $a->pager['page'];
+	//$pagenum = App::$pager['page'];
 	$url = z_root() . '/' . $stripped;
 
 	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),
+		'$has_less' => ((App::$pager['page'] > 1) ? true : false),
+		'$has_more' => (($i > 0 && $i >= App::$pager['itemspage']) ? true : false),
 		'$less' => $less,
 		'$more' => $more,
 		'$url' => $url,
-		'$prevpage' => $a->pager['page'] - 1,
-		'$nextpage' => $a->pager['page'] + 1,
+		'$prevpage' => App::$pager['page'] - 1,
+		'$nextpage' => App::$pager['page'] + 1,
 	));
 
 }
@@ -470,7 +470,7 @@ function item_message_id() {
 	do {
 		$dups = false;
 		$hash = random_string();
-		$mid = $hash . '@' . get_app()->get_hostname();
+		$mid = $hash . '@' . App::get_hostname();
 
 		$r = q("SELECT id FROM item WHERE mid = '%s' LIMIT 1",
 			dbesc($mid));
@@ -544,7 +544,7 @@ function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
 	global $a;
 	global $db;
 
-	if(($a->module == 'install') || (! ($db && $db->connected)))
+	if((App::$module == 'install') || (! ($db && $db->connected)))
 		return;
 
 	$debugging = get_config('system', 'debugging');
@@ -625,7 +625,7 @@ function dlogger($msg, $level = 0) {
 	global $a;
 	global $db;
 
-	if(($a->module == 'install') || (! ($db && $db->connected)))
+	if((App::$module == 'install') || (! ($db && $db->connected)))
 		return;
 
 	$debugging = get_config('system','debugging');
@@ -785,20 +785,20 @@ function contact_block() {
 	$o = '';
 	$a = get_app();
 
-	if(! $a->profile['uid'])
+	if(! App::$profile['uid'])
 		return;
 
-	if(! perm_is_allowed($a->profile['uid'],get_observer_hash(),'view_contacts'))
+	if(! perm_is_allowed(App::$profile['uid'],get_observer_hash(),'view_contacts'))
 		return;
 
-	$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
+	$shown = get_pconfig(App::$profile['uid'],'system','display_friend_count');
 
 	if($shown === false)
 		$shown = 25;
 	if($shown == 0)
 		return;
 
-	$is_owner = ((local_channel() && local_channel() == $a->profile['uid']) ? true : false);
+	$is_owner = ((local_channel() && local_channel() == App::$profile['uid']) ? true : false);
 	$sql_extra = '';
 
 	$abook_flags = " and abook_pending = 0 and abook_self = 0 ";
@@ -808,12 +808,12 @@ function contact_block() {
 		$sql_extra = " and xchan_hidden = 0 ";
 	}
 
-	if((! is_array($a->profile)) || ($a->profile['hide_friends']))
+	if((! is_array(App::$profile)) || (App::$profile['hide_friends']))
 		return $o;
 
 	$r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d
 		$abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra",
-		intval($a->profile['uid'])
+		intval(App::$profile['uid'])
 	);
 	if(count($r)) {
 		$total = intval($r[0]['total']);
@@ -826,7 +826,7 @@ function contact_block() {
 		$randfunc = db_getfunc('RAND');
 	
 		$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d $abook_flags and abook_archived = 0 and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra ORDER BY $randfunc LIMIT %d",
-			intval($a->profile['uid']),
+			intval(App::$profile['uid']),
 			intval($shown)
 		);
 
@@ -843,7 +843,7 @@ function contact_block() {
 	$tpl = get_markup_template('contact_block.tpl');
 	$o = replace_macros($tpl, array(
 		'$contacts' => $contacts,
-		'$nickname' => $a->profile['channel_address'],
+		'$nickname' => App::$profile['channel_address'],
 		'$viewconnections' => (($total > $shown) ? sprintf(t('View all %s connections'),$total) : ''),
 		'$micropro' => $micropro,
 	));
@@ -1787,7 +1787,7 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
 	);
 
 	$a = get_app();
-	if($a->is_sys) {
+	if(App::$is_sys) {
 		$x[] = 'application/x-php';
 	}
 	else {
@@ -1838,7 +1838,7 @@ function lang_selector() {
 			}
 			$ll = substr($l,5);
 			$ll = substr($ll,0,strrpos($ll,'/'));
-			$selected = (($ll === $a->language && (x($_SESSION, 'language'))) ? $ll : $selected);
+			$selected = (($ll === App::$language && (x($_SESSION, 'language'))) ? $ll : $selected);
 			$lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)";
 		}
 	}
@@ -2260,10 +2260,10 @@ function json_decode_plus($s) {
  */
 function design_tools() {
 
-	$channel  = get_app()->get_channel();
+	$channel  = App::get_channel();
 	$sys = false;
 
-	if(get_app()->is_sys && is_site_admin()) {
+	if(App::$is_sys && is_site_admin()) {
 		require_once('include/identity.php');
 		$channel = get_sys_channel();
 		$sys = true;
@@ -2520,7 +2520,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 
 		// $r is set if we found something
 
-		$channel = get_app()->get_channel();
+		$channel = App::get_channel();
 
 		if($r) {
 			$profile = $r[0]['xchan_url'];
@@ -2550,7 +2550,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 					if($g && $exclusive) {
 						$access_tag .= 'gid:' . $g[0]['hash'];
 					}
-					$channel = get_app()->get_channel();
+					$channel = App::get_channel();
 					if($channel) {
 						$newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $newname . '[/zrl]';
 						$body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body);
@@ -2608,7 +2608,7 @@ function linkify_tags($a, &$body, $uid, $diaspora = false) {
 			if($fullnametagged)
 				continue;
 
-			$success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : $a->profile_uid , $tag, $diaspora); 
+			$success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : App::$profile_uid , $tag, $diaspora); 
 			$results[] = array('success' => $success, 'access_tag' => $access_tag);
 			if($success['replaced']) $tagged[] = $tag;
 		}