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

fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit.

Browse Source
This commit is contained in:
zotlabs 2018-12-17 11:32:59 -08:00
parent 04a45a407e
commit a33ed05bec
5 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Lib/Libzot.php
View File

@ -397,9 +397,7 @@ logger('4');
} }
} }
$closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness'); $closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness',80);
if($closeness === false)
$closeness = 80;
$y = abook_store_lowlevel( $y = abook_store_lowlevel(
[ [

27
Zotlabs/Module/Connedit.php
View File

@ -101,7 +101,8 @@ class Connedit extends \Zotlabs\Web\Controller {
} }
$profile_id = $_POST['profile_assign']; $profile_id = ((array_key_exists('profile_assign',$_POST)) ? $_POST['profile_assign'] : $orig_record[0]['abook_profile']);
if($profile_id) { if($profile_id) {
$r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND uid = %d LIMIT 1", $r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND uid = %d LIMIT 1",
dbesc($profile_id), dbesc($profile_id),
@ -113,18 +114,23 @@ class Connedit extends \Zotlabs\Web\Controller {
} }
} }
$abook_incl = escape_tags($_POST['abook_incl']); $abook_incl = ((array_key_exists('abook_incl',$_POST)) ? escape_tags($_POST['abook_incl']) : $orig_record[0]['abook_incl']);
$abook_excl = escape_tags($_POST['abook_excl']); $abook_excl = ((array_key_exists('abook_excl',$_POST)) ? escape_tags($_POST['abook_excl']) : $orig_record[0]['abook_excl']);
$hidden = intval($_POST['hidden']); $hidden = intval($_POST['hidden']);
$priority = intval($_POST['poll']); $priority = intval($_POST['poll']);
if($priority > 5 || $priority < 0) if($priority > 5 || $priority < 0)
$priority = 0; $priority = 0;
if(! array_key_exists('closeness',$_POST)) {
$_POST['closeness'] = 80;
}
$closeness = intval($_POST['closeness']); $closeness = intval($_POST['closeness']);
if($closeness < 0) if($closeness < 0 || $closeness > 99) {
$closeness = 99; $closeness = 80;
}
$rating = intval($_POST['rating']); $rating = intval($_POST['rating']);
if($rating < (-10)) if($rating < (-10))
@ -231,6 +237,8 @@ class Connedit extends \Zotlabs\Web\Controller {
} }
$abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']); $abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']);
$r = q("UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d, $r = q("UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d,
abook_incl = '%s', abook_excl = '%s' abook_incl = '%s', abook_excl = '%s'
@ -733,9 +741,12 @@ class Connedit extends \Zotlabs\Web\Controller {
} }
$slider_tpl = get_markup_template('contact_slider.tpl'); $slider_tpl = get_markup_template('contact_slider.tpl');
$slideval = intval($contact['abook_closeness']);
$slide = replace_macros($slider_tpl,array( $slide = replace_macros($slider_tpl,array(
'$min' => 1, '$min' => 1,
'$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), '$val' => $slideval,
'$labels' => $label_str, '$labels' => $label_str,
)); ));
} }
@ -892,7 +903,7 @@ class Connedit extends \Zotlabs\Web\Controller {
'$inherited' => t('inherited'), '$inherited' => t('inherited'),
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']), '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']),
'$close' => $contact['abook_closeness'], '$close' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 80),
'$them' => t('Their Settings'), '$them' => t('Their Settings'),
'$me' => t('My Settings'), '$me' => t('My Settings'),
'$perms' => $perms, '$perms' => $perms,

12
Zotlabs/Update/_1230.php Normal file
View File

@ -0,0 +1,12 @@
<?php
namespace Zotlabs\Update;
class _1230 {
function run() {
q("update abook set abook_closeness = 80 where abook_closeness = 0 and abook_self = 0");
return UPDATE_SUCCESS;
}
}

2
boot.php
View File

@ -53,7 +53,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '3.9.5' ); define ( 'STD_VERSION', '3.9.5' );
define ( 'ZOT_REVISION', '6.0a' ); define ( 'ZOT_REVISION', '6.0a' );
define ( 'DB_UPDATE_VERSION', 1229 ); define ( 'DB_UPDATE_VERSION', 1230 );
define ( 'PROJECT_BASE', __DIR__ ); define ( 'PROJECT_BASE', __DIR__ );

4
include/follow.php
View File

@ -266,9 +266,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
} }
} }
else { else {
$closeness = get_pconfig($uid,'system','new_abook_closeness'); $closeness = get_pconfig($uid,'system','new_abook_closeness',80);
if($closeness === false)
$closeness = 80;
$r = abook_store_lowlevel( $r = abook_store_lowlevel(
[ [