Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
lolo888
ISPConfig 3
Commits
1ca82372
Commit
1ca82372
authored
Apr 04, 2011
by
tbrehm
Browse files
Merged revisions 2181-2262 from stable branch.
parent
fcac50bb
Changes
864
Hide whitespace changes
Inline
Side-by-side
install/dist/lib/debian60.lib.php
View file @
1ca82372
...
...
@@ -96,6 +96,14 @@ class installer extends installer_base {
chgrp
(
$config_dir
.
'/'
.
$configfile
,
'root'
);
}
public
function
configure_apache
()
{
global
$conf
;
if
(
file_exists
(
'/etc/apache2/mods-available/fcgid.conf'
))
replaceLine
(
'/etc/apache2/mods-available/fcgid.conf'
,
'MaxRequestLen'
,
'MaxRequestLen 15728640'
,
0
,
1
);
parent
::
configure_apache
();
}
}
...
...
install/dist/lib/fedora.lib.php
View file @
1ca82372
...
...
@@ -105,12 +105,6 @@ class installer_dist extends installer_base {
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'relay_recipient_maps = mysql:'
.
$config_dir
.
'/mysql-virtual_relayrecipientmaps.cf'
,
'virtual_create_maildirsize = yes'
,
'virtual_maildir_extended = yes'
,
'virtual_mailbox_limit_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_mailbox_limit_maps.cf'
,
'virtual_mailbox_limit_override = yes'
,
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."'
,
'virtual_overquota_bounce = yes'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
'smtpd_sender_restrictions = check_sender_access mysql:'
.
$config_dir
.
'/mysql-virtual_sender.cf'
,
'smtpd_client_restrictions = check_client_access mysql:'
.
$config_dir
.
'/mysql-virtual_client.cf'
,
...
...
install/dist/lib/gentoo.lib.php
View file @
1ca82372
...
...
@@ -101,13 +101,6 @@ class installer extends installer_base
'smtpd_tls_key_file = '
.
$config_dir
.
'/smtpd.key'
,
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'relay_recipient_maps = mysql:'
.
$config_dir
.
'/mysql-virtual_relayrecipientmaps.cf'
,
'virtual_create_maildirsize = yes'
,
'virtual_maildir_extended = yes'
,
'virtual_mailbox_limit_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_mailbox_limit_maps.cf'
,
'virtual_mailbox_limit_override = yes'
,
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."'
,
'virtual_overquota_bounce = yes'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
'smtpd_sender_restrictions = check_sender_access mysql:'
.
$config_dir
.
'/mysql-virtual_sender.cf'
,
'smtpd_client_restrictions = check_client_access mysql:'
.
$config_dir
.
'/mysql-virtual_client.cf'
,
...
...
install/dist/lib/opensuse.lib.php
View file @
1ca82372
...
...
@@ -76,6 +76,8 @@ class installer_dist extends installer_base {
caselog
(
'chgrp '
.
$cf
[
'group'
]
.
' '
.
$config_dir
.
'/mysql-virtual_*.cf* &> /dev/null'
,
__FILE__
,
__LINE__
,
'chgrp on mysql-virtual_*.cf*'
,
'chgrp on mysql-virtual_*.cf* failed'
);
if
(
!
is_dir
(
$cf
[
'vmail_mailbox_base'
]))
mkdir
(
$cf
[
'vmail_mailbox_base'
]);
//* Creating virtual mail user and group
if
(
is_group
(
$cf
[
'vmail_groupname'
]))
{
$command
=
'groupmod -g '
.
$cf
[
'vmail_groupid'
]
.
' '
.
$cf
[
'vmail_groupname'
];
...
...
@@ -117,12 +119,6 @@ class installer_dist extends installer_base {
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'relay_recipient_maps = mysql:'
.
$config_dir
.
'/mysql-virtual_relayrecipientmaps.cf'
,
'virtual_create_maildirsize = yes'
,
'virtual_maildir_extended = yes'
,
'virtual_mailbox_limit_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_mailbox_limit_maps.cf'
,
'virtual_mailbox_limit_override = yes'
,
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."'
,
'virtual_overquota_bounce = yes'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
'smtpd_sender_restrictions = check_sender_access mysql:'
.
$config_dir
.
'/mysql-virtual_sender.cf'
,
'smtpd_client_restrictions = check_client_access mysql:'
.
$config_dir
.
'/mysql-virtual_client.cf'
,
...
...
install/lib/installer_base.lib.php
View file @
1ca82372
...
...
@@ -116,7 +116,7 @@ class installer_base {
if
(
is_installed
(
'mailman'
))
$conf
[
'mailman'
][
'installed'
]
=
true
;
if
(
is_installed
(
'apache'
)
||
is_installed
(
'apache2'
)
||
is_installed
(
'httpd'
))
$conf
[
'apache'
][
'installed'
]
=
true
;
if
(
is_installed
(
'getmail'
))
$conf
[
'getmail'
][
'installed'
]
=
true
;
if
(
is_installed
(
'courierlogger'
))
$conf
[
'courier'
][
'installed'
]
=
true
;
if
(
is_installed
(
'courierlogger'
))
$conf
[
'courier'
][
'installed'
]
=
true
;
if
(
is_installed
(
'dovecot'
))
$conf
[
'dovecot'
][
'installed'
]
=
true
;
if
(
is_installed
(
'saslsauthd'
))
$conf
[
'saslauthd'
][
'installed'
]
=
true
;
if
(
is_installed
(
'amavisd-new'
))
$conf
[
'amavis'
][
'installed'
]
=
true
;
...
...
@@ -578,12 +578,6 @@ class installer_base {
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'relay_recipient_maps = mysql:'
.
$config_dir
.
'/mysql-virtual_relayrecipientmaps.cf'
,
'virtual_create_maildirsize = yes'
,
'virtual_maildir_extended = yes'
,
'virtual_mailbox_limit_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_mailbox_limit_maps.cf'
,
'virtual_mailbox_limit_override = yes'
,
'virtual_maildir_limit_message = "The user you are trying to reach is over quota."'
,
'virtual_overquota_bounce = yes'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
'smtpd_sender_restrictions = check_sender_access mysql:'
.
$config_dir
.
'/mysql-virtual_sender.cf'
,
'smtpd_client_restrictions = check_client_access mysql:'
.
$config_dir
.
'/mysql-virtual_client.cf'
,
...
...
@@ -622,7 +616,7 @@ class installer_base {
if
(
!
stristr
(
$options
,
'dont-create-certs'
))
{
//* Create the SSL certificate
$command
=
'cd '
.
$config_dir
.
'; '
.
'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509'
;
.
'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365
0
-x509'
;
exec
(
$command
);
$command
=
'chmod o= '
.
$config_dir
.
'/smtpd.key'
;
...
...
@@ -1103,7 +1097,8 @@ class installer_base {
// Check the awsatst script
if
(
!
is_dir
(
'/usr/share/awstats/tools'
))
exec
(
'mkdir -p /usr/share/awstats/tools'
);
if
(
!
file_exists
(
'/usr/share/awstats/tools/awstats_buildstaticpages.pl'
)
&&
file_exists
(
'/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl'
))
symlink
(
'/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl'
,
'/usr/share/awstats/tools/awstats_buildstaticpages.pl'
);
if
(
file_exists
(
'/etc/awstats/awstats.conf.local'
))
replaceLine
(
'/etc/awstats/awstats.conf.local'
,
'LogFormat=4'
,
'LogFormat=1'
,
0
,
1
);
//* add a sshusers group
$command
=
'groupadd sshusers'
;
if
(
!
is_group
(
'sshusers'
))
caselog
(
$command
.
' &> /dev/null 2> /dev/null'
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
...
...
install/sql/ispconfig3.sql
View file @
1ca82372
...
...
@@ -1362,7 +1362,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
INSERT
INTO
sys_config
VALUES
(
'1'
,
'db'
,
'db_version'
,
'3.0.3.
1
'
);
INSERT
INTO
sys_config
VALUES
(
'1'
,
'db'
,
'db_version'
,
'3.0.3.
3
'
);
-- --------------------------------------------------------
...
...
install/tpl/apache_apps.vhost.master
View file @
1ca82372
...
...
@@ -11,25 +11,25 @@
ServerAdmin webmaster@localhost
{apps_vhost_servername}
<IfModule mod_
fcgid
.c>
<IfModule mod_
php5
.c>
DocumentRoot {apps_vhost_dir}
SuexecUserGroup ispapps ispapps
AddType application/x-httpd-php .php
<Directory {apps_vhost_dir}>
Options Indexes FollowSymLinks MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
Options FollowSymLinks
AllowOverride None
Order allow,deny
Allow from all
</Directory>
</IfModule>
<IfModule mod_
php5
.c>
<IfModule mod_
fcgid
.c>
DocumentRoot {apps_vhost_dir}
AddType application/x-httpd-php .php
SuexecUserGroup ispapps ispapps
<Directory {apps_vhost_dir}>
Options FollowSymLinks
AllowOverride None
Options Indexes FollowSymLinks MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
Order allow,deny
Allow from all
</Directory>
...
...
install/tpl/config.inc.php.master
View file @
1ca82372
...
...
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define
(
'ISPC_APP_TITLE'
,
'ISPConfig'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.3.
2
'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.3.
3
'
);
//** Database
...
...
@@ -143,7 +143,6 @@ $conf['theme'] = 'default';
$conf
[
'html_content_encoding'
]
=
'utf-8'
;
// example: utf-8, iso-8859-1, ...
$conf
[
'logo'
]
=
'themes/default/images/ispc_logo.png'
;
//** Default Language
$conf
[
'language'
]
=
'{language}'
;
$conf
[
'debug_language'
]
=
false
;
...
...
interface/lib/app.inc.php
View file @
1ca82372
...
...
@@ -163,7 +163,7 @@ class app {
//* Load module wordbook, if it exists
if
(
isset
(
$_SESSION
[
's'
][
'module'
][
'name'
])
&&
isset
(
$_SESSION
[
's'
][
'language'
]))
{
$lng_file
=
'/web/'
.
$_SESSION
[
's'
][
'module'
][
'name'
]
.
'/lib/lang/'
.
$_SESSION
[
's'
][
'language'
]
.
'.lng'
;
if
(
!
file_exists
(
ISPC_ROOT_PATH
.
$lng_file
))
$lng_file
=
'/web/'
.
$_SESSION
[
's'
][
'module'
][
'name'
]
.
'/lib/lang/en.lng'
;
if
(
!
file_exists
(
ISPC_ROOT_PATH
.
'/'
.
$lng_file
))
$lng_file
=
'/web/'
.
$_SESSION
[
's'
][
'module'
][
'name'
]
.
'/lib/lang/en.lng'
;
$this
->
load_language_file
(
$lng_file
);
}
$this
->
_language_inc
=
1
;
...
...
@@ -183,7 +183,7 @@ class app {
$filename
=
ISPC_ROOT_PATH
.
'/'
.
$filename
;
if
(
substr
(
$filename
,
-
4
)
!=
'.lng'
)
$this
->
error
(
'Language file has wrong extension.'
);
if
(
file_exists
(
$filename
))
{
@
include
_once
(
$filename
);
@
include
(
$filename
);
if
(
is_array
(
$wb
))
{
if
(
is_array
(
$this
->
_wb
))
{
$this
->
_wb
=
array_merge
(
$this
->
_wb
,
$wb
);
...
...
interface/lib/classes/functions.inc.php
View file @
1ca82372
...
...
@@ -87,6 +87,15 @@ class functions {
return
$out
;
}
public
function
currency_format
(
$number
)
{
global
$app
;
$number_format_decimals
=
(
int
)
$app
->
lng
(
'number_format_decimals'
);
$number_format_dec_point
=
$app
->
lng
(
'number_format_dec_point'
);
$number_format_thousands_sep
=
$app
->
lng
(
'number_format_thousands_sep'
);
if
(
$number_format_thousands_sep
==
'number_format_thousands_sep'
)
$number_format_thousands_sep
=
''
;
return
number_format
((
double
)
$number
,
$number_format_decimals
,
$number_format_dec_point
,
$number_format_thousands_sep
);
}
}
...
...
interface/lib/classes/listform.inc.php
View file @
1ca82372
...
...
@@ -281,7 +281,7 @@ class listform {
public
function
decode
(
$record
)
{
global
$conf
;
global
$conf
,
$app
;
if
(
is_array
(
$record
))
{
foreach
(
$this
->
listDef
[
'item'
]
as
$field
){
$key
=
$field
[
'field'
];
...
...
@@ -333,7 +333,7 @@ class listform {
break
;
case
'CURRENCY'
:
$record
[
$key
]
=
number
_format
(
$record
[
$key
]
,
2
,
','
,
''
);
$record
[
$key
]
=
$app
->
functions
->
currency
_format
(
$record
[
$key
]);
break
;
default
:
...
...
interface/lib/classes/remoting.inc.php
View file @
1ca82372
...
...
@@ -145,6 +145,18 @@ class remoting {
}
}
public
function
server_get_serverid_by_ip
(
$session_id
,
$ipaddress
)
{
global
$app
;
if
(
!
$this
->
checkPerm
(
$session_id
,
'server_get_serverid_by_ip'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$sql
=
"SELECT server_id FROM server_ip WHERE ip_address = '
$ipaddress
' LIMIT 1 "
;
$all
=
$app
->
db
->
queryAllRecords
(
$sql
);
return
$all
;
}
//* Get mail domain details
public
function
mail_domain_get
(
$session_id
,
$primary_id
)
{
...
...
@@ -1029,6 +1041,91 @@ class remoting {
return
$affected_rows
;
}
// -----------------------------------------------------------------------------------------------
public
function
client_delete_everything
(
$session_id
,
$client_id
)
{
global
$app
,
$conf
;
if
(
!
$this
->
checkPerm
(
$session_id
,
'client_delete_everything'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$client_id
=
intval
(
$client_id
);
$client_group
=
$app
->
db
->
queryOneRecord
(
"SELECT groupid FROM sys_group WHERE client_id =
$client_id
"
);
$tables
=
'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic'
;
$tables_array
=
explode
(
','
,
$tables
);
$client_group_id
=
intval
(
$client_group
[
'groupid'
]);
$table_list
=
array
();
if
(
$client_group_id
>
1
)
{
foreach
(
$tables_array
as
$table
)
{
if
(
$table
!=
''
)
{
$records
=
$app
->
db
->
queryAllRecords
(
"SELECT * FROM
$table
WHERE sys_groupid = "
.
$client_group_id
);
$number
=
count
(
$records
);
if
(
$number
>
0
)
$table_list
[]
=
array
(
'table'
=>
$table
.
"("
.
$number
.
")"
);
}
}
}
if
(
$client_id
>
0
)
{
// remove the group of the client from the resellers group
$parent_client_id
=
intval
(
$this
->
dataRecord
[
'parent_client_id'
]);
$parent_user
=
$app
->
db
->
queryOneRecord
(
"SELECT userid FROM sys_user WHERE client_id =
$parent_client_id
"
);
$client_group
=
$app
->
db
->
queryOneRecord
(
"SELECT groupid FROM sys_group WHERE client_id =
$client_id
"
);
$app
->
auth
->
remove_group_from_user
(
$parent_user
[
'userid'
],
$client_group
[
'groupid'
]);
// delete the group of the client
$app
->
db
->
query
(
"DELETE FROM sys_group WHERE client_id =
$client_id
"
);
// delete the sys user(s) of the client
$app
->
db
->
query
(
"DELETE FROM sys_user WHERE client_id =
$client_id
"
);
// Delete all records (sub-clients, mail, web, etc....) of this client.
$tables
=
'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic'
;
$tables_array
=
explode
(
','
,
$tables
);
$client_group_id
=
intval
(
$client_group
[
'groupid'
]);
if
(
$client_group_id
>
1
)
{
foreach
(
$tables_array
as
$table
)
{
if
(
$table
!=
''
)
{
$records
=
$app
->
db
->
queryAllRecords
(
"SELECT * FROM
$table
WHERE sys_groupid = "
.
$client_group_id
);
// find the primary ID of the table
$table_info
=
$app
->
db
->
tableInfo
(
$table
);
$index_field
=
''
;
foreach
(
$table_info
as
$tmp
)
{
if
(
$tmp
[
'option'
]
==
'primary'
)
$index_field
=
$tmp
[
'name'
];
}
// Delete the records
if
(
$index_field
!=
''
)
{
if
(
is_array
(
$records
))
{
foreach
(
$records
as
$rec
)
{
$app
->
db
->
datalogDelete
(
$table
,
$index_field
,
$rec
[
$index_field
]);
}
}
}
}
}
}
}
if
(
!
$this
->
checkPerm
(
$session_id
,
'client_delete'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$affected_rows
=
$this
->
deleteQuery
(
'../client/form/client.tform.php'
,
$client_id
);
// $app->remoting_lib->ispconfig_sysuser_delete($client_id);
return
false
;
}
// Website functions ---------------------------------------------------------------------------------------
//* Get cron details
...
...
@@ -1238,19 +1335,19 @@ class remoting {
}
//* Add a record
public
function
sites_web_domain_add
(
$session_id
,
$client_id
,
$params
,
$readonly
=
false
)
{
global
$app
;
public
function
sites_web_domain_add
(
$session_id
,
$client_id
,
$params
,
$readonly
=
false
)
{
global
$app
;
if
(
!
$this
->
checkPerm
(
$session_id
,
'sites_web_domain_add'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$
affected_rows
=
$this
->
insertQuery
(
'../sites/form/web_domain.tform.php'
,
$client_id
,
$params
,
'sites:web_domain:on_after_insert'
);
if
(
$readonly
===
true
)
$app
->
db
->
query
(
"UPDATE web_domain SET `sys_userid` = '1' WHERE domain_id = "
.
$
affected_rows
);
return
$
affected_rows
;
}
$
domain_id
=
$this
->
insertQuery
(
'../sites/form/web_domain.tform.php'
,
$client_id
,
$params
,
'sites:web_domain:on_after_insert'
);
if
(
$readonly
===
true
)
$app
->
db
->
query
(
"UPDATE web_domain SET `sys_userid` = '1' WHERE domain_id = "
.
$
domain_id
);
return
$
domain_id
;
}
//* Update a record
public
function
sites_web_domain_update
(
$session_id
,
$client_id
,
$primary_id
,
$params
)
{
...
...
@@ -1369,7 +1466,59 @@ class remoting {
return
$affected_rows
;
}
// -----------------------------------------------------------------------------------------------
//* Get record details
public
function
domains_domain_get
(
$session_id
,
$primary_id
)
{
global
$app
;
if
(
!
$this
->
checkPerm
(
$session_id
,
'domains_domain_get'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$app
->
uses
(
'remoting_lib'
);
$app
->
remoting_lib
->
loadFormDef
(
'../domain/form/domain.tform.php'
);
return
$app
->
remoting_lib
->
getDataRecord
(
$primary_id
);
}
//* Add a record
public
function
domains_domain_add
(
$session_id
,
$client_id
,
$params
)
{
if
(
!
$this
->
checkPerm
(
$session_id
,
'domains_domain_add'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
return
$this
->
insertQuery
(
'../domain/form/domain.tform.php'
,
$client_id
,
$params
);
}
//* Delete a record
public
function
domains_domain_delete
(
$session_id
,
$primary_id
)
{
if
(
!
$this
->
checkPerm
(
$session_id
,
'domains_domain_delete'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$affected_rows
=
$this
->
deleteQuery
(
'../domain/form/domain.tform.php'
,
$primary_id
);
return
$affected_rows
;
}
// -----------------------------------------------------------------------------------------------
public
function
domains_get_all_by_user
(
$session_id
,
$group_id
)
{
global
$app
;
if
(
!
$this
->
checkPerm
(
$session_id
,
'domains_get_all_by_user'
))
{
$this
->
server
->
fault
(
'permission_denied'
,
'You do not have the permissions to access this function.'
);
return
false
;
}
$group_id
=
intval
(
$group_id
);
$sql
=
"SELECT domain_id, domain FROM domain WHERE sys_groupid =
$group_id
"
;
$all
=
$app
->
db
->
queryAllRecords
(
$sql
);
return
$all
;
}
// DNS Function --------------------------------------------------------------------------------------------------
//* Get record details
...
...
interface/lib/classes/remoting_lib.inc.php
View file @
1ca82372
...
...
@@ -685,8 +685,16 @@ class remoting_lib {
$language
=
$app
->
db
->
quote
(
$params
[
"language"
]);
$groupid
=
$app
->
db
->
datalogInsert
(
'sys_group'
,
"(name,description,client_id) VALUES ('
$username
','','
$insert_id
')"
,
'groupid'
);
$groups
=
$groupid
;
$salt
=
"$1$"
;
$base64_alphabet
=
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
;
for
(
$n
=
0
;
$n
<
8
;
$n
++
)
{
$salt
.
=
$base64_alphabet
[
mt_rand
(
0
,
63
)];
}
$salt
.
=
"$"
;
$password
=
crypt
(
stripslashes
(
$password
),
$salt
);
$sql1
=
"INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id)
VALUES ('
$username
',
md5(
'
$password
'
)
,'
$modules
','
$startmodule
','
$usertheme
','
$type
','
$active
','
$language
',
$groups
,
$groupid
,
$insert_id
)"
;
VALUES ('
$username
','
$password
','
$modules
','
$startmodule
','
$usertheme
','
$type
','
$active
','
$language
',
$groups
,
$groupid
,
$insert_id
)"
;
$app
->
db
->
query
(
$sql1
);
}
...
...
@@ -695,7 +703,14 @@ class remoting_lib {
$username
=
$app
->
db
->
quote
(
$params
[
"username"
]);
$password
=
$app
->
db
->
quote
(
$params
[
"password"
]);
$client_id
=
intval
(
$client_id
);
$sql
=
"UPDATE sys_user set username = '
$username
', passwort = md5('
$password
') WHERE client_id =
$client_id
"
;
$salt
=
"$1$"
;
$base64_alphabet
=
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
;
for
(
$n
=
0
;
$n
<
8
;
$n
++
)
{
$salt
.
=
$base64_alphabet
[
mt_rand
(
0
,
63
)];
}
$salt
.
=
"$"
;
$password
=
crypt
(
stripslashes
(
$password
),
$salt
);
$sql
=
"UPDATE sys_user set username = '
$username
', passwort = '
$password
' WHERE client_id =
$client_id
"
;
$app
->
db
->
query
(
$sql
);
}
...
...
interface/lib/classes/tform.inc.php
View file @
1ca82372
...
...
@@ -163,7 +163,8 @@ class tform {
* @return record
*/
function
decode
(
$record
,
$tab
)
{
if
(
!
is_array
(
$this
->
formDef
[
'tabs'
][
$tab
]))
$app
->
error
(
"Tab does not exist or the tab is empty (TAB:
$tab
)."
);
global
$conf
,
$app
;
if
(
!
is_array
(
$this
->
formDef
[
'tabs'
][
$tab
]))
$app
->
error
(
"Tab does not exist or the tab is empty (TAB:
$tab
)."
);
$new_record
=
''
;
if
(
is_array
(
$record
))
{
foreach
(
$this
->
formDef
[
'tabs'
][
$tab
][
'fields'
]
as
$key
=>
$field
)
{
...
...
@@ -198,7 +199,7 @@ class tform {
break
;
case
'CURRENCY'
:
$new_record
[
$key
]
=
number_format
((
double
)
$record
[
$key
]
,
2
,
','
,
''
);
$new_record
[
$key
]
=
$app
->
functions
->
currency_format
(
$record
[
$key
]);
break
;
default
:
...
...
@@ -623,11 +624,18 @@ class tform {
break
;
case
'DATE'
:
if
(
$record
[
$key
]
!=
''
&&
$record
[
$key
]
!=
'0000-00-00'
)
{
$date_parts
=
date_parse_from_format
(
$this
->
dateformat
,
$record
[
$key
]);
//list($tag,$monat,$jahr) = explode('.',$record[$key]);
$new_record
[
$key
]
=
$date_parts
[
'year'
]
.
'-'
.
$date_parts
[
'month'
]
.
'-'
.
$date_parts
[
'day'
];
//$tmp = strptime($record[$key],$this->dateformat);
//$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
if
(
function_exists
(
'date_parse_from_format'
))
{
$date_parts
=
date_parse_from_format
(
$this
->
dateformat
,
$record
[
$key
]);
//list($tag,$monat,$jahr) = explode('.',$record[$key]);
$new_record
[
$key
]
=
$date_parts
[
'year'
]
.
'-'
.
$date_parts
[
'month'
]
.
'-'
.
$date_parts
[
'day'
];
//$tmp = strptime($record[$key],$this->dateformat);
//$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
}
else
{
//$tmp = strptime($record[$key],$this->dateformat);
//$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
$tmp
=
strtotime
(
$record
[
$key
]);
$new_record
[
$key
]
=
date
(
'Y-m-d'
,
$tmp
);
}
}
else
{
$new_record
[
$key
]
=
'0000-00-00'
;
}
...
...
interface/lib/config.inc.php
View file @
1ca82372
...
...
@@ -50,7 +50,7 @@ define('ISPC_APP_VERSION', '3.0.2');
//** Database
$conf
[
'db_type'
]
=
'mysql'
;
$conf
[
'db_host'
]
=
'localhost'
;
$conf
[
'db_database'
]
=
'ispconfig3'
;
$conf
[
'db_database'
]
=
'ispconfig3
_stable
'
;
$conf
[
'db_user'
]
=
'root'
;
$conf
[
'db_password'
]
=
''
;
$conf
[
'db_charset'
]
=
'utf8'
;
// same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
...
...
@@ -133,7 +133,6 @@ $conf['logo'] = 'themes/default/images/ispc_logo.png';
$conf
[
'language'
]
=
'en'
;
$conf
[
'debug_language'
]
=
false
;
//** Misc.
$conf
[
'interface_logout_url'
]
=
''
;
// example: http://www.domain.tld/
...
...
interface/lib/lang/ar.lng
View file @
1ca82372
...
...
@@ -4,6 +4,9 @@ $wb['conf_format_datelong'] = 'l dS of F Y';
$wb
[
'conf_format_timeshort'
]
=
'H:i'
;
$wb
[
'conf_format_timelong'
]
=
'H:i:s'
;
$wb
[
'conf_format_datetime'
]
=
'Y-m-d H:i'
;
$wb
[
'number_format_decimals'
]
=
'2'
;
$wb
[
'number_format_dec_point'
]
=
'.'
;
$wb
[
'number_format_thousands_sep'
]
=
''
;
$wb
[
'301'
]
=
' .'
;
$wb
[
'302'
]
=
' .'
;
$wb
[
'1001'
]
=
' !'
;
...
...
interface/lib/lang/bg.lng
View file @
1ca82372
...
...
@@ -4,6 +4,9 @@ $wb['conf_format_datelong'] = 'l dS of F Y';
$wb
[
'conf_format_timeshort'
]
=
'H:i'
;
$wb
[
'conf_format_timelong'
]
=
'H:i:s'
;
$wb
[
'conf_format_datetime'
]
=
'Y-m-d H:i'
;
$wb
[
'number_format_decimals'
]
=
'2'
;
$wb
[
'number_format_dec_point'
]
=
'.'
;
$wb
[
'number_format_thousands_sep'
]
=
''
;
$wb
[
'301'
]
=
'Този модул не е разрешен за текущия потреител.'
;
$wb
[
'302'
]
=
'Невалиден модул.'
;
$wb
[
'1001'
]
=
'Потребителското име и паролата не могат да бъдат празни!'
;
...
...
interface/lib/lang/br.lng
View file @
1ca82372
...
...
@@ -4,6 +4,9 @@ $wb['conf_format_datelong'] = 'l dS de F Y';
$wb
[
'conf_format_timeshort'
]
=
'H:i'
;
$wb
[
'conf_format_timelong'
]
=
'H:i:s'
;
$wb
[
'conf_format_datetime'
]
=
'd/m/Y H:i'
;
$wb
[
'number_format_decimals'
]
=
'2'
;
$wb
[
'number_format_dec_point'
]
=
'.'
;
$wb
[
'number_format_thousands_sep'
]
=
''
;
$wb
[
'301'
]
=
'Módulo não permitido para o usuário corrente.'
;
$wb
[
'302'
]
=
'Módulo Inválido'
;
$wb
[
'1001'
]
=
'O nome de usuário e senha não podem estar em branco!'
;
...
...
interface/lib/lang/cz.lng
View file @
1ca82372
...
...
@@ -4,6 +4,9 @@ $wb['conf_format_datelong'] = 'l dS of F Y';
$wb
[
'conf_format_timeshort'
]
=
'H:i'
;
$wb
[
'conf_format_timelong'
]
=
'H:i:s'
;
$wb
[
'conf_format_datetime'
]
=
'Y-d-m H:i'
;
$wb
[
'number_format_decimals'
]
=
'2'
;
$wb
[
'number_format_dec_point'
]
=
'.'
;
$wb
[
'number_format_thousands_sep'
]
=
''
;
$wb
[
'301'
]
=
'Modul není povolen pro současného uživatele.'
;
$wb
[
'302'
]
=
'Neplatný modul.'
;
$wb
[
'1001'
]
=
'Uživatelské jméno a heslo nemohou být prázdné !'
;
...
...
interface/lib/lang/de.lng
View file @
1ca82372
...
...
@@ -4,6 +4,9 @@ $wb['conf_format_datelong'] = 'l, d. F Y';
$wb
[
'conf_format_timeshort'
]
=
'H:i'
;
$wb
[
'conf_format_timelong'
]
=
'H:i:s'
;
$wb
[
'conf_format_datetime'
]
=
'd.m.Y H:i'
;
$wb
[
'number_format_decimals'
]
=
'2'
;
$wb
[
'number_format_dec_point'
]
=
','
;
$wb
[
'number_format_thousands_sep'
]
=
''
;
$wb
[
'301'
]
=
'Modul für Benutzer nicht erlaubt.'
;
$wb
[
'302'
]
=
'Modul ungültig.'
;
$wb
[
'1001'
]
=
'Der Benutzername und das Passwort dürfen nicht leer sein!'
;
...
...
Prev
1
2
3
4
5
…
44
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment