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

Jump to bottom

make sure to add ipv4 of host before ipv6 #114

Open
wants to merge 3 commits into
base: 1.5.3-maintenance
Choose a base branch
from
Open

make sure to add ipv4 of host before ipv6 #114

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
e0ef88e
make sure to add ipv4 of host before ipv6
alecs Feb 28, 2024
8183ad6
change mariadb to 10.4
alecs Mar 29, 2024
90bf4dc
fix ticket interface, including reply which returned sql error due to…
alecs Mar 29, 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
14 changes: 7 additions & 7 deletions autoinstaller/Packages/debian-buster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,29 +464,29 @@
description="SQL server"
has_alternatives="1"
>
<mariadb_10.3
<mariadb_10.4
allow_upgrade_from="
remote_server,mariadb_10.0,mariadb_10.1,mariadb_10.2
"
class="Servers::sqld::mariadb"
default="1"
description="MariaDB 10.3"
description="MariaDB 10.4"
pinning_package="
libmariadb3 mariadb-client-10.3 mariadb-common
mariadb-server-core-10.3 mysql-common
libmariadb3 mariadb-client-10.4 mariadb-common
mariadb-server-core-10.4 mysql-common
"
pinning_pin="release o=Debian"
pinning_pin_priority="1001"
>
<package>libmariadb3</package>
<package>mariadb-client-10.3</package>
<package>mariadb-client-10.4</package>
<package>mariadb-common</package>
<package
pre_install_tasks="/bin/mkdir -p /etc/mysql/mariadb.conf.d"
>
mariadb-server-10.3
mariadb-server-10.4
</package>
</mariadb_10.3>
</mariadb_10.4>
<remote_server
class="Servers::sqld::remote"
description="Remote SQL server"
Expand Down
8 changes: 7 additions & 1 deletion engine/PerlLib/Servers/named/bind.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,13 +889,19 @@ sub _addDmnDb
$tplFileC
);
my $net = iMSCP::Net->getInstance();
my $domainIP = $net->isRoutableAddr( $data->{'DOMAIN_IP'} )
my $domainIP = ($net->isRoutableAddr( $data->{'DOMAIN_IP'} ) && $net->getAddrVersion($data->{'DOMAIN_IP'}) eq 'ipv4')
? $data->{'DOMAIN_IP'}
: $data->{'BASE_SERVER_PUBLIC_IP'};
my $domainIP6 = $net->getAddrVersion( $data->{'DOMAIN_IP'} ) eq 'ipv6'
? $data->{'DOMAIN_IP'}
: "none";

unless ( $nsRRb eq '' && $gRRb eq '' ) {
my @nsIPs = (
$domainIP,
( $domainIP6 ne "none"
? $domainIP6 : ()
),
( $self->{'config'}->{'SECONDARY_DNS'} eq 'no'
? () : split /(?:[;,]| )/, $self->{'config'}->{'SECONDARY_DNS'}
)
Expand Down
4 changes: 2 additions & 2 deletions gui/include/Tickets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function updateTicket(
$ticketTo = $row['ticket_from'];
$ticketFrom = $row['ticket_to'];
}

$ticketStatus = $row['ticket_status'];
exec_query(
'
INSERT INTO tickets (
Expand All @@ -197,7 +197,7 @@ function updateTicket(
)
',
[
$ticketFrom, $ticketTo, NULL, $ticketId, $urgency, time(),
$ticketFrom, $ticketTo, $ticketStatus, $ticketId, $urgency, time(),
$subject, $userMessage
]
);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/admin/ticket_closed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('admin');
EventAggregator::getInstance()->dispatch(Events::onAdminScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/admin/ticket_delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
use iMSCP\Event\Events;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('admin');
EventAggregator::getInstance()->dispatch(Events::onAdminScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/admin/ticket_system.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('admin');
EventAggregator::getInstance()->dispatch(Events::onAdminScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/admin/ticket_view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('admin');
EventAggregator::getInstance()->dispatch(Events::onAdminScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/client/ticket_closed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('user');
EventAggregator::getInstance()->dispatch(Events::onClientScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/client/ticket_create.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('user');
EventAggregator::getInstance()->dispatch(Events::onClientScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/client/ticket_delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
use iMSCP\Event\Events;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('user');
EventAggregator::getInstance()->dispatch(Events::onClientScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/client/ticket_system.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('user');
EventAggregator::getInstance()->dispatch(Events::onClientScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/client/ticket_view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('user');
EventAggregator::getInstance()->dispatch(Events::onClientScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/reseller/ticket_closed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('reseller');
EventAggregator::getInstance()->dispatch(Events::onResellerScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/reseller/ticket_create.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('reseller');
EventAggregator::getInstance()->dispatch(Events::onResellerScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/reseller/ticket_delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
use iMSCP\Event\Events;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('reseller');
EventAggregator::getInstance()->dispatch(Events::onResellerScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/reseller/ticket_system.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('reseller');
EventAggregator::getInstance()->dispatch(Events::onResellerScriptStart);
Expand Down
2 changes: 1 addition & 1 deletion gui/public/reseller/ticket_view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
use iMSCP\TemplateEngine;

require_once 'imscp-lib.php';
require_once LIBRARY_PATH . '/Functions/Tickets.php';
require_once GUI_ROOT_DIR . '/include/Tickets.php';

check_login('reseller');
EventAggregator::getInstance()->dispatch(Events::onResellerScriptStart);
Expand Down