Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dirk Dankhoff
ISPConfig 3
Commits
f70fd01c
Commit
f70fd01c
authored
May 02, 2011
by
tbrehm
Browse files
Reverted changes for logview implementation as they can not work on multiserver setups.
parent
737cf5a9
Changes
5
Show whitespace changes
Inline
Side-by-side
install/sql/incremental/upd_0011.sql
deleted
100644 → 0
View file @
737cf5a9
-- database patch for displaying error logs for the sites.
ALTER
TABLE
`web_domain`
ADD
`logs`
MEDIUMTEXT
NOT
NULL
;
\ No newline at end of file
install/sql/ispconfig3.sql
View file @
f70fd01c
...
...
@@ -1151,7 +1151,6 @@ CREATE TABLE `web_domain` (
`backup_copies`
INT
NOT
NULL
DEFAULT
'1'
,
`active`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'y'
,
`traffic_quota_lock`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
,
`logs`
MEDIUMTEXT
NOT
NULL
,
PRIMARY
KEY
(
`domain_id`
)
)
ENGINE
=
MyISAM
AUTO_INCREMENT
=
1
;
...
...
interface/web/sites/form/web_domain.tform.php
View file @
f70fd01c
...
...
@@ -395,33 +395,6 @@ $form["tabs"]['stats'] = array (
)
);
//* Logs
$form
[
"tabs"
][
'logs'
]
=
array
(
'title'
=>
"logs"
,
'width'
=>
100
,
'template'
=>
"templates/web_domain_logs.htm"
,
'readonly'
=>
true
,
'fields'
=>
array
(
##################################
# Begin Datatable fields
##################################
'logs'
=>
array
(
'datatype'
=>
'TEXT'
,
'formtype'
=>
'TEXTAREA'
,
'default'
=>
'DEFAULT'
,
'value'
=>
'VALUE'
,
'cols'
=>
'30'
,
'rows'
=>
'10'
)
##################################
# ENDE Datatable fields
##################################
)
);
if
(
$_SESSION
[
"s"
][
"user"
][
"typ"
]
==
'admin'
)
{
//* Backup
...
...
interface/web/sites/templates/web_domain_logs.htm
deleted
100644 → 0
View file @
737cf5a9
<h2><tmpl_var
name=
"list_head_txt"
></h2>
<p><tmpl_var
name=
"list_desc_txt"
></p>
<div
class=
"panel panel_web_domain"
>
<div
class=
"pnl_formsarea"
>
<div
class=
"codeview"
><tmpl_var
name=
"logs"
></div>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
<div
class=
"buttonHolder buttons"
>
<button
class=
"positive iconstxt icoPositive"
type=
"button"
value=
"{tmpl_var name='btn_save_txt'}"
onClick=
"submitForm('pageForm','sites/web_domain_edit.php');"
><span>
{tmpl_var name='btn_save_txt'}
</span></button>
<button
class=
"negative iconstxt icoNegative"
type=
"button"
value=
"{tmpl_var name='btn_cancel_txt'}"
onClick=
"loadContent('sites/web_domain_list.php');"
><span>
{tmpl_var name='btn_cancel_txt'}
</span></button>
</div>
</div>
</div>
interface/web/sites/web_domain_edit.php
View file @
f70fd01c
...
...
@@ -262,32 +262,6 @@ class page_action extends tform_actions {
$app
->
tpl
->
setVar
(
"domain_option"
,
$domain_select
);
}
// Code to display the error log for the site.
// Query the logfile name
$tmp
=
$app
->
db
->
queryOneRecord
(
"SELECT document_root FROM web_domain WHERE domain_id = "
.
$this
->
id
);
$logfile
=
$tmp
[
"document_root"
]
.
"/log/error.log"
;
$lines
=
count
(
file
(
$logfile
));
// the "tail" function
$handle
=
@
fopen
(
$logfile
,
"r"
);
if
(
$handle
)
{
while
((
$buffer
=
fgets
(
$handle
))
!==
false
)
{
$lines
=
$lines
-
1
;
// this constant defines how many lines to display
if
(
$lines
<
60
)
$tail
.
=
$buffer
;
// TODO: We need a newline here.
}
if
(
!
feof
(
$handle
))
{
$tail
=
"Error."
;
}
fclose
(
$handle
);
}
// store the tail so it can be displayed in the interface
$app
->
db
->
query
(
"UPDATE web_domain SET logs = '
$tail
' WHERE domain_id = "
.
$this
->
id
);
parent
::
onShowEnd
();
}
...
...
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