don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
This commit is contained in:
		
							
								
								
									
										10
									
								
								boot.php
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								boot.php
									
									
									
									
									
								
							| @@ -378,7 +378,7 @@ class App { | ||||
|  | ||||
| 	function init_pagehead() { | ||||
| 		$this->page['title'] = $this->config['sitename']; | ||||
| 		$tpl = load_view_file('view/head.tpl'); | ||||
| 		$tpl = file_get_contents('view/head.tpl'); | ||||
| 		$this->page['htmlhead'] = replace_macros($tpl,array( | ||||
| 			'$baseurl' => $this->get_baseurl(), | ||||
| 			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION, | ||||
| @@ -828,7 +828,7 @@ function escape_tags($string) { | ||||
| if(! function_exists('login')) { | ||||
| function login($register = false) { | ||||
| 	$o = ""; | ||||
| 	$register_tpl = (($register) ? load_view_file("view/register-link.tpl") : ""); | ||||
| 	$register_tpl = (($register) ? file_get_contents("view/register-link.tpl") : ""); | ||||
| 	 | ||||
| 	$register_html = replace_macros($register_tpl,array( | ||||
| 		'$title' => t('Create a New Account'), | ||||
| @@ -852,10 +852,10 @@ function login($register = false) { | ||||
| 	$lostlink = t('Password Reset'); | ||||
|  | ||||
| 	if(local_user()) { | ||||
| 		$tpl = load_view_file("view/logout.tpl"); | ||||
| 		$tpl = file_get_contents("view/logout.tpl"); | ||||
| 	} | ||||
| 	else { | ||||
| 		$tpl = load_view_file("view/login.tpl"); | ||||
| 		$tpl = file_get_contents("view/login.tpl"); | ||||
|  | ||||
| 	} | ||||
|  | ||||
| @@ -2307,7 +2307,7 @@ function profile_sidebar($profile) { | ||||
|  | ||||
| 	$homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div><div class="profile-clear"></div>' : ''); | ||||
|  | ||||
| 	$tpl = load_view_file('view/profile_vcard.tpl'); | ||||
| 	$tpl = file_get_contents('view/profile_vcard.tpl'); | ||||
|  | ||||
| 	$o .= replace_macros($tpl, array( | ||||
| 		'$fullname' => $fullname, | ||||
|   | ||||
| @@ -273,7 +273,7 @@ | ||||
| 			case "atom": | ||||
| 			case "xml": | ||||
| 				$data = api_xmlify($data); | ||||
| 				$tpl = load_view_file("view/api_".$templatename."_".$type.".tpl"); | ||||
| 				$tpl = file_get_contents("view/api_".$templatename."_".$type.".tpl"); | ||||
| 				$ret = replace_macros($tpl, $data); | ||||
| 				break; | ||||
| 			case "json": | ||||
|   | ||||
| @@ -104,11 +104,11 @@ function conversation(&$a, $items, $mode, $update) { | ||||
| 	load_contact_links(local_user()); | ||||
|  | ||||
|  | ||||
| 	$cmnt_tpl    = load_view_file('view/comment_item.tpl'); | ||||
| 	$like_tpl    = load_view_file('view/like.tpl'); | ||||
| 	$noshare_tpl = load_view_file('view/like_noshare.tpl'); | ||||
| 	$tpl         = load_view_file('view/wall_item.tpl'); | ||||
| 	$wallwall    = load_view_file('view/wallwall_item.tpl'); | ||||
| 	$cmnt_tpl    = file_get_contents('view/comment_item.tpl'); | ||||
| 	$like_tpl    = file_get_contents('view/like.tpl'); | ||||
| 	$noshare_tpl = file_get_contents('view/like_noshare.tpl'); | ||||
| 	$tpl         = file_get_contents('view/wall_item.tpl'); | ||||
| 	$wallwall    = file_get_contents('view/wallwall_item.tpl'); | ||||
|  | ||||
| 	$alike = array(); | ||||
| 	$dlike = array(); | ||||
| @@ -120,8 +120,8 @@ function conversation(&$a, $items, $mode, $update) { | ||||
| 			// "New Item View" on network page or search page results  | ||||
| 			// - just loop through the items and format them minimally for display | ||||
|  | ||||
| 			$tpl = load_view_file('view/search_item.tpl'); | ||||
| 			$droptpl = load_view_file('view/wall_fake_drop.tpl'); | ||||
| 			$tpl = file_get_contents('view/search_item.tpl'); | ||||
| 			$droptpl = file_get_contents('view/wall_fake_drop.tpl'); | ||||
|  | ||||
| 			foreach($items as $item) { | ||||
|  | ||||
| @@ -383,7 +383,7 @@ function conversation(&$a, $items, $mode, $update) { | ||||
| 					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id']  | ||||
| 						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>' | ||||
| 					: ''); | ||||
| 			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); | ||||
| 			$drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); | ||||
|  | ||||
| 			$photo = $item['photo']; | ||||
| 			$thumb = $item['thumb']; | ||||
| @@ -662,9 +662,9 @@ function status_editor($a,$x) { | ||||
|  | ||||
| 	$o = ''; | ||||
| 		 | ||||
| 	$geotag = (($x['allow_location']) ? load_view_file('view/jot_geotag.tpl') : ''); | ||||
| 	$geotag = (($x['allow_location']) ? file_get_contents('view/jot_geotag.tpl') : ''); | ||||
|  | ||||
| 		$tpl = load_view_file('view/jot-header.tpl'); | ||||
| 		$tpl = file_get_contents('view/jot-header.tpl'); | ||||
| 	 | ||||
| 		$a->page['htmlhead'] .= replace_macros($tpl, array( | ||||
| 			'$baseurl' => $a->get_baseurl(), | ||||
| @@ -680,7 +680,7 @@ function status_editor($a,$x) { | ||||
| 		)); | ||||
|  | ||||
|  | ||||
| 		$tpl = load_view_file("view/jot.tpl"); | ||||
| 		$tpl = file_get_contents("view/jot.tpl"); | ||||
| 		 | ||||
| 		$jotplugins = ''; | ||||
| 		$jotnets = ''; | ||||
|   | ||||
| @@ -113,7 +113,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) | ||||
|  | ||||
| 	$items = $r; | ||||
|  | ||||
| 	$feed_template = load_view_file('view/atom_feed.tpl'); | ||||
| 	$feed_template = file_get_contents('view/atom_feed.tpl'); | ||||
|  | ||||
| 	$atom = ''; | ||||
|  | ||||
|   | ||||
| @@ -125,7 +125,7 @@ function nav(&$a) { | ||||
| 		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>'; | ||||
|  | ||||
|  | ||||
| 	$tpl = load_view_file('view/nav.tpl'); | ||||
| 	$tpl = file_get_contents('view/nav.tpl'); | ||||
|  | ||||
| 	$a->page['nav'] .= replace_macros($tpl, array( | ||||
| 		'$langselector' => lang_selector(), | ||||
|   | ||||
| @@ -191,8 +191,8 @@ function notifier_run($argv, $argc){ | ||||
| 			$contacts = $r; | ||||
| 	} | ||||
|  | ||||
| 	$feed_template = load_view_file('view/atom_feed.tpl'); | ||||
| 	$mail_template = load_view_file('view/atom_mail.tpl'); | ||||
| 	$feed_template = file_get_contents('view/atom_feed.tpl'); | ||||
| 	$mail_template = file_get_contents('view/atom_mail.tpl'); | ||||
|  | ||||
| 	$atom = ''; | ||||
| 	$slaps = array(); | ||||
|   | ||||
| @@ -161,7 +161,7 @@ EOT; | ||||
|  | ||||
| 	$signature2  = base64url_encode($rsa->sign($data)); | ||||
|  | ||||
| 	$salmon_tpl = load_view_file('view/magicsig.tpl'); | ||||
| 	$salmon_tpl = file_get_contents('view/magicsig.tpl'); | ||||
| 	$salmon = replace_macros($salmon_tpl,array( | ||||
| 		'$data'      => $data, | ||||
| 		'$encoding'  => $encoding, | ||||
|   | ||||
| @@ -14,7 +14,7 @@ function contacts_init(&$a) { | ||||
| 	if(strlen(get_config('system','directory_submit_url'))) | ||||
| 		$a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' . t('Find People With Shared Interests') . '</a></div>'; | ||||
|  | ||||
| 	$tpl = load_view_file('view/follow.tpl'); | ||||
| 	$tpl = file_get_contents('view/follow.tpl'); | ||||
| 	$a->page['aside'] .= replace_macros($tpl,array( | ||||
| 		'$label' => t('Connect/Follow'), | ||||
| 		'$hint' => t('Example: bob@example.com, http://example.com/barbara'), | ||||
| @@ -168,7 +168,7 @@ function contacts_content(&$a) { | ||||
| 			// create an unfollow slap | ||||
|  | ||||
| 			if($orig_record[0]['network'] === 'stat') { | ||||
| 				$tpl = load_view_file('view/follow_slap.tpl'); | ||||
| 				$tpl = file_get_contents('view/follow_slap.tpl'); | ||||
| 				$slap = replace_macros($tpl, array( | ||||
| 					'$name' => $a->user['username'], | ||||
| 					'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'], | ||||
| @@ -215,12 +215,12 @@ function contacts_content(&$a) { | ||||
| 			return; | ||||
| 		} | ||||
|  | ||||
| 		$tpl = load_view_file('view/contact_head.tpl'); | ||||
| 		$tpl = file_get_contents('view/contact_head.tpl'); | ||||
| 		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl())); | ||||
|  | ||||
| 		require_once('include/contact_selectors.php'); | ||||
|  | ||||
| 		$tpl = load_view_file("view/contact_edit.tpl"); | ||||
| 		$tpl = file_get_contents("view/contact_edit.tpl"); | ||||
|  | ||||
| 		switch($r[0]['rel']) { | ||||
| 			case REL_BUD: | ||||
| @@ -317,7 +317,7 @@ function contacts_content(&$a) { | ||||
|  | ||||
| 	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); | ||||
|  | ||||
| 	$tpl = load_view_file("view/contacts-top.tpl"); | ||||
| 	$tpl = file_get_contents("view/contacts-top.tpl"); | ||||
| 	$o .= replace_macros($tpl,array( | ||||
| 		'$header' => t('Contacts'), | ||||
| 		'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ), | ||||
| @@ -351,7 +351,7 @@ function contacts_content(&$a) { | ||||
|  | ||||
| 	if(count($r)) { | ||||
|  | ||||
| 		$tpl = load_view_file("view/contact_template.tpl"); | ||||
| 		$tpl = file_get_contents("view/contact_template.tpl"); | ||||
|  | ||||
| 		foreach($r as $rr) { | ||||
| 			if($rr['self']) | ||||
|   | ||||
| @@ -80,7 +80,7 @@ function crepair_content(&$a) { | ||||
|  | ||||
| 	$o .= '<div class="error-message">' . $msg2 . EOL . EOL. $msg3 . '</div>'; | ||||
|  | ||||
| 	$tpl = load_view_file('view/crepair.tpl'); | ||||
| 	$tpl = file_get_contents('view/crepair.tpl'); | ||||
| 	$o .= replace_macros($tpl, array( | ||||
| 		'$label_name' => t('Name'), | ||||
| 		'$label_nick' => t('Account Nickname'), | ||||
|   | ||||
| @@ -499,7 +499,7 @@ function dfrn_request_content(&$a) { | ||||
| 		$dfrn_url = notags(trim(hex2bin($_GET['dfrn_url']))); | ||||
| 		$aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0); | ||||
| 		$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : ""); | ||||
| 		$o .= load_view_file("view/dfrn_req_confirm.tpl"); | ||||
| 		$o .= file_get_contents("view/dfrn_req_confirm.tpl"); | ||||
| 		$o  = replace_macros($o,array( | ||||
| 			'$dfrn_url' => $dfrn_url, | ||||
| 			'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ), | ||||
| @@ -622,9 +622,9 @@ function dfrn_request_content(&$a) { | ||||
| 		 */ | ||||
|  | ||||
| 		if($a->profile['page-flags'] == PAGE_NORMAL) | ||||
| 			$tpl = load_view_file('view/dfrn_request.tpl'); | ||||
| 			$tpl = file_get_contents('view/dfrn_request.tpl'); | ||||
| 		else | ||||
| 			$tpl = load_view_file('view/auto_request.tpl'); | ||||
| 			$tpl = file_get_contents('view/auto_request.tpl'); | ||||
|  | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$header' => t('Friend/Connection Request'), | ||||
|   | ||||
| @@ -29,7 +29,7 @@ function directory_content(&$a) { | ||||
| 	else | ||||
| 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); | ||||
|  | ||||
| 	$tpl = load_view_file('view/directory_header.tpl'); | ||||
| 	$tpl = file_get_contents('view/directory_header.tpl'); | ||||
|  | ||||
| 	$globaldir = ''; | ||||
| 	$gdirpath = dirname(get_config('system','directory_submit_url')); | ||||
| @@ -65,7 +65,7 @@ function directory_content(&$a) { | ||||
| 	); | ||||
| 	if(count($r)) { | ||||
|  | ||||
| 		$tpl = load_view_file('view/directory_item.tpl'); | ||||
| 		$tpl = file_get_contents('view/directory_item.tpl'); | ||||
|  | ||||
| 		if(in_array('small', $a->argv)) | ||||
| 			$photo = 'thumb'; | ||||
|   | ||||
| @@ -31,7 +31,7 @@ function editpost_content(&$a) { | ||||
|  | ||||
| 	$o .= '<h2>' . t('Edit post') . '</h2>'; | ||||
|  | ||||
| 	$tpl = load_view_file('view/jot-header.tpl'); | ||||
| 	$tpl = file_get_contents('view/jot-header.tpl'); | ||||
| 	 | ||||
| 	$a->page['htmlhead'] .= replace_macros($tpl, array( | ||||
| 		'$baseurl' => $a->get_baseurl(), | ||||
| @@ -41,7 +41,7 @@ function editpost_content(&$a) { | ||||
| 	)); | ||||
|  | ||||
|  | ||||
| 	$tpl = load_view_file("view/jot.tpl"); | ||||
| 	$tpl = file_get_contents("view/jot.tpl"); | ||||
| 		 | ||||
| 	if(($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) | ||||
| 		$lockstate = 'lock'; | ||||
|   | ||||
| @@ -133,7 +133,7 @@ function follow_post(&$a) { | ||||
|  | ||||
| 	// create a follow slap | ||||
|  | ||||
| 	$tpl = load_view_file('view/follow_slap.tpl'); | ||||
| 	$tpl = file_get_contents('view/follow_slap.tpl'); | ||||
| 	$slap = replace_macros($tpl, array( | ||||
| 		'$name' => $a->user['username'], | ||||
| 		'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'], | ||||
|   | ||||
| @@ -69,7 +69,7 @@ function group_content(&$a) { | ||||
| 	} | ||||
|  | ||||
| 	if(($a->argc == 2) && ($a->argv[1] === 'new')) { | ||||
| 		$tpl = load_view_file('view/group_new.tpl'); | ||||
| 		$tpl = file_get_contents('view/group_new.tpl'); | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$desc' => t('Create a group of contacts/friends.'), | ||||
| 			'$name' => t('Group Name: '), | ||||
| @@ -140,7 +140,7 @@ function group_content(&$a) { | ||||
| 		} | ||||
|  | ||||
|  | ||||
| 		$drop_tpl = load_view_file('view/group_drop.tpl'); | ||||
| 		$drop_tpl = file_get_contents('view/group_drop.tpl'); | ||||
| 		$drop_txt = replace_macros($drop_tpl, array( | ||||
| 			'$id' => $group['id'], | ||||
| 			'$delete' => t('Delete') | ||||
| @@ -148,7 +148,7 @@ function group_content(&$a) { | ||||
|  | ||||
| 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); | ||||
|  | ||||
| 		$tpl = load_view_file('view/group_edit.tpl'); | ||||
| 		$tpl = file_get_contents('view/group_edit.tpl'); | ||||
| 		$o .= replace_macros($tpl, array( | ||||
| 			'$gid' => $group['id'], | ||||
| 			'$name' => $group['name'], | ||||
|   | ||||
| @@ -116,7 +116,7 @@ function install_content(&$a) { | ||||
|  | ||||
| 	require_once('datetime.php'); | ||||
|  | ||||
| 	$tpl = load_view_file('view/install_db.tpl'); | ||||
| 	$tpl = file_get_contents('view/install_db.tpl'); | ||||
| 	$o .= replace_macros($tpl, array( | ||||
| 		'$lbl_01' => t('Friendika Social Network'), | ||||
| 		'$lbl_02' => t('Installation'), | ||||
|   | ||||
| @@ -55,7 +55,7 @@ function invite_content(&$a) { | ||||
| 		return; | ||||
| 	} | ||||
|  | ||||
| 	$tpl = load_view_file('view/invite.tpl'); | ||||
| 	$tpl = file_get_contents('view/invite.tpl'); | ||||
| 	 | ||||
| 	$o = replace_macros($tpl, array( | ||||
| 		'$invite' => t('Send invitations'), | ||||
|   | ||||
| @@ -73,7 +73,7 @@ function lostpass_content(&$a) { | ||||
| 			intval($uid) | ||||
| 		); | ||||
| 		if($r) { | ||||
| 			$tpl = load_view_file('view/pwdreset.tpl'); | ||||
| 			$tpl = file_get_contents('view/pwdreset.tpl'); | ||||
| 			$o .= replace_macros($tpl,array( | ||||
| 				'$lbl1' => t('Password Reset'), | ||||
| 				'$lbl2' => t('Your password has been reset as requested.'), | ||||
| @@ -108,7 +108,7 @@ function lostpass_content(&$a) { | ||||
| 	 | ||||
| 	} | ||||
| 	else { | ||||
| 		$tpl = load_view_file('view/lostpass.tpl'); | ||||
| 		$tpl = file_get_contents('view/lostpass.tpl'); | ||||
|  | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$title' => t('Forgot your Password?'), | ||||
|   | ||||
| @@ -120,7 +120,7 @@ function message_content(&$a) { | ||||
| 	$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname']; | ||||
|  | ||||
|  | ||||
| 	$tpl = load_view_file('view/mail_head.tpl'); | ||||
| 	$tpl = file_get_contents('view/mail_head.tpl'); | ||||
| 	$header = replace_macros($tpl, array( | ||||
| 		'$messages' => t('Messages'), | ||||
| 		'$inbox' => t('Inbox'), | ||||
| @@ -164,7 +164,7 @@ function message_content(&$a) { | ||||
|  | ||||
| 	if(($a->argc > 1) && ($a->argv[1] === 'new')) { | ||||
| 		 | ||||
| 		$tpl = load_view_file('view/msg-header.tpl'); | ||||
| 		$tpl = file_get_contents('view/msg-header.tpl'); | ||||
|  | ||||
| 		$a->page['htmlhead'] .= replace_macros($tpl, array( | ||||
| 			'$baseurl' => $a->get_baseurl(), | ||||
| @@ -175,7 +175,7 @@ function message_content(&$a) { | ||||
| 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false); | ||||
| 	 | ||||
| 		$select = contact_select('messageto','message-to-select', $preselect, 4, true); | ||||
| 		$tpl = load_view_file('view/prv_message.tpl'); | ||||
| 		$tpl = file_get_contents('view/prv_message.tpl'); | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$header' => t('Send Private Message'), | ||||
| 			'$to' => t('To:'), | ||||
| @@ -225,7 +225,7 @@ function message_content(&$a) { | ||||
| 			return $o; | ||||
| 		} | ||||
|  | ||||
| 		$tpl = load_view_file('view/mail_list.tpl'); | ||||
| 		$tpl = file_get_contents('view/mail_list.tpl'); | ||||
| 		foreach($r as $rr) { | ||||
| 			$o .= replace_macros($tpl, array( | ||||
| 				'$id' => $rr['id'], | ||||
| @@ -275,7 +275,7 @@ function message_content(&$a) { | ||||
|  | ||||
| 		require_once("include/bbcode.php"); | ||||
|  | ||||
| 		$tpl = load_view_file('view/msg-header.tpl'); | ||||
| 		$tpl = file_get_contents('view/msg-header.tpl'); | ||||
| 	 | ||||
| 		$a->page['htmlhead'] .= replace_macros($tpl, array( | ||||
| 			'$nickname' => $a->user['nickname'], | ||||
| @@ -283,7 +283,7 @@ function message_content(&$a) { | ||||
| 		)); | ||||
|  | ||||
|  | ||||
| 		$tpl = load_view_file('view/mail_conv.tpl'); | ||||
| 		$tpl = file_get_contents('view/mail_conv.tpl'); | ||||
| 		foreach($messages as $message) { | ||||
| 			if($message['from-url'] == $myprofile) { | ||||
| 				$from_url = $myprofile; | ||||
| @@ -309,7 +309,7 @@ function message_content(&$a) { | ||||
| 		} | ||||
| 		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />'; | ||||
| 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />'; | ||||
| 		$tpl = load_view_file('view/prv_message.tpl'); | ||||
| 		$tpl = file_get_contents('view/prv_message.tpl'); | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$header' => t('Send Reply'), | ||||
| 			'$to' => t('To:'), | ||||
|   | ||||
| @@ -89,13 +89,13 @@ function notifications_content(&$a) { | ||||
| 	if(($r !== false) && (count($r))) { | ||||
|  | ||||
|  | ||||
| 		$tpl = load_view_file("view/intros.tpl"); | ||||
| 		$tpl = file_get_contents("view/intros.tpl"); | ||||
|  | ||||
| 		foreach($r as $rr) { | ||||
|  | ||||
| 			$friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled '); | ||||
| 			$fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : ''); | ||||
| 			$dfrn_tpl = load_view_file('view/netfriend.tpl'); | ||||
| 			$dfrn_tpl = file_get_contents('view/netfriend.tpl'); | ||||
|  | ||||
| 			$knowyou   = ''; | ||||
| 			$dfrn_text = ''; | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
| function oexchange_init(&$a) { | ||||
|  | ||||
| 	if(($a->argc > 1) && ($a->argv[1] === 'xrd')) { | ||||
| 		$tpl = load_view_file('view/oexchange_xrd.tpl'); | ||||
| 		$tpl = file_get_contents('view/oexchange_xrd.tpl'); | ||||
|  | ||||
| 		$o = replace_macros($tpl, array('$base' => $a->get_baseurl())); | ||||
| 		echo $o; | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| <?php | ||||
|     function opensearch_content(&$a) { | ||||
|     	 | ||||
| 		$tpl = load_view_file('view/opensearch.tpl'); | ||||
| 		$tpl = file_get_contents('view/opensearch.tpl'); | ||||
| 	 | ||||
| 		header("Content-type: application/opensearchdescription+xml"); | ||||
| 	 | ||||
|   | ||||
| @@ -828,7 +828,7 @@ function photos_content(&$a) { | ||||
|  | ||||
|   | ||||
|  | ||||
| 		$tpl = load_view_file('view/photos_upload.tpl'); | ||||
| 		$tpl = file_get_contents('view/photos_upload.tpl'); | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$pagename' => t('Upload Photos'), | ||||
| 			'$sessid' => session_id(), | ||||
| @@ -874,7 +874,7 @@ function photos_content(&$a) { | ||||
| 		if($cmd === 'edit') {		 | ||||
| 			if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) { | ||||
| 				if($can_post) { | ||||
| 					$edit_tpl = load_view_file('view/album_edit.tpl'); | ||||
| 					$edit_tpl = file_get_contents('view/album_edit.tpl'); | ||||
| 					$o .= replace_macros($edit_tpl,array( | ||||
| 						'$nametext' => t('New album name: '), | ||||
| 						'$nickname' => $a->data['user']['nickname'], | ||||
| @@ -895,7 +895,7 @@ function photos_content(&$a) { | ||||
|  				} | ||||
| 			} | ||||
| 		} | ||||
| 		$tpl = load_view_file('view/photo_album.tpl'); | ||||
| 		$tpl = file_get_contents('view/photo_album.tpl'); | ||||
| 		if(count($r)) | ||||
| 			foreach($r as $rr) { | ||||
| 				$o .= replace_macros($tpl,array( | ||||
| @@ -1073,7 +1073,7 @@ function photos_content(&$a) { | ||||
|  | ||||
| 		$edit = Null; | ||||
| 		if(($cmd === 'edit') && ($can_post)) { | ||||
| 			$edit_tpl = load_view_file('view/photo_edit.tpl'); | ||||
| 			$edit_tpl = file_get_contents('view/photo_edit.tpl'); | ||||
| 			$edit = replace_macros($edit_tpl, array( | ||||
| 				'$id' => $ph[0]['id'], | ||||
| 				'$album' => $ph[0]['album'], | ||||
| @@ -1095,11 +1095,11 @@ function photos_content(&$a) { | ||||
|  | ||||
| 		if(count($linked_items)) { | ||||
|  | ||||
| 			$cmnt_tpl = load_view_file('view/comment_item.tpl'); | ||||
| 			$tpl = load_view_file('view/photo_item.tpl'); | ||||
| 			$cmnt_tpl = file_get_contents('view/comment_item.tpl'); | ||||
| 			$tpl = file_get_contents('view/photo_item.tpl'); | ||||
| 			$return_url = $a->cmd; | ||||
|  | ||||
| 			$like_tpl = load_view_file('view/like_noshare.tpl'); | ||||
| 			$like_tpl = file_get_contents('view/like_noshare.tpl'); | ||||
|  | ||||
| 			$likebuttons = ''; | ||||
|  | ||||
| @@ -1225,7 +1225,7 @@ function photos_content(&$a) { | ||||
| 					$drop = ''; | ||||
|  | ||||
| 					if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) | ||||
| 						$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); | ||||
| 						$drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); | ||||
|  | ||||
|  | ||||
| 					$comments .= replace_macros($template,array( | ||||
| @@ -1247,7 +1247,7 @@ function photos_content(&$a) { | ||||
| 			$paginate = paginate($a); | ||||
| 		} | ||||
| 		 | ||||
| 		$photo_tpl = load_view_file('view/photo_view.tpl'); | ||||
| 		$photo_tpl = file_get_contents('view/photo_view.tpl'); | ||||
| 		$o .= replace_macros($photo_tpl, array( | ||||
| 			'$id' => $ph[0]['id'], | ||||
| 			'$album' => array($album_link,$ph[0]['album']), | ||||
| @@ -1298,7 +1298,7 @@ function photos_content(&$a) { | ||||
| 			. $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . '</a></div>'; | ||||
| 	} | ||||
|  | ||||
| 	$tpl = load_view_file('view/photo_top.tpl'); | ||||
| 	$tpl = file_get_contents('view/photo_top.tpl'); | ||||
| 	if(count($r)) { | ||||
| 		foreach($r as $rr) { | ||||
| 			$o .= replace_macros($tpl,array( | ||||
|   | ||||
| @@ -104,7 +104,7 @@ function profile_content(&$a, $update = 0) { | ||||
| 		if(x($_GET,'tab')) | ||||
| 			$tab = notags(trim($_GET['tab'])); | ||||
|  | ||||
| 		$tpl = load_view_file('view/profile_tabs.tpl'); | ||||
| 		$tpl = file_get_contents('view/profile_tabs.tpl'); | ||||
|  | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$url' => $a->get_baseurl() . '/' . $a->cmd, | ||||
|   | ||||
| @@ -186,7 +186,7 @@ function profile_photo_content(&$a) { | ||||
|  | ||||
| 	if(! x($a->config,'imagecrop')) { | ||||
| 	 | ||||
| 		$tpl = load_view_file('view/profile_photo.tpl'); | ||||
| 		$tpl = file_get_contents('view/profile_photo.tpl'); | ||||
|  | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$user' => $a->user['nickname'], | ||||
| @@ -201,7 +201,7 @@ function profile_photo_content(&$a) { | ||||
| 	else { | ||||
| 		$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg'; | ||||
| 		$resolution = $a->config['imagecrop_resolution']; | ||||
| 		$tpl = load_view_file("view/cropbody.tpl"); | ||||
| 		$tpl = file_get_contents("view/cropbody.tpl"); | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$filename' => $filename, | ||||
| 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'], | ||||
| @@ -252,7 +252,7 @@ function profile_photo_crop_ui_head(&$a, $ph){ | ||||
|  | ||||
| 	$a->config['imagecrop'] = $hash; | ||||
| 	$a->config['imagecrop_resolution'] = $smallest; | ||||
| 	$a->page['htmlhead'] .= load_view_file("view/crophead.tpl"); | ||||
| 	$a->page['htmlhead'] .= file_get_contents("view/crophead.tpl"); | ||||
| 	return; | ||||
| }} | ||||
|  | ||||
|   | ||||
| @@ -347,9 +347,9 @@ function profiles_content(&$a) { | ||||
|  | ||||
| 		require_once('include/profile_selectors.php'); | ||||
|  | ||||
| 		$tpl = load_view_file('view/profed_head.tpl'); | ||||
| 		$tpl = file_get_contents('view/profed_head.tpl'); | ||||
|  | ||||
| 		$opt_tpl = load_view_file("view/profile-hide-friends.tpl"); | ||||
| 		$opt_tpl = file_get_contents("view/profile-hide-friends.tpl"); | ||||
| 		$hide_friends = replace_macros($opt_tpl,array( | ||||
| 			'$desc' => t('Hide my contact/friend list from viewers of this profile?'), | ||||
| 			'$yes_str' => t('Yes'), | ||||
| @@ -364,7 +364,7 @@ function profiles_content(&$a) { | ||||
|  | ||||
|  | ||||
| 		$is_default = (($r[0]['is-default']) ? 1 : 0); | ||||
| 		$tpl = load_view_file("view/profile_edit.tpl"); | ||||
| 		$tpl = file_get_contents("view/profile_edit.tpl"); | ||||
| 		$o .= replace_macros($tpl,array( | ||||
| 			'$banner' => t('Edit Profile Details'), | ||||
| 			'$submit' => t('Submit'), | ||||
| @@ -451,7 +451,7 @@ function profiles_content(&$a) { | ||||
| 			local_user()); | ||||
| 		if(count($r)) { | ||||
|  | ||||
| 			$tpl_header = load_view_file('view/profile_listing_header.tpl'); | ||||
| 			$tpl_header = file_get_contents('view/profile_listing_header.tpl'); | ||||
| 			$o .= replace_macros($tpl_header,array( | ||||
| 				'$header' => t('Profiles'), | ||||
| 				'$chg_photo' => t('Change profile photo'), | ||||
| @@ -459,7 +459,7 @@ function profiles_content(&$a) { | ||||
| 			)); | ||||
|  | ||||
|  | ||||
| 			$tpl = load_view_file('view/profile_entry.tpl'); | ||||
| 			$tpl = file_get_contents('view/profile_entry.tpl'); | ||||
|  | ||||
| 			foreach($r as $rr) { | ||||
| 				$o .= replace_macros($tpl, array( | ||||
|   | ||||
| @@ -435,7 +435,7 @@ function register_content(&$a) { | ||||
| 		$profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />'; | ||||
| 	} | ||||
| 	else { | ||||
| 		$publish_tpl = load_view_file("view/profile_publish.tpl"); | ||||
| 		$publish_tpl = file_get_contents("view/profile_publish.tpl"); | ||||
| 		$profile_publish = replace_macros($publish_tpl,array( | ||||
| 			'$instance'     => 'reg', | ||||
| 			'$pubdesc'      => t('Include your profile in member directory?'), | ||||
| @@ -450,7 +450,7 @@ function register_content(&$a) { | ||||
| 	$license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'); | ||||
|  | ||||
|  | ||||
| 	$o = load_view_file("view/register.tpl"); | ||||
| 	$o = file_get_contents("view/register.tpl"); | ||||
| 	$o = replace_macros($o, array( | ||||
| 		'$oidhtml' => $oidhtml, | ||||
| 		'$realpeople' => $realpeople, | ||||
|   | ||||
| @@ -35,7 +35,7 @@ function removeme_content(&$a) { | ||||
|  | ||||
| 	$_SESSION['remove_account_verify'] = $hash; | ||||
|  | ||||
| 	$tpl = load_view_file('view/removeme.tpl'); | ||||
| 	$tpl = file_get_contents('view/removeme.tpl'); | ||||
| 	$o .= replace_macros($tpl, array( | ||||
| 		'$basedir' => $a->get_baseurl(), | ||||
| 		'$hash' => $hash, | ||||
|   | ||||
| @@ -89,7 +89,7 @@ function salmon_post(&$a) { | ||||
|  | ||||
| 	// Create a fake feed wrapper so simplepie doesn't choke | ||||
|  | ||||
| 	$tpl = load_view_file('view/fake_feed.tpl'); | ||||
| 	$tpl = file_get_contents('view/fake_feed.tpl'); | ||||
| 	 | ||||
| 	$base = substr($data,strpos($data,'<entry')); | ||||
|  | ||||
|   | ||||
| @@ -310,7 +310,7 @@ function settings_content(&$a) { | ||||
| 	$mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); | ||||
|  | ||||
|  | ||||
| 	$pageset_tpl = load_view_file('view/pagetypes.tpl'); | ||||
| 	$pageset_tpl = file_get_contents('view/pagetypes.tpl'); | ||||
| 	$pagetype = replace_macros($pageset_tpl,array( | ||||
| 		'$normal'         => (($a->user['page-flags'] == PAGE_NORMAL)      ? " checked=\"checked\" " : ""), | ||||
| 		'$soapbox'        => (($a->user['page-flags'] == PAGE_SOAPBOX)     ? " checked=\"checked\" " : ""), | ||||
| @@ -344,7 +344,7 @@ function settings_content(&$a) { | ||||
| 		$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />'; | ||||
| 	} | ||||
| 	else { | ||||
| 		$opt_tpl = load_view_file("view/profile-in-directory.tpl"); | ||||
| 		$opt_tpl = file_get_contents("view/profile-in-directory.tpl"); | ||||
| 		$profile_in_dir = replace_macros($opt_tpl,array( | ||||
| 			'$desc'         => t('Publish your default profile in site directory?'), | ||||
| 			'$yes_str'      => t('Yes'), | ||||
| @@ -355,7 +355,7 @@ function settings_content(&$a) { | ||||
| 	} | ||||
|  | ||||
| 	if(strlen(get_config('system','directory_submit_url'))) { | ||||
| 		$opt_tpl = load_view_file("view/profile-in-netdir.tpl"); | ||||
| 		$opt_tpl = file_get_contents("view/profile-in-netdir.tpl"); | ||||
|  | ||||
| 		$profile_in_net_dir = replace_macros($opt_tpl,array( | ||||
| 			'$desc'         => t('Publish your default profile in global social directory?'), | ||||
| @@ -397,7 +397,7 @@ function settings_content(&$a) { | ||||
|  | ||||
| 	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : ''); | ||||
|  | ||||
| 	$tpl_addr = load_view_file("view/settings_nick_set.tpl"); | ||||
| 	$tpl_addr = file_get_contents("view/settings_nick_set.tpl"); | ||||
|  | ||||
| 	$prof_addr = replace_macros($tpl_addr,array( | ||||
| 		'$desc' => t('Your Identity Address is'), | ||||
| @@ -406,7 +406,7 @@ function settings_content(&$a) { | ||||
| 		'$basepath' => $a->get_hostname() | ||||
| 	)); | ||||
|  | ||||
| 	$stpl = load_view_file('view/settings.tpl'); | ||||
| 	$stpl = file_get_contents('view/settings.tpl'); | ||||
|  | ||||
| 	$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); | ||||
|  | ||||
|   | ||||
| @@ -41,7 +41,7 @@ function viewcontacts_content(&$a) { | ||||
| 		return $o; | ||||
| 	} | ||||
|  | ||||
| 	$tpl = load_view_file("view/viewcontact_template.tpl"); | ||||
| 	$tpl = file_get_contents("view/viewcontact_template.tpl"); | ||||
|  | ||||
| 	foreach($r as $rr) { | ||||
| 		if($rr['self']) | ||||
|   | ||||
| @@ -27,7 +27,7 @@ function xrd_content(&$a) { | ||||
|  | ||||
| 	header("Content-type: text/xml"); | ||||
|  | ||||
| 	$tpl = load_view_file('view/xrd_person.tpl'); | ||||
| 	$tpl = file_get_contents('view/xrd_person.tpl'); | ||||
|  | ||||
| 	$o = replace_macros($tpl, array( | ||||
| 		'$accturi'     => $uri, | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| <?php | ||||
|  | ||||
| function string_plural_select($n){ | ||||
| 	return ($n != 1)\$n"; | ||||
| 	return ($n != 1); | ||||
| } | ||||
| ; | ||||
| $a->strings["Post successful."] = "Inviato con successo."; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user