Browse Source

ability to hide profile and wall from unknown people

pull/1/head
Friendika 9 years ago
parent
commit
e3d1ef8ef7
10 changed files with 63 additions and 7 deletions
  1. +6
    -2
      boot.php
  2. +1
    -0
      database.sql
  3. +1
    -1
      include/template_processor.php
  4. +5
    -2
      mod/profile.php
  5. +16
    -2
      mod/profiles.php
  6. +4
    -0
      update.php
  7. +16
    -0
      view/profile-hide-wall.tpl
  8. +2
    -0
      view/profile_edit.tpl
  9. +6
    -0
      view/theme/duepuntozero/style.css
  10. +6
    -0
      view/theme/loozah/style.css

+ 6
- 2
boot.php View File

@ -4,9 +4,9 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
define ( 'FRIENDIKA_VERSION', '2.2.989' );
define ( 'FRIENDIKA_VERSION', '2.2.990' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1055 );
define ( 'DB_UPDATE_VERSION', 1056 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@ -2361,6 +2361,10 @@ 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>' : '');
if($profile['hidewall'] && (! local_user()) && (! remote_user())) {
$location = $gender = $marital = $homepage = '';
}
$tpl = get_markup_template('profile_vcard.tpl');
$o .= replace_macros($tpl, array(


+ 1
- 0
database.sql View File

@ -288,6 +288,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`profile-name` char(255) NOT NULL,
`is-default` tinyint(1) NOT NULL DEFAULT '0',
`hide-friends` tinyint(1) NOT NULL DEFAULT '0',
`hidewall` tinyint(1) NOT NULL DEFAULT '0',
`name` char(255) NOT NULL,
`pdesc` char(255) NOT NULL,
`dob` char(32) NOT NULL DEFAULT '0000-00-00',


+ 1
- 1
include/template_processor.php View File

@ -128,7 +128,7 @@
#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
$s = $this->_build_nodes($s);
$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
$s = str_replace($this->search,$this->replace, (string) $s);
$s = str_replace($this->search,$this->replace, $s);
return $s;
}


+ 5
- 2
mod/profile.php View File

@ -51,11 +51,14 @@ function profile_init(&$a) {
function profile_content(&$a, $update = 0) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
if(get_config('system','block_public') && (! local_user()) && (! remote_user())) {
return login();
}
if($a->profile['hidewall'] && (! local_user()) && (! remote_user())) {
notice( t('Access to this profile has been restricted.') . EOL);
return;
}
require_once("include/bbcode.php");
require_once('include/security.php');


+ 16
- 2
mod/profiles.php View File

@ -129,6 +129,7 @@ function profiles_post(&$a) {
$work = escape_tags(trim($_POST['work']));
$education = escape_tags(trim($_POST['education']));
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
$r = q("UPDATE `profile`
@ -160,7 +161,8 @@ function profiles_post(&$a) {
`romance` = '%s',
`work` = '%s',
`education` = '%s',
`hide-friends` = %d
`hide-friends` = %d,
`hidewall` = %d
WHERE `id` = %d AND `uid` = %d LIMIT 1",
dbesc($profile_name),
dbesc($name),
@ -191,6 +193,7 @@ function profiles_post(&$a) {
dbesc($work),
dbesc($education),
intval($hide_friends),
intval($hidewall),
intval($a->argv[1]),
intval($_SESSION['uid'])
);
@ -351,13 +354,23 @@ function profiles_content(&$a) {
$opt_tpl = get_markup_template("profile-hide-friends.tpl");
$hide_friends = replace_macros($opt_tpl,array(
'$desc' => t('Hide my contact/friend list from viewers of this profile?'),
'$desc' => t('Hide your contact/friend list from viewers of this profile?'),
'$yes_str' => t('Yes'),
'$no_str' => t('No'),
'$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
));
$opt_tpl = get_markup_template("profile-hide-wall.tpl");
$hide_wall = replace_macros($opt_tpl,array(
'$desc' => t('Hide your messages from unknown viewers of this profile?'),
'$yes_str' => t('Yes'),
'$no_str' => t('No'),
'$yes_selected' => (($r[0]['hidewall']) ? " checked=\"checked\" " : ""),
'$no_selected' => (($r[0]['hidewall'] == 0) ? " checked=\"checked\" " : "")
));
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"include/country.js\" ></script>";
@ -413,6 +426,7 @@ function profiles_content(&$a) {
'$pdesc' => $r[0]['pdesc'],
'$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends,
'$hide_wall' => $hide_wall,
'$address' => $r[0]['address'],
'$locality' => $r[0]['locality'],
'$region' => $r[0]['region'],


+ 4
- 0
update.php View File

@ -483,3 +483,7 @@ function update_1053() {
function update_1054() {
q("ALTER TABLE `register` ADD `language` CHAR( 16 ) NOT NULL AFTER `password` ");
}
function update_1055() {
q("ALTER TABLE `profile` ADD `hidewall` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `hide-friends` ");
}

+ 16
- 0
view/profile-hide-wall.tpl View File

@ -0,0 +1,16 @@
<p id="hide-wall-text">
$desc
</p>
<div id="hide-wall-yes-wrapper">
<label id="hide-wall-yes-label" for="hide-wall-yes">$yes_str</label>
<input type="radio" name="hidewall" id="hide-wall-yes" $yes_selected value="1" />
<div id="hide-wall-break" ></div>
</div>
<div id="hide-wall-no-wrapper">
<label id="hide-wall-no-label" for="hide-wall-no">$no_str</label>
<input type="radio" name="hidewall" id="hide-wall-no" $no_selected value="0" />
<div id="hide-wall-end"></div>
</div>

+ 2
- 0
view/profile_edit.tpl View File

@ -52,6 +52,8 @@ $dob $age
$hide_friends
$hide_wall
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
</div>


+ 6
- 0
view/theme/duepuntozero/style.css View File

@ -701,6 +701,8 @@ input#dfrn-url {
#profile-in-dir-no,
#profile-in-netdir-yes,
#profile-in-netdir-no,
#hide-wall-yes,
#hide-wall-no,
#hide-friends-yes,
#hide-friends-no {
float: left;
@ -718,6 +720,8 @@ input#dfrn-url {
#profile-in-dir-no-label,
#profile-in-netdir-yes-label,
#profile-in-netdir-no-label,
#hide-wall-yes-label,
#hide-wall-no-label,
#hide-friends-yes-label,
#hide-friends-no-label {
margin-left: 125px;
@ -801,6 +805,8 @@ input#dfrn-url {
#profile-in-dir-end,
#profile-in-netdir-break,
#profile-in-netdir-end,
#hide-wall-break,
#hide-wall-end,
#hide-friends-break,
#hide-friends-end,
#settings-normal-break,


+ 6
- 0
view/theme/loozah/style.css View File

@ -825,6 +825,8 @@ input#dfrn-url {
#profile-in-dir-no,
#profile-in-netdir-yes,
#profile-in-netdir-no,
#hide-wall-yes,
#hide-wall-no,
#hide-friends-yes,
#hide-friends-no,
#settings-normal,
@ -839,6 +841,8 @@ input#dfrn-url {
#profile-in-dir-no-label,
#profile-in-netdir-yes-label,
#profile-in-netdir-no-label,
#hide-wall-yes-label,
#hide-wall-no-label,
#hide-friends-yes-label,
#hide-friends-no-label {
margin-left: 125px;
@ -917,6 +921,8 @@ input#dfrn-url {
#profile-in-dir-end,
#profile-in-netdir-break,
#profile-in-netdir-end,
#hide-wall-break,
#hide-wall-end,
#hide-friends-break,
#hide-friends-end,
#settings-normal-break,


Loading…
Cancel
Save