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

bugfix: unable to reset profile fields to defaults in admin/profs by emptying the textarea

Browse Source
This commit is contained in:
zotlabs 2018-03-04 15:29:10 -08:00 committed by Mario Vavti
parent 77a8a2b9ac
commit af46c192bf
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Zotlabs/Module/Admin/Profs.php
View File

@ -9,17 +9,37 @@ class Profs {
if(array_key_exists('basic',$_REQUEST)) { if(array_key_exists('basic',$_REQUEST)) {
$arr = explode(',',$_REQUEST['basic']); $arr = explode(',',$_REQUEST['basic']);
for($x = 0; $x < count($arr); $x ++) array_walk($arr,'array_trim');
if(trim($arr[$x])) $narr = [];
$arr[$x] = trim($arr[$x]); if(count($arr)) {
set_config('system','profile_fields_basic',$arr); foreach($arr as $a) {
if(strlen($a)) {
$narr[] = $a;
}
}
}
if(! $narr)
del_config('system','profile_fields_basic');
else
set_config('system','profile_fields_basic',$narr);
if(array_key_exists('advanced',$_REQUEST)) { if(array_key_exists('advanced',$_REQUEST)) {
$arr = explode(',',$_REQUEST['advanced']); $arr = explode(',',$_REQUEST['advanced']);
for($x = 0; $x < count($arr); $x ++) array_walk($arr,'array_trim');
if(trim($arr[$x])) $narr = [];
$arr[$x] = trim($arr[$x]); if(count($arr)) {
set_config('system','profile_fields_advanced',$arr); foreach($arr as $a) {
if(strlen($a)) {
$narr[] = $a;
}
}
}
if(! $narr)
del_config('system','profile_fields_advanced');
else
set_config('system','profile_fields_advanced',$narr);
} }
goaway(z_root() . '/admin/profs'); goaway(z_root() . '/admin/profs');
} }
@ -98,6 +118,7 @@ class Profs {
$basic = ''; $basic = '';
$barr = array(); $barr = array();
$fields = get_profile_fields_basic(); $fields = get_profile_fields_basic();
if(! $fields) if(! $fields)
$fields = get_profile_fields_basic(1); $fields = get_profile_fields_basic(1);
if($fields) { if($fields) {

1
include/channel.php
View File

@ -1897,6 +1897,7 @@ function is_public_profile() {
function get_profile_fields_basic($filter = 0) { function get_profile_fields_basic($filter = 0) {
$profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null); $profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null);
if(! $profile_fields_basic) if(! $profile_fields_basic)
$profile_fields_basic = array('fullname','pdesc','chandesc','comms','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact'); $profile_fields_basic = array('fullname','pdesc','chandesc','comms','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact');