harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lotsa little fixes

Browse Source
This commit is contained in:
friendica 2012-10-21 22:11:02 -07:00
parent 87c171030c
commit 8f9ddcb536
10 changed files with 56 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boot.php
View File

@ -426,7 +426,7 @@ if(! class_exists('App')) {
public $timezone;
public $interactive = true;
public $plugins;
public $apps = array();
private $apps = array();
public $identities;
public $css_sources = array();
public $js_sources = array();
@ -654,6 +654,15 @@ if(! class_exists('App')) {
return $this->observer;
}
function get_apps() {
return $this->apps;
}
function set_apps($arr) {
$this->apps = $arr;
}
function set_widget($title,$html, $location = 'aside') {
$this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location);
}

6
include/Contact.php
View File

@ -353,9 +353,9 @@ function contact_photo_menu($contact) {
function random_profile() {
$r = q("select url from gcontact where url like '%%://%%/profile/%%' order by rand() limit 1");
if(count($r))
return dirname($r[0]['url']);
$r = q("select xchan_profile from xchan where xchan_network = 'zot' order by rand() limit 1");
if($r && count($r))
return $r[0]['xchan_profile'];
return '';
}

4
include/nav.php
View File

@ -90,7 +90,7 @@ function nav(&$a) {
if(! get_config('system','hide_help'))
$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
if(count($a->apps)>0)
if(count($a->get_apps()) > 0)
$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
$nav['search'] = array('search', t('Search'), "", t('Search site content'));
@ -170,7 +170,7 @@ function nav(&$a) {
'$emptynotifications' => t('Nothing new here'),
'$userinfo' => $userinfo,
'$sel' => $a->nav_sel,
'$apps' => $a->apps,
'$apps' => $a->get_apps(),
));
call_hooks('page_header', $a->page['nav']);

4
index.php
View File

@ -126,11 +126,11 @@ else
nav_set_selected('nothing');
$arr = array('app_menu' => $a->apps);
$arr = array('app_menu' => $a->get_apps());
call_hooks('app_menu', $arr);
$a->apps = $arr['app_menu'];
$a->set_apps($arr['app_menu']);
/**
*

16
mod/acctlink.php
View File

@ -1,16 +0,0 @@
<?php
require_once('include/Scrape.php');
function acctlink_init(&$a) {
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);
$res = probe_url($addr);
//logger('acctlink: ' . print_r($res,true));
if($res['url']) {
goaway($res['url']);
killme();
}
}
}

11
mod/apps.php
View File

@ -1,18 +1,17 @@
<?php
function apps_content(&$a) {
$title = t('Applications');
if(count($a->apps)==0)
$apps = $a->get_apps();
if(count($apps) == 0)
notice( t('No installed applications.') . EOL);
$tpl = get_markup_template("apps.tpl");
return replace_macros($tpl, array(
'$title' => $title,
'$apps' => $a->apps,
'$title' => t('Applications'),
'$apps' => $apps,
));
}

20
mod/notice.php
View File

@ -1,20 +0,0 @@
<?php
/* identi.ca -> friendica items permanent-url compatibility */
function notice_init(&$a){
$id = $a->argv[1];
$r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
intval($id)
);
if (count($r)){
$nick = $r[0]['nickname'];
$url = $a->get_baseurl()."/display/$nick/$id";
goaway($url);
} else {
$a->error = 404;
notice( t('Item not found.') . EOL);
}
return;
}

38
mod/oembed.php
View File

@ -1,28 +1,30 @@
<?php
require_once("include/oembed.php");
function oembed_content(&$a){
function oembed_init(&$a){
// logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
if ($a->argv[1]=='b2h'){
$url = array( "", trim(hex2bin($_REQUEST['url'])));
echo oembed_replacecb($url);
killme();
}
if(argc() > 1) {
if (argv(1) == 'b2h'){
$url = array( "", trim(hex2bin($_REQUEST['url'])));
echo oembed_replacecb($url);
killme();
}
if ($a->argv[1]=='h2b'){
$text = trim(hex2bin($_REQUEST['text']));
echo oembed_html2bbcode($text);
killme();
}
elseif (argv(1) == 'h2b'){
$text = trim(hex2bin($_REQUEST['text']));
echo oembed_html2bbcode($text);
killme();
}
if ($a->argc == 2){
echo "<html><body>";
$url = base64url_decode($a->argv[1]);
$j = oembed_fetch_url($url);
echo $j->html;
// logger('mod-oembed ' . $j->html, LOGGER_ALL);
echo "</body></html>";
else {
echo "<html><body>";
$url = base64url_decode($argv(1));
$j = oembed_fetch_url($url);
echo $j->html;
// logger('mod-oembed ' . $j->html, LOGGER_ALL);
echo "</body></html>";
}
}
killme();
}

9
mod/oexchange.php
View File

@ -3,25 +3,22 @@
function oexchange_init(&$a) {
if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
if((argc() > 1) && (argv(1) === 'xrd')) {
$tpl = get_markup_template('oexchange_xrd.tpl');
$o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
echo $o;
killme();
}
}
function oexchange_content(&$a) {
if(! local_user()) {
$o = login(false);
return $o;
return login(false);
}
if(($a->argc > 1) && $a->argv[1] === 'done') {
if((argc() > 1) && argv(1) === 'done') {
info( t('Post successful.') . EOL);
return;
}

22
mod/opensearch.php
View File

@ -1,18 +1,18 @@
<?php
function opensearch_content(&$a) {
function opensearch_init(&$a) {
$tpl = get_markup_template('opensearch.tpl');
$tpl = get_markup_template('opensearch.tpl');
header("Content-type: application/opensearchdescription+xml");
header("Content-type: application/opensearchdescription+xml");
$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$nodename' => $a->get_hostname(),
));
$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$nodename' => $a->get_hostname(),
));
echo $o;
echo $o;
killme();
killme();
}
?>
}