Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3778 plus install fixes #3779

Merged
merged 3 commits into from
Mar 31, 2024
Merged

Fix 3778 plus install fixes #3779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69618a3
! fix #3778 plus add another global option
Spuds Mar 31, 2024
29de37a
! install tweaks for hide email
Spuds Mar 31, 2024
b1411ec
! missed one in test setup
Spuds Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/SetupDbUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public function update()
{db_prefix}members',
[
'member_name' => 'string-25', 'real_name' => 'string-25', 'passwd' => 'string', 'email_address' => 'string',
'id_group' => 'int', 'posts' => 'int', 'date_registered' => 'int', 'hide_email' => 'int',
'id_group' => 'int', 'posts' => 'int', 'date_registered' => 'int',
'password_salt' => 'string', 'lngfile' => 'string', 'avatar' => 'string',
'member_ip' => 'string', 'member_ip2' => 'string', 'buddy_list' => 'string', 'pm_ignore_list' => 'string',
'message_labels' => 'string', 'website_title' => 'string', 'website_url' => 'string',
Expand All @@ -281,7 +281,7 @@ public function update()
],
[
'test_admin', 'test_admin', $passwd, 'email@testadmin.tld',
1, 0, time(), 0,
1, 0, time(),
substr(md5(mt_rand()), 0, 4), '', '',
'123.123.123.123', '123.123.123.123', '', '',
'', '', '',
Expand Down
2 changes: 1 addition & 1 deletion install/Install_Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ private function action_adminAccount()
$db_prefix . 'members',
[
'member_name' => 'string-25', 'real_name' => 'string-25', 'passwd' => 'string', 'email_address' => 'string',
'id_group' => 'int', 'posts' => 'int', 'date_registered' => 'int', 'hide_email' => 'int',
'id_group' => 'int', 'posts' => 'int', 'date_registered' => 'int',
'password_salt' => 'string', 'lngfile' => 'string', 'avatar' => 'string',
'member_ip' => 'string', 'member_ip2' => 'string', 'buddy_list' => 'string', 'pm_ignore_list' => 'string',
'message_labels' => 'string', 'website_title' => 'string', 'website_url' => 'string',
Expand Down
1 change: 0 additions & 1 deletion install/install_2-0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,6 @@ public function table_members()
array('name' => 'birthdate', 'type' => 'date', 'default' => '0001-01-01'),
array('name' => 'website_title', 'type' => 'varchar', 'size' => 255, 'default' => ''),
array('name' => 'website_url', 'type' => 'varchar', 'size' => 255, 'default' => ''),
array('name' => 'hide_email', 'type' => 'tinyint', 'size' => 4, 'default' => 0),
array('name' => 'show_online', 'type' => 'tinyint', 'size' => 4, 'default' => 1),
array('name' => 'time_format', 'type' => 'varchar', 'size' => 80, 'default' => ''),
array('name' => 'signature', 'type' => 'text'),
Expand Down
20 changes: 20 additions & 0 deletions install/upgrade_2-0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,4 +746,24 @@ public function remove_sendtopic()
)
);
}

public function preparing_hideemail_title()
{
return 'Removing hide email option (always on now)...';
}

public function preparing_hideemail()
{
return array(
array(
'debug_title' => 'Dropping column hide_email...',
'function' => function () {
if ($this->table->column_exists('{db_prefix}members', 'hide_email') !== false)
{
$this->table->remove_column('{db_prefix}members', 'hide_email');
}
}
)
);
}
}
1 change: 1 addition & 0 deletions sources/ElkArte/Languages/Profile/English.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@
$txt['whois_arin'] = 'ARIN (North America, a portion of the Caribbean and sub-Saharan Africa)';
$txt['whois_lacnic'] = 'LACNIC (Latin American and Caribbean region)';
$txt['whois_ripe'] = 'RIPE (Europe, the Middle East and parts of Africa and Asia)';
$txt['whois_iplocation'] = 'IPLOCATION (Worldwide)';

$txt['moderator_why_missing'] = 'why isn\'t moderator here?';
$txt['username_change'] = 'change';
Expand Down
19 changes: 10 additions & 9 deletions sources/ElkArte/Profile/ProfileHistory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use ElkArte\Action;
use ElkArte\Exceptions\Exception;
use ElkArte\Languages\Txt;
use ElkArte\Member;
use ElkArte\MembersList;

/**
Expand All @@ -30,7 +31,7 @@ class ProfileHistory extends AbstractController
/** @var int Member id for the history being viewed */
private $_memID = 0;

/** @var \ElkArte\Member The \ElkArte\Member object is stored here to avoid some global */
/** @var Member The \ElkArte\Member object is stored here to avoid some global */
private $_profile;

/**
Expand Down Expand Up @@ -483,26 +484,26 @@ public function action_trackip()
if ($context['single_ip'])
{
$context['whois_servers'] = [
'afrinic' => [
'name' => $txt['whois_afrinic'],
'url' => 'http://www.afrinic.net/whois?searchtext=' . $context['ip'],
],
'apnic' => [
'name' => $txt['whois_apnic'],
'url' => 'http://wq.apnic.net/apnic-bin/whois.pl?searchtext=' . $context['ip'],
'url' => 'https://wq.apnic.net/apnic-bin/whois.pl?searchtext=' . $context['ip'],
],
'arin' => [
'name' => $txt['whois_arin'],
'url' => 'http://whois.arin.net/rest/ip/' . $context['ip'],
'url' => 'https://whois.arin.net/rest/ip/' . $context['ip'],
],
'lacnic' => [
'name' => $txt['whois_lacnic'],
'url' => 'http://lacnic.net/cgi-bin/lacnic/whois?query=' . $context['ip'],
'url' => 'https://query.milacnic.lacnic.net/search?id=' . $context['ip'],
],
'ripe' => [
'name' => $txt['whois_ripe'],
'url' => 'https://apps.db.ripe.net/search/query.html?searchtext=' . $context['ip'],
'url' => 'https://apps.db.ripe.net/db-web-ui/query?searchtext=' . $context['ip'],
],
'iplocation' => [
'name' => $txt['whois_iplocation'],
'url' => 'https://www.iplocation.net/?query=' . $context['ip'],
]
];

// Let integration add whois servers easily
Expand Down
Loading