From 256de1d33a1450c2afdc087fa4bdff468800e4e8 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Wed, 2 Sep 2009 17:27:29 +0000
Subject: [PATCH] Small interface changes to admin->comment and admin->db

---
 e107_admin/comment.php |  9 ++++---
 e107_admin/db.php      | 61 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/e107_admin/comment.php b/e107_admin/comment.php
index b986a7827..c8ad50d1c 100644
--- a/e107_admin/comment.php
+++ b/e107_admin/comment.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/comment.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-08-30 08:23:49 $
+|     $Revision: 1.4 $
+|     $Date: 2009-09-02 17:27:29 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -85,6 +85,8 @@ class comment_manager
 	{
         $this->fieldpref = (varset($user_pref['admin_cpage_columns'])) ? $user_pref['admin_cpage_columns'] : array("comment_id","comment_pid","comment_item_id","comment_subject","comment_comment","comment_author","comment_datestamp");
 
+		//TODO Add LANS
+
     	$this->fields = array(
 			'comment_id'			=> array('title'=> ID, 'width'=>'5%', 'forced'=> TRUE),
        		'comment_item_id' 		=> array('title'=> "item id", 'type' => 'text', 'width' => 'auto'),
@@ -112,8 +114,7 @@ class comment_manager
 	{
 		global $pref;
          $sql = e107::getDb();
-         require_once(e_HANDLER."form_handler.php");
-		 $frm = new e_form(true);
+		 $frm = e107::getSingleton('e_form');
 
          $sql -> db_Select("comments", "*");
 
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 853f80fb8..d723ae55e 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -9,8 +9,8 @@
  * Administration - Database Utilities
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $
- * $Revision: 1.26 $
- * $Date: 2009-08-31 13:12:03 $
+ * $Revision: 1.27 $
+ * $Date: 2009-09-02 17:27:29 $
  * $Author: e107coders $
  *
 */
@@ -337,7 +337,7 @@ class system_tools
 	{
 		
 		$frm = e107::getSingleton('e_form');
-	
+	//TODO LANs
 		
 		$text = "<form method='post' action='".e_SELF."' id='core-db-export-form'>
 			<fieldset id='core-db-export'>
@@ -347,10 +347,10 @@ class system_tools
 					
 					<col style='width: 80%'></col>
 					<col style='width: 20%'></col>
-				</colgroup>
+				</colgroup>	
 				<thead>
 				<tr>
-					<th>Name</th>
+					<th>".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." Preferences</th>
 					<th class='right'>Rows</th>
 					
 				</tr>	
@@ -375,7 +375,24 @@ class system_tools
 							</tr>";
 						}
 					}
+					$text .= "</tbody>
+				</table>
+				<table cellpadding='0' cellspacing='0' class='adminlist'>
+				
+				<colgroup span='2'>
 					
+					<col style='width: 80%'></col>
+					<col style='width: 20%'></col>
+				</colgroup>	
+				<thead>
+				<tr>
+					<th>".$frm->checkbox_toggle('check-all-verify', 'xml_tables')."Tables</th>
+					<th class='right'>Rows</th>
+					
+				</tr>	
+				</thead>
+				<tbody>\n";
+				
 					$tables = table_list();
 					
 					foreach($tables as $name=>$count)
@@ -389,8 +406,31 @@ class system_tools
 					}
 	
 					$text .="
+					
 					</tbody>
 				</table>
+				
+				<table cellpadding='0' cellspacing='0' class='adminlist'>
+				<colgroup span='2'>
+					
+					<col style='width: 80%'></col>
+					<col style='width: 20%'></col>
+				</colgroup>	
+				<thead>
+				<tr>
+					<th colspan='2'>".LAN_OPTIONS."</th>
+				</tr>	
+				</thead>
+				<tbody>
+				<tr>
+						<td colspan='2'>
+						".$frm->checkbox("package_images",'package_images')." Convert Image-paths and package images.   
+						   Destination Path: <input type='text' name='package_path' value='' /> (not functional)
+						</td>
+					</tr>
+				</tbody>
+				</table>
+				
 				<div class='buttons-bar center'>
 					".$frm->admin_button('exportXmlFile', "Export File", 'exportXmlFile')."
 				</div>
@@ -662,7 +702,16 @@ function db_adminmenu()
 
 function exportXmlFile($prefs,$tables,$debug=FALSE)
 {
-	e107::getSingleton('xmlClass')->e107Export($prefs,$tables,FALSE);		
+	$xml = e107::getSingleton('xmlClass');
+	
+	if(vartrue($_POST['package_images']) && vartrue($_POST['package_path']))
+	{
+		// TODO Conversion of Image paths - in xml-class and e_parse_class? 
+		// $xml->convertImagePaths = TRUE;
+		// $xml->destinationPath = $_POST['package_path'];		
+	}
+	
+	$xml->e107Export($prefs,$tables,FALSE);		
 }