aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot.php2
-rw-r--r--include/Contact.php4
-rw-r--r--include/ItemObject.php6
-rw-r--r--include/activities.php6
-rw-r--r--include/conversation.php6
-rw-r--r--include/identity.php2
-rw-r--r--install/database.sql12
-rw-r--r--mod/abook.php4
-rw-r--r--mod/acl.php2
-rw-r--r--mod/home.php4
-rw-r--r--mod/settings.php408
11 files changed, 239 insertions, 217 deletions
diff --git a/boot.php b/boot.php
index c84924e32..93180ca35 100644
--- a/boot.php
+++ b/boot.php
@@ -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);
/**
diff --git a/include/Contact.php b/include/Contact.php
index f442f112c..c3600b9a3 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -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 '';
}
diff --git a/include/ItemObject.php b/include/ItemObject.php
index b09cd470e..84f45054f 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -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'),
diff --git a/include/activities.php b/include/activities.php
index d9a39e2d8..e0717788a 100644
--- a/include/activities.php
+++ b/include/activities.php
@@ -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
));
diff --git a/include/conversation.php b/include/conversation.php
index 3c0a0831d..d9a5619a2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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'];
diff --git a/include/identity.php b/include/identity.php
index 196ceece5..21cecaabc 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -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),
diff --git a/install/database.sql b/install/database.sql
index 5c0e2d85b..92a8df651 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -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',
@@ -700,7 +700,7 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
`v` mediumtext NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `access` (`uid`,`cat`,`k`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `photo` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -734,7 +734,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
KEY `type` (`type`),
KEY `contact-id` (`contact-id`),
KEY `aid` (`aid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `profile` (
`id` int(11) NOT NULL AUTO_INCREMENT,
@@ -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;
diff --git a/mod/abook.php b/mod/abook.php
index 5ef43a653..10cab3386 100644
--- a/mod/abook.php
+++ b/mod/abook.php
@@ -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;
}
}
diff --git a/mod/acl.php b/mod/acl.php
index 9d13811a7..33b7b22c8 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -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 ",
diff --git a/mod/home.php b/mod/home.php
index bd045c3cb..f70ff1d02 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -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']);
}}
diff --git a/mod/settings.php b/mod/settings.php
index cfb0a3b26..430fc5187 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -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(! local_user()) {
- notice( t('Permission denied.') . EOL );
- return;
+ if(argc() == 1) {
+ $a->argc = 2;
+ $a->argv[] = 'channel';
}
- if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+
+ if(! local_user()) {
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,246 +653,247 @@ function settings_content(&$a) {
* ACCOUNT SETTINGS
*/
- require_once('include/acl_selectors.php');
- $p = q("SELECT * FROM `profile` WHERE `is_default` = 1 AND `uid` = %d LIMIT 1",
- intval(local_user())
- );
- if(count($p))
- $profile = $p[0];
- load_pconfig(local_user(),'expire');
- $channel = $a->get_channel();
- $username = $channel['channel_name'];
- $email = $a->account['account_email'];
- $nickname = $channel['channel_address'];
- $timezone = $channel['channel_timezone'];
- $notify = $channel['channel_notifyflags'];
- $defloc = $channel['channel_location'];
+ if(argv(1) === 'channel') {
+
+ require_once('include/acl_selectors.php');
+
+ $p = q("SELECT * FROM `profile` WHERE `is_default` = 1 AND `uid` = %d LIMIT 1",
+ intval(local_user())
+ );
+ if(count($p))
+ $profile = $p[0];
- $maxreq = $channel['channel_max_friend_req'];
- $expire = get_pconfig(local_user(),'expire','content_expire_days');
+ load_pconfig(local_user(),'expire');
- $blockwall = $a->user['blockwall'];
- $blocktags = $a->user['blocktags'];
- $unkmail = $a->user['unkmail'];
- $cntunkmail = $a->user['cntunkmail'];
+ $channel = $a->get_channel();
- $expire_items = get_pconfig(local_user(), 'expire','items');
- $expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
+ $username = $channel['channel_name'];
+ $email = $a->account['account_email'];
+ $nickname = $channel['channel_address'];
+ $timezone = $channel['channel_timezone'];
+ $notify = $channel['channel_notifyflags'];
+ $defloc = $channel['channel_location'];
+
+ $maxreq = $channel['channel_max_friend_req'];
+ $expire = get_pconfig(local_user(),'expire','content_expire_days');
+
+ $blockwall = $a->user['blockwall'];
+ $blocktags = $a->user['blocktags'];
+ $unkmail = $a->user['unkmail'];
+ $cntunkmail = $a->user['cntunkmail'];
+
+ $expire_items = get_pconfig(local_user(), 'expire','items');
+ $expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
- $expire_notes = get_pconfig(local_user(), 'expire','notes');
- $expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1
+ $expire_notes = get_pconfig(local_user(), 'expire','notes');
+ $expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1
- $expire_starred = get_pconfig(local_user(), 'expire','starred');
- $expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1
+ $expire_starred = get_pconfig(local_user(), 'expire','starred');
+ $expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1
- $expire_photos = get_pconfig(local_user(), 'expire','photos');
- $expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
+ $expire_photos = get_pconfig(local_user(), 'expire','photos');
+ $expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
- $expire_network_only = get_pconfig(local_user(), 'expire','network_only');
- $expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0
+ $expire_network_only = get_pconfig(local_user(), 'expire','network_only');
+ $expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0
- $suggestme = get_pconfig(local_user(), 'system','suggestme');
- $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
+ $suggestme = get_pconfig(local_user(), 'system','suggestme');
+ $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
- $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend');
- $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0
+ $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend');
+ $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0
- $post_joingroup = get_pconfig(local_user(), 'system','post_joingroup');
- $post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0
+ $post_joingroup = get_pconfig(local_user(), 'system','post_joingroup');
+ $post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0
- $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange');
- $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0
+ $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange');
+ $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0
- $timezone = date_default_timezone_get();
+ $timezone = date_default_timezone_get();
- $pageset_tpl = get_markup_template('pagetypes.tpl');
- $pagetype = replace_macros($pageset_tpl,array(
- '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
- t('This account is a normal personal profile'),
- ($a->user['page-flags'] == PAGE_NORMAL)),
+ $pageset_tpl = get_markup_template('pagetypes.tpl');
+ $pagetype = replace_macros($pageset_tpl,array(
+ '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
+ t('This account is a normal personal profile'),
+ ($a->user['page-flags'] == PAGE_NORMAL)),
- '$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
- t('Automatically approve all connection/friend requests as read-only fans'),
- ($a->user['page-flags'] == PAGE_SOAPBOX)),
+ '$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
+ t('Automatically approve all connection/friend requests as read-only fans'),
+ ($a->user['page-flags'] == PAGE_SOAPBOX)),
- '$page_community' => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY,
- t('Automatically approve all connection/friend requests as read-write fans'),
- ($a->user['page-flags'] == PAGE_COMMUNITY)),
+ '$page_community' => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY,
+ t('Automatically approve all connection/friend requests as read-write fans'),
+ ($a->user['page-flags'] == PAGE_COMMUNITY)),
- '$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
- t('Automatically approve all connection/friend requests as friends'),
- ($a->user['page-flags'] == PAGE_FREELOVE)),
+ '$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
+ t('Automatically approve all connection/friend requests as friends'),
+ ($a->user['page-flags'] == PAGE_FREELOVE)),
- '$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
- t('Private forum - approved members only'),
- ($a->user['page-flags'] == PAGE_PRVGROUP)),
+ '$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
+ t('Private forum - approved members only'),
+ ($a->user['page-flags'] == PAGE_PRVGROUP)),
- ));
+ ));
- $opt_tpl = get_markup_template("field_yesno.tpl");
- if(get_config('system','publish_all')) {
- $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
- }
- else {
- $profile_in_dir = replace_macros($opt_tpl,array(
- '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
- ));
- }
+ $opt_tpl = get_markup_template("field_yesno.tpl");
+ if(get_config('system','publish_all')) {
+ $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
+ }
+ else {
+ $profile_in_dir = replace_macros($opt_tpl,array(
+ '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
+ ));
+ }
- $profile_in_net_dir = '';
+ $profile_in_net_dir = '';
- $hide_friends = replace_macros($opt_tpl,array(
- '$field' => array('hide_friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide_friends'], '', array(t('No'),t('Yes'))),
- ));
+ $hide_friends = replace_macros($opt_tpl,array(
+ '$field' => array('hide_friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide_friends'], '', array(t('No'),t('Yes'))),
+ ));
- $hide_wall = replace_macros($opt_tpl,array(
- '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
+ $hide_wall = replace_macros($opt_tpl,array(
+ '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
- ));
+ ));
- $blockwall = replace_macros($opt_tpl,array(
- '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
+ $blockwall = replace_macros($opt_tpl,array(
+ '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
- ));
+ ));
- $blocktags = replace_macros($opt_tpl,array(
- '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
+ $blocktags = replace_macros($opt_tpl,array(
+ '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
- ));
+ ));
- $suggestme = replace_macros($opt_tpl,array(
- '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))),
+ $suggestme = replace_macros($opt_tpl,array(
+ '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))),
- ));
+ ));
- $unkmail = replace_macros($opt_tpl,array(
- '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))),
+ $unkmail = replace_macros($opt_tpl,array(
+ '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))),
- ));
-
- $invisible = ((! $profile['publish']) ? true : false);
+ ));
- if($invisible)
- info( t('Profile is <strong>not published</strong>.') . EOL );
+ $invisible = ((! $profile['publish']) ? true : false);
- $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/channel/' . $nickname : '');
+ $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/channel/' . $nickname : '');
- $tpl_addr = get_markup_template("settings_nick_set.tpl");
+ $tpl_addr = get_markup_template("settings_nick_set.tpl");
- $prof_addr = replace_macros($tpl_addr,array(
- '$desc' => t('Your webbie (web-id) is'),
- '$nickname' => $nickname,
- '$subdir' => $subdir,
- '$basepath' => $a->get_hostname()
- ));
+ $prof_addr = replace_macros($tpl_addr,array(
+ '$desc' => t('Your webbie (web-id) is'),
+ '$nickname' => $nickname,
+ '$subdir' => $subdir,
+ '$basepath' => $a->get_hostname()
+ ));
- $stpl = get_markup_template('settings.tpl');
+ $stpl = get_markup_template('settings.tpl');
- $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+ $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
- $expire_arr = array(
- 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
- 'advanced' => t('Advanced expiration settings'),
- 'label' => t('Advanced Expiration'),
- 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))),
- 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
- 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
- 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),
- 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))),
- );
+ $expire_arr = array(
+ 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
+ 'advanced' => t('Advanced expiration settings'),
+ 'label' => t('Advanced Expiration'),
+ 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))),
+ 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
+ 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
+ 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),
+ 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))),
+ );
- require_once('include/group.php');
- $group_select = mini_group_select(local_user(),$a->user['def_gid']);
+ require_once('include/group.php');
+ $group_select = mini_group_select(local_user(),$a->user['def_gid']);
- $o .= replace_macros($stpl,array(
- '$ptitle' => t('Account Settings'),
+ $o .= replace_macros($stpl,array(
+ '$ptitle' => t('Channel Settings'),
- '$submit' => t('Submit'),
- '$baseurl' => $a->get_baseurl(true),
- '$uid' => local_user(),
- '$form_security_token' => get_form_security_token("settings"),
- '$nickname_block' => $prof_addr,
+ '$submit' => t('Submit'),
+ '$baseurl' => $a->get_baseurl(true),
+ '$uid' => local_user(),
+ '$form_security_token' => get_form_security_token("settings"),
+ '$nickname_block' => $prof_addr,
- '$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_pass' => t('Password Settings'),
+ '$password1'=> array('npassword', t('New Password:'), '', ''),
+ '$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
- '$h_basic' => t('Basic Settings'),
- '$username' => array('username', t('Full Name:'), $username,''),
- '$email' => array('email', t('Email Address:'), $email, ''),
- '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
- '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''),
- '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
+ '$h_basic' => t('Basic Settings'),
+ '$username' => array('username', t('Full Name:'), $username,''),
+ '$email' => array('email', t('Email Address:'), $email, ''),
+ '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
+ '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''),
+ '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
- '$h_prv' => t('Security and Privacy Settings'),
+ '$h_prv' => t('Security and Privacy Settings'),
- '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")),
- '$permissions' => t('Default Post Permissions'),
- '$permdesc' => t("\x28click to open/close\x29"),
- '$visibility' => $profile['net-publish'],
- '$aclselect' => populate_acl($a->user,$celeb),
- '$suggestme' => $suggestme,
- '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
- '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
+ '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")),
+ '$permissions' => t('Default Post Permissions'),
+ '$permdesc' => t("\x28click to open/close\x29"),
+ '$visibility' => $profile['net-publish'],
+ '$aclselect' => populate_acl($a->user,$celeb),
+ '$suggestme' => $suggestme,
+ '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
+ '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
- '$group_select' => $group_select,
+ '$group_select' => $group_select,
- '$expire' => $expire_arr,
+ '$expire' => $expire_arr,
- '$profile_in_dir' => $profile_in_dir,
- '$profile_in_net_dir' => $profile_in_net_dir,
- '$hide_friends' => $hide_friends,
- '$hide_wall' => $hide_wall,
- '$unkmail' => $unkmail,
- '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")),
+ '$profile_in_dir' => $profile_in_dir,
+ '$profile_in_net_dir' => $profile_in_net_dir,
+ '$hide_friends' => $hide_friends,
+ '$hide_wall' => $hide_wall,
+ '$unkmail' => $unkmail,
+ '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")),
- '$h_not' => t('Notification Settings'),
- '$activity_options' => t('By default post a status message when:'),
- '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''),
- '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, ''),
- '$post_profilechange' => array('post_profilechange', t('making an <em>interesting</em> profile change'), $post_profilechange, ''),
- '$lbl_not' => t('Send a notification email when:'),
- '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
- '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
- '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
- '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
- '$notify5' => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
- '$notify6' => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),
- '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
- '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
+ '$h_not' => t('Notification Settings'),
+ '$activity_options' => t('By default post a status message when:'),
+ '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''),
+ '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, ''),
+ '$post_profilechange' => array('post_profilechange', t('making an <em>interesting</em> profile change'), $post_profilechange, ''),
+ '$lbl_not' => t('Send a notification email when:'),
+ '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
+ '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
+ '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
+ '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
+ '$notify5' => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
+ '$notify6' => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),
+ '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
+ '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
- '$h_advn' => t('Advanced Account/Page Type Settings'),
- '$h_descadvn' => t('Change the behaviour of this account for special situations'),
- '$pagetype' => $pagetype,
+ '$h_advn' => t('Advanced Account/Page Type Settings'),
+ '$h_descadvn' => t('Change the behaviour of this account for special situations'),
+ '$pagetype' => $pagetype,
- ));
-
- call_hooks('settings_form',$o);
+ ));
- $o .= '</form>' . "\r\n";
+ call_hooks('settings_form',$o);
- return $o;
+ $o .= '</form>' . "\r\n";
+ return $o;
+ }
}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 00:16:57 +0000