Skip to content

Commit f70fd01

Browse files
committed
Reverted changes for logview implementation as they can not work on multiserver setups.
1 parent 737cf5a commit f70fd01

File tree

5 files changed

+1
-75
lines changed

5 files changed

+1
-75
lines changed

install/sql/incremental/upd_0011.sql

Lines changed: 0 additions & 2 deletions
This file was deleted.

install/sql/ispconfig3.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,6 @@ CREATE TABLE `web_domain` (
11511151
`backup_copies` INT NOT NULL DEFAULT '1',
11521152
`active` enum('n','y') NOT NULL default 'y',
11531153
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
1154-
`logs` MEDIUMTEXT NOT NULL,
11551154
PRIMARY KEY (`domain_id`)
11561155
) ENGINE=MyISAM AUTO_INCREMENT=1;
11571156

interface/web/sites/form/web_domain.tform.php

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -395,33 +395,6 @@
395395
)
396396
);
397397

398-
399-
//* Logs
400-
$form["tabs"]['logs'] = array (
401-
'title' => "logs",
402-
'width' => 100,
403-
'template' => "templates/web_domain_logs.htm",
404-
'readonly' => true,
405-
'fields' => array (
406-
##################################
407-
# Begin Datatable fields
408-
##################################
409-
'logs' => array (
410-
'datatype' => 'TEXT',
411-
'formtype' => 'TEXTAREA',
412-
'default' => 'DEFAULT',
413-
'value' => 'VALUE',
414-
'cols' => '30',
415-
'rows' => '10'
416-
)
417-
##################################
418-
# ENDE Datatable fields
419-
##################################
420-
)
421-
);
422-
423-
424-
425398
if($_SESSION["s"]["user"]["typ"] == 'admin') {
426399

427400
//* Backup

interface/web/sites/templates/web_domain_logs.htm

Lines changed: 0 additions & 18 deletions
This file was deleted.

interface/web/sites/web_domain_edit.php

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -262,32 +262,6 @@ function onShowEnd() {
262262
$app->tpl->setVar("domain_option",$domain_select);
263263
}
264264

265-
// Code to display the error log for the site.
266-
267-
// Query the logfile name
268-
$tmp = $app->db->queryOneRecord("SELECT document_root FROM web_domain WHERE domain_id = ".$this->id);
269-
$logfile = $tmp["document_root"]."/log/error.log";
270-
271-
$lines = count(file($logfile));
272-
273-
// the "tail" function
274-
$handle = @fopen($logfile, "r");
275-
if ($handle) {
276-
while (($buffer = fgets($handle)) !== false) {
277-
$lines = $lines -1;
278-
// this constant defines how many lines to display
279-
if ($lines<60) $tail .= $buffer; // TODO: We need a newline here.
280-
}
281-
if (!feof($handle)) {
282-
$tail = "Error.";
283-
}
284-
fclose($handle);
285-
}
286-
287-
// store the tail so it can be displayed in the interface
288-
$app->db->query("UPDATE web_domain SET logs = '$tail' WHERE domain_id = ".$this->id);
289-
290-
291265
parent::onShowEnd();
292266
}
293267

@@ -631,4 +605,4 @@ function onAfterDelete() {
631605
$page = new page_action;
632606
$page->onLoad();
633607

634-
?>
608+
?>

0 commit comments

Comments
 (0)