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

more structural stuff

Browse Source
This commit is contained in:
friendica 2012-10-29 19:31:38 -07:00
parent e36ca7b41f
commit 1a6415807e
11 changed files with 241 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -188,7 +188,7 @@ define ( 'PERMS_SPECIFIC' , 0x0080 );
define ( 'ABOOK_FLAG_BLOCKED' , 0x0001);
define ( 'ABOOK_FLAG_IGNORED' , 0x0002);
define ( 'ABOOK_FLAG_HIDDEN' , 0x0004);
define ( 'ABOOK_FLAG_SELF' , 0x0080);
/**

4
include/Contact.php
View File

@ -238,9 +238,9 @@ function contact_photo_menu($contact) {
function random_profile() {
$r = q("select xchan_profile from xchan where xchan_network = 'zot' order by rand() limit 1");
$r = q("select xchan_url from xchan where xchan_network = 'zot' order by rand() limit 1");
if($r && count($r))
return $r[0]['xchan_profile'];
return $r[0]['xchan_url'];
return '';
}

6
include/ItemObject.php
View File

@ -123,7 +123,7 @@ class Item extends BaseObject {
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
$profile_avatar = $item['author']['xchan_photo_m'];
$profile_link = zrl($item['author']['xchan_profile']);
$profile_link = zrl($item['author']['xchan_url']);
$profile_name = $item['author']['xchan_name'];
// if($item['author-link'] && (! $item['author-name']))
@ -137,7 +137,7 @@ class Item extends BaseObject {
else
$profile_link = zrl($profile_link);
$profile_link = zrl($item['author']['xchan_profile']);
$profile_link = zrl($item['author']['xchan_url']);
// $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
@ -520,7 +520,7 @@ class Item extends BaseObject {
'$parent' => $this->get_id(),
'$qcomment' => $qcomment,
'$profile_uid' => $conv->get_profile_owner(),
'$mylink' => $this->observer['xchan_profile'],
'$mylink' => $this->observer['xchan_url'],
'$mytitle' => t('This is you'),
'$myphoto' => $this->observer['xchan_photo_s'],
'$comment' => t('Comment'),

6
include/activities.php
View File

@ -25,7 +25,7 @@ function profile_activity($changed, $value) {
$arr['verb'] = ACTIVITY_UPDATE;
$arr['obj_type'] = ACTIVITY_OBJ_PROFILE;
$A = '[url=' . $self[0]['xchan_profile'] . ']' . $self[0]['xchan_name'] . '[/url]';
$A = '[url=' . $self[0]['xchan_url'] . ']' . $self[0]['xchan_name'] . '[/url]';
$changes = '';
@ -42,7 +42,7 @@ function profile_activity($changed, $value) {
$changes .= $ch;
}
$prof = '[url=' . $self[0]['xchan_profile'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
$prof = '[url=' . $self[0]['xchan_url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
if($t == 1 && strlen($value)) {
$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
@ -61,7 +61,7 @@ function profile_activity($changed, $value) {
$arr['object'] = json_encode(array(
'type' => ACTIVITY_OBJ_PROFILE,
'title' => $self[0]['channel_name'],
'id' => $self[0]['xchan_profile'] . '/' . $self[0]['xchan_hash'],
'id' => $self[0]['xchan_url'] . '/' . $self[0]['xchan_hash'],
'link' => $links
));

6
include/conversation.php
View File

@ -439,7 +439,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
$profile_avatar = $item['author']['xchan_photo_m'];
$profile_link = zrl($item['author']['xchan_profile']);
$profile_link = zrl($item['author']['xchan_url']);
$profile_name = $item['author']['xchan_name'];
$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
@ -1232,7 +1232,7 @@ old code
'$parent' => $item['parent'],
'$qcomment' => $qcomment,
'$profile_uid' => $profile_owner,
'$mylink' => $observer['xchan_profile'],
'$mylink' => $observer['xchan_url'],
'$mytitle' => t('This is you'),
'$myphoto' => $observer['xchan_photo_s'],
'$comment' => t('Comment'),
@ -1321,7 +1321,7 @@ old code
$profile_avatar = $item['author']['xchan_photo_m'];
$profile_link = zrl($item['author']['xchan_profile']);
$profile_link = zrl($item['author']['xchan_url']);
$profile_name = $item['author']['xchan_name'];

2
include/identity.php
View File

@ -110,7 +110,7 @@ function create_identity($arr) {
$newuid = $ret['channel']['channel_id'];
$r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_profile, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
$r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
dbesc($hash),
dbesc($ret['channel']['channel_guid']),
dbesc($sig),

8
install/database.sql
View File

@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `abook` (
`abook_xchan` char(255) NOT NULL DEFAULT '',
`abook_my_perms` int(11) NOT NULL DEFAULT '0',
`abook_their_perms` int(11) NOT NULL DEFAULT '0',
`abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '255',
`abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99',
`abook_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_connnected` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@ -907,7 +907,7 @@ CREATE TABLE IF NOT EXISTS `xchan` (
`xchan_photo_m` char(255) NOT NULL DEFAULT '',
`xchan_photo_s` char(255) NOT NULL DEFAULT '',
`xchan_addr` char(255) NOT NULL DEFAULT '',
`xchan_profile` char(255) NOT NULL DEFAULT '',
`xchan_url` char(255) NOT NULL DEFAULT '',
`xchan_name` char(255) NOT NULL DEFAULT '',
`xchan_network` char(255) NOT NULL DEFAULT '',
`xchan_photo_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@ -915,7 +915,7 @@ CREATE TABLE IF NOT EXISTS `xchan` (
PRIMARY KEY (`xchan_hash`),
KEY `xchan_guid` (`xchan_guid`),
KEY `xchan_addr` (`xchan_addr`),
KEY `xchan_profile` (`xchan_profile`),
KEY `xchan_name` (`xchan_name`),
KEY `xchan_network` (`xchan_network`)
KEY `xchan_network` (`xchan_network`),
KEY `xchan_url` (`xchan_url`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

4
mod/abook.php
View File

@ -194,13 +194,13 @@ window.onresize=resize_iframe;
</script>
<iframe id="glu" width="100%" src="{$r[0]['xchan_profile']}" onload="resize_iframe()">
<iframe id="glu" width="100%" src="{$r[0]['xchan_url']}" onload="resize_iframe()">
</iframe>
EOT;
// $o .= '<div id="profile-frame-wrapper" style="width: 100%; height: 100%;"><iframe id="profile-frame" src="' . $r[0]['xchan_profile'] . '" style="width: 100%; height: 100%;"></iframe></div>';
// $o .= '<div id="profile-frame-wrapper" style="width: 100%; height: 100%;"><iframe id="profile-frame" src="' . $r[0]['xchan_url'] . '" style="width: 100%; height: 100%;"></iframe></div>';
return $o;
}
}

2
mod/acl.php
View File

@ -147,7 +147,7 @@ function acl_init(&$a){
);
}
elseif($type == 'x') {
$r = q("SELECT xchan_name as id, xchan_name as name, xchan_photo_s as micro, xchan_profile as url from xchan
$r = q("SELECT xchan_name as id, xchan_name as name, xchan_photo_s as micro, xchan_url as url from xchan
where 1
$sql_extra3
ORDER BY `xchan_name` ASC ",

4
mod/home.php
View File

@ -8,8 +8,8 @@ function home_init(&$a) {
$channel = $a->get_channel();
if(local_user() && $channel && $channel['xchan_profile'])
goaway( $channel['xchan_profile']);
if(local_user() && $channel && $channel['xchan_url'])
goaway( $channel['xchan_url']);
}}

84
mod/settings.php
View File

@ -19,35 +19,45 @@ function settings_init(&$a) {
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'selected' => (($a->argc == 1)?'active':''),
'url' => $a->get_baseurl(true).'/settings/account',
'selected' => ((argv(1) === 'account') ? 'active' : ''),
),
array(
'label' => t('Channel settings'),
'url' => $a->get_baseurl(true).'/settings/channel',
'selected' => ((argv(1) === 'channel') ? 'active' : ''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
'selected' => ((argv(1) === 'display') ? 'active' : ''),
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
'selected' => ((argv(1) === 'connectors') ? 'active' : ''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
'selected' => ((argv(1) === 'addon') ? 'active' : ''),
),
array(
'label' => t('Connected apps'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'selected' => ''
),
array(
'label' => t('Remove account'),
'url' => $a->get_baseurl(true) . '/removeme',
@ -73,6 +83,11 @@ function settings_post(&$a) {
if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
return;
if(argc() == 1) {
$a->argc = 2;
$a->argv[] = 'channel';
}
if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
notice( t('Permission denied.') . EOL);
return;
@ -80,7 +95,7 @@ function settings_post(&$a) {
$old_page_flags = $a->user['page-flags'];
if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
if((argc() > 1) && (argv(1) === 'oauth') && x($_POST,'remove')){
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$key = $_POST['remove'];
@ -91,7 +106,7 @@ function settings_post(&$a) {
return;
}
if(($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
if((argc() > 2) && (argv(1) === 'oauth') && (argv(2) === 'edit'||(argv(2) === 'add')) && x($_POST,'submit')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
@ -136,14 +151,14 @@ function settings_post(&$a) {
return;
}
if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
if((argc() > 1) && (argv(1) == 'addon')) {
check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
call_hooks('plugin_settings_post', $_POST);
return;
}
if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
if((argc() > 1) && (argv(1) == 'connectors')) {
check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
@ -151,7 +166,7 @@ function settings_post(&$a) {
return;
}
if(($a->argc > 1) && ($a->argv[1] == 'display')) {
if((argc() > 1) && (argv(1) == 'display')) {
check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
@ -417,21 +432,27 @@ function settings_content(&$a) {
$o = '';
nav_set_selected('settings');
if(argc() == 1) {
$a->argc = 2;
$a->argv[] = 'channel';
}
if(! local_user()) {
notice( t('Permission denied.') . EOL );
return;
}
if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
notice( t('Permission denied.') . EOL );
return;
}
// if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
// notice( t('Permission denied.') . EOL );
// return;
// }
if(($a->argc > 1) && ($a->argv[1] === 'oauth')) {
if((argc() > 1) && (argv(1) === 'oauth')) {
if(($a->argc > 2) && ($a->argv[2] === 'add')) {
if((argc() > 2) && (argv(2) === 'add')) {
$tpl = get_markup_template("settings_oauth_edit.tpl");
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
@ -447,9 +468,9 @@ function settings_content(&$a) {
return $o;
}
if(($a->argc > 3) && ($a->argv[2] === 'edit')) {
if((argc() > 3) && (argv(2) === 'edit')) {
$r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
dbesc($a->argv[3]),
dbesc(argv(3)),
local_user());
if (!count($r)){
@ -473,11 +494,11 @@ function settings_content(&$a) {
return $o;
}
if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
if((argc() > 3) && (argv(2) === 'delete')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
dbesc($a->argv[3]),
dbesc(argv(3)),
local_user());
goaway($a->get_baseurl(true)."/settings/oauth/");
return;
@ -508,7 +529,7 @@ function settings_content(&$a) {
return $o;
}
if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
if((argc() > 1) && (argv(1) === 'addon')) {
$settings_addons = "";
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
@ -527,7 +548,7 @@ function settings_content(&$a) {
return $o;
}
if(($a->argc > 1) && ($a->argv[1] === 'connectors')) {
if((argc() > 1) && (argv(1) === 'connectors')) {
$settings_connectors = "";
@ -551,7 +572,7 @@ function settings_content(&$a) {
/*
* DISPLAY SETTINGS
*/
if(($a->argc > 1) && ($a->argv[1] === 'display')) {
if((argc() > 1) && (argv(1) === 'display')) {
$default_theme = get_config('system','theme');
if(! $default_theme)
$default_theme = 'default';
@ -632,6 +653,12 @@ function settings_content(&$a) {
* ACCOUNT SETTINGS
*/
if(argv(1) === 'channel') {
require_once('include/acl_selectors.php');
$p = q("SELECT * FROM `profile` WHERE `is_default` = 1 AND `uid` = %d LIMIT 1",
@ -765,9 +792,6 @@ function settings_content(&$a) {
$invisible = ((! $profile['publish']) ? true : false);
if($invisible)
info( t('Profile is <strong>not published</strong>.') . EOL );
$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/channel/' . $nickname : '');
@ -799,7 +823,7 @@ function settings_content(&$a) {
$group_select = mini_group_select(local_user(),$a->user['def_gid']);
$o .= replace_macros($stpl,array(
'$ptitle' => t('Account Settings'),
'$ptitle' => t('Channel Settings'),
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(true),
@ -810,8 +834,6 @@ function settings_content(&$a) {
'$h_pass' => t('Password Settings'),
'$password1'=> array('npassword', t('New Password:'), '', ''),
'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
'$oid_enable' => (! get_config('system','no_openid')),
'$openid' => $openid_field,
'$h_basic' => t('Basic Settings'),
'$username' => array('username', t('Full Name:'), $username,''),
@ -872,6 +894,6 @@ function settings_content(&$a) {
$o .= '</form>' . "\r\n";
return $o;
}
}}