From 4e44dd7a82f27b7d5a9825773783987762e5a9e6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 20 May 2007 11:00:32 -0400
Subject: [PATCH] changed client form
---
/dev/null | 36 -----
interface/web/client/form/client.tform.php | 102 ++++++--------
interface/web/client/lib/lang/en_clients_list.lng | 1
interface/web/designer/lib/module.conf.php | 4
interface/web/client/templates/clients_list.htm | 31 ++++
interface/web/admin/lib/module.conf.php | 239 +++++++++++++++++-----------------
interface/web/client/lib/lang/en_client.lng | 2
7 files changed, 200 insertions(+), 215 deletions(-)
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index f5c49fd..b4962b7 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -1,120 +1,121 @@
-<?php
-
-$module["name"] = "admin";
-$module["title"] = "System";
-$module["template"] = "module.tpl.htm";
-$module["startpage"] = "admin/users_list.php";
-$module["tab_width"] = '60';
-
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/users_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/users_list.php');
-
-
-$module["nav"][] = array( 'title' => 'CP Users',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add group",
- 'target' => 'content',
- 'link' => 'admin/groups_edit.php');
-
-$items[] = array( 'title' => "Edit group",
- 'target' => 'content',
- 'link' => 'admin/groups_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Groups',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add server",
- 'target' => 'content',
- 'link' => 'admin/server_edit.php');
-
-$items[] = array( 'title' => "Edit server",
- 'target' => 'content',
- 'link' => 'admin/server_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Servers',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/dbsync_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/dbsync_list.php');
-
-
-$items[] = array( 'title' => "Sync. Now",
- 'target' => 'content',
- 'link' => 'admin/dbsync_cron.php');
-
-$module["nav"][] = array( 'title' => 'DB Sync.',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/filesync_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/filesync_list.php');
-
-
-$module["nav"][] = array( 'title' => 'File Sync.',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-
-
-// Getting the admin options from other modules
-$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
-if(is_array($modules)) {
- foreach($modules as $mt) {
- if(is_file($mt."/lib/admin.conf.php")) {
- $options = array();
- include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
- if(is_array($options)) {
- foreach($options as $opt) {
- $module["nav"][] = $opt;
- }
- }
- }
- }
-}
-
-
-
-
+<?php
+
+$module["name"] = "admin";
+$module["title"] = "System";
+$module["template"] = "module.tpl.htm";
+$module["startpage"] = "admin/users_list.php";
+$module["tab_width"] = '60';
+
+
+$items[] = array( 'title' => "Add user",
+ 'target' => 'content',
+ 'link' => 'admin/users_edit.php');
+
+$items[] = array( 'title' => "Edit user",
+ 'target' => 'content',
+ 'link' => 'admin/users_list.php');
+
+
+$module["nav"][] = array( 'title' => 'CP Users',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufr�umen
+unset($items);
+
+$items[] = array( 'title' => "Add group",
+ 'target' => 'content',
+ 'link' => 'admin/groups_edit.php');
+
+$items[] = array( 'title' => "Edit group",
+ 'target' => 'content',
+ 'link' => 'admin/groups_list.php');
+
+
+$module["nav"][] = array( 'title' => 'Groups',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufr�umen
+unset($items);
+
+$items[] = array( 'title' => "Add server",
+ 'target' => 'content',
+ 'link' => 'admin/server_edit.php');
+
+$items[] = array( 'title' => "Edit server",
+ 'target' => 'content',
+ 'link' => 'admin/server_list.php');
+
+
+$module["nav"][] = array( 'title' => 'Servers',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufr�umen
+unset($items);
+
+$items[] = array( 'title' => "Add user",
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_edit.php');
+
+$items[] = array( 'title' => "Edit user",
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_list.php');
+
+
+$items[] = array( 'title' => "Sync. Now",
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_cron.php');
+
+$module["nav"][] = array( 'title' => 'DB Sync.',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufr�umen
+unset($items);
+
+/*
+$items[] = array( 'title' => "Add user",
+ 'target' => 'content',
+ 'link' => 'admin/filesync_edit.php');
+
+$items[] = array( 'title' => "Edit user",
+ 'target' => 'content',
+ 'link' => 'admin/filesync_list.php');
+
+
+$module["nav"][] = array( 'title' => 'File Sync.',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufr�umen
+unset($items);
+*/
+
+
+// Getting the admin options from other modules
+$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
+if(is_array($modules)) {
+ foreach($modules as $mt) {
+ if(is_file($mt."/lib/admin.conf.php")) {
+ $options = array();
+ include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
+ if(is_array($options)) {
+ foreach($options as $opt) {
+ $module["nav"][] = $opt;
+ }
+ }
+ }
+ }
+}
+
+
+
+
?>
\ No newline at end of file
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 2d20c9d..491d010 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -83,6 +83,50 @@
'rows' => '',
'cols' => ''
),
+ 'username' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'password' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'PASSWORD',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'language' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => $conf["language"],
+ 'value' => array('en' => 'en'),
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'usertheme' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => 'default',
+ 'value' => array('default' => 'default','grey' => 'grey'),
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'street' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -345,64 +389,6 @@
# END Datatable fields
##################################
)
-);
-
-$form["tabs"]['login'] = array (
- 'title' => "Login",
- 'width' => 100,
- 'template' => "templates/client_edit_login.htm",
- 'fields' => array (
- ##################################
- # Begin Datatable fields
- ##################################
- 'username' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- 'password' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'PASSWORD',
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- 'language' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => $conf["language"],
- 'value' => array('en' => 'en'),
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- 'usertheme' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'default',
- 'value' => array('default' => 'default','grey' => 'grey'),
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- ##################################
- # END Datatable fields
- ##################################
- ),
);
/*
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index ba19243..0accf4b 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -18,7 +18,7 @@
$wb["street_txt"] = 'Street';
$wb["zip_txt"] = 'ZIP';
$wb["city_txt"] = 'City';
-$wb["state_txt"] = 'state';
+$wb["state_txt"] = 'State';
$wb["country_txt"] = 'Country';
$wb["telephone_txt"] = 'Telephone';
$wb["mobile_txt"] = 'Mobile';
diff --git a/interface/web/client/lib/lang/en_clients_list.lng b/interface/web/client/lib/lang/en_clients_list.lng
index b945582..be96101 100644
--- a/interface/web/client/lib/lang/en_clients_list.lng
+++ b/interface/web/client/lib/lang/en_clients_list.lng
@@ -10,4 +10,5 @@
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
+$wb["add_new_record_txt"] = 'Add new client';
?>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
deleted file mode 100644
index 80dda0b..0000000
--- a/interface/web/client/templates/client_edit_address.htm
+++ /dev/null
@@ -1,68 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="frmText11">{tmpl_var name='company_name_txt'}:</td>
- <td class="frmText11"><input name="company_name" type="text" class="text" value="{tmpl_var name='company_name'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='contact_name_txt'}:</td>
- <td class="frmText11"><input name="contact_name" type="text" class="text" value="{tmpl_var name='contact_name'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='street_txt'}:</td>
- <td class="frmText11"><input name="street" type="text" class="text" value="{tmpl_var name='street'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='zip_txt'}:</td>
- <td class="frmText11"><input name="zip" type="text" class="text" value="{tmpl_var name='zip'}" size="10" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='city_txt'}:</td>
- <td class="frmText11"><input name="city" type="text" class="text" value="{tmpl_var name='city'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='state_txt'}:</td>
- <td class="frmText11"><input name="state" type="text" class="text" value="{tmpl_var name='state'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='country_txt'}:</td>
- <td class="frmText11"><input name="country" type="text" class="text" value="{tmpl_var name='country'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='telephone_txt'}:</td>
- <td class="frmText11"><input name="telephone" type="text" class="text" value="{tmpl_var name='telephone'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='mobile_txt'}:</td>
- <td class="frmText11"><input name="mobile" type="text" class="text" value="{tmpl_var name='mobile'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='fax_txt'}:</td>
- <td class="frmText11"><input name="fax" type="text" class="text" value="{tmpl_var name='fax'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='email_txt'}:</td>
- <td class="frmText11"><input name="email" type="text" class="text" value="{tmpl_var name='email'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='internet_txt'}:</td>
- <td class="frmText11"><input name="internet" type="text" class="text" value="{tmpl_var name='internet'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='icq_txt'}:</td>
- <td class="frmText11"><input name="icq" type="text" class="text" value="{tmpl_var name='icq'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='notes_txt'}:</td>
- <td class="frmText11"><textarea name='notes' cols='30' rows='10'>{tmpl_var name='notes'}</textarea></td>
- </tr> <tr>
- <td class="frmText11"> </td>
- <td class="frmText11"> </td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><div class="buttonEnding"></div>
- <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><div class="buttonEnding"></div>
- </td>
- </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
deleted file mode 100644
index e16eb28..0000000
--- a/interface/web/client/templates/client_edit_limits.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="frmText11">{tmpl_var name='limit_maildomain_txt'}:</td>
- <td class="frmText11"><input name="limit_maildomain" type="text" class="text" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='limit_mailbox_txt'}:</td>
- <td class="frmText11"><input name="limit_mailbox" type="text" class="text" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='limit_mailalias_txt'}:</td>
- <td class="frmText11"><input name="limit_mailalias" type="text" class="text" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='limit_mailcatchall_txt'}:</td>
- <td class="frmText11"><input name="limit_mailcatchall" type="text" class="text" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='limit_mailrouting_txt'}:</td>
- <td class="frmText11"><input name="limit_mailrouting" type="text" class="text" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='limit_mailfilter_txt'}:</td>
- <td class="frmText11"><input name="limit_mailfilter" type="text" class="text" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='limit_fetchmail_txt'}:</td>
- <td class="frmText11"><input name="limit_fetchmail" type="text" class="text" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='limit_mailquota_txt'}:</td>
- <td class="frmText11"><input name="limit_mailquota" type="text" class="text" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10"></td>
- </tr> <tr>
- <td class="frmText11"> </td>
- <td class="frmText11"> </td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><div class="buttonEnding"></div>
- <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><div class="buttonEnding"></div>
- </td>
- </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_login.htm b/interface/web/client/templates/client_edit_login.htm
deleted file mode 100644
index 4f6d039..0000000
--- a/interface/web/client/templates/client_edit_login.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="frmText11">{tmpl_var name='username_txt'}:</td>
- <td class="frmText11"><input name="username" type="text" class="text" value="{tmpl_var name='username'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='password_txt'}:</td>
- <td class="frmText11"><input name="password" type="password" class="text" value="{tmpl_var name='password'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='language_txt'}:</td>
- <td class="frmText11">
- <select name="language" class="text">
- {tmpl_var name='language'}
- </select>
- </td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='usertheme_txt'}:</td>
- <td class="frmText11">
- <select name="usertheme" class="text">
- {tmpl_var name='usertheme'}
- </select>
- </td>
- </tr> <tr>
- <td class="frmText11"> </td>
- <td class="frmText11"> </td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><div class="buttonEnding"></div>
- <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><div class="buttonEnding"></div>
- </td>
- </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
new file mode 100644
index 0000000..8404f76
--- /dev/null
+++ b/interface/web/client/templates/clients_list.htm
@@ -0,0 +1,31 @@
+<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
+<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('client/client_edit.php');" /><div class="buttonEnding"></div><br /><br />
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable">
+ <tr>
+ <td class="tblHead"><tmpl_var name="company_name_txt"></td>
+ <td class="tblHead"><tmpl_var name="contact_name_txt"></td>
+ <td class="tblHead"><tmpl_var name="city_txt"></td>
+ <td class="tblHead"><tmpl_var name="country_txt"></td>
+ <td class="tblHead"> </td>
+ </tr>
+ <tr>
+ <td class="frmText11"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" class="text" /></td>
+ <td class="frmText11"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" class="text" /></td>
+ <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','client/client_list.php');"><div class="buttonEnding"></div></td>
+ </tr>
+ <tmpl_loop name="records">
+ <tr bgcolor="{tmpl_var name="bgcolor"}">
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="company_name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="contact_name"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="city"}</a></td>
+ <td class="frmText11"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="country"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
+ </tr>
+ </tmpl_loop>
+
+ <tr>
+ <td colspan="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
+ </tr>
+</table>
\ No newline at end of file
diff --git a/interface/web/designer/lib/module.conf.php b/interface/web/designer/lib/module.conf.php
index 72ffc4a..117f79b 100644
--- a/interface/web/designer/lib/module.conf.php
+++ b/interface/web/designer/lib/module.conf.php
@@ -28,7 +28,8 @@
),
),
),
- 1 =>
+ /*
+ 1 =>
array (
'title' => 'Formulare',
'open' => '1',
@@ -88,6 +89,7 @@
),
),
),
+ */
),
)
?>
\ No newline at end of file
--
Gitblit v1.9.1