From f70fd01c31656759e8033f0e4326bd0797eec0a2 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 02 May 2011 15:06:30 -0400
Subject: [PATCH] Reverted changes for logview implementation as they can not work on multiserver setups.

---
 /dev/null                                     |   18 ---------
 install/sql/ispconfig3.sql                    |    1 
 interface/web/sites/web_domain_edit.php       |   28 -------------
 interface/web/sites/form/web_domain.tform.php |   27 -------------
 4 files changed, 1 insertions(+), 73 deletions(-)

diff --git a/install/sql/incremental/upd_0011.sql b/install/sql/incremental/upd_0011.sql
deleted file mode 100644
index 8646c9e..0000000
--- a/install/sql/incremental/upd_0011.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- database patch for displaying error logs for the sites.
-ALTER TABLE `web_domain` ADD `logs` MEDIUMTEXT NOT NULL ;
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 2d921c8..55daa11 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1151,7 +1151,6 @@
   `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;
 
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 1436967..5f69079 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -395,33 +395,6 @@
 	)
 );
 
-
-//* 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
diff --git a/interface/web/sites/templates/web_domain_logs.htm b/interface/web/sites/templates/web_domain_logs.htm
deleted file mode 100644
index ff00cb1..0000000
--- a/interface/web/sites/templates/web_domain_logs.htm
+++ /dev/null
@@ -1,18 +0,0 @@
-<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>
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 87b57a5..bac49eb 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -262,32 +262,6 @@
 			$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();
 	}
 
@@ -631,4 +605,4 @@
 $page = new page_action;
 $page->onLoad();
 
-?>
+?>
\ No newline at end of file

--
Gitblit v1.9.1