[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] qmailldap/inc class.uiuserdata.inc.php, 1.6.4.5 class
|
From: |
ceb |
|
Subject: |
[Phpgroupware-cvs] qmailldap/inc class.uiuserdata.inc.php, 1.6.4.5 class.uiqmailldap.inc.php, 1.11.2.1.2.8 class.soqmailldap.inc.php, 1.13.2.2.2.4 |
|
Date: |
Wed, 2 Mar 2005 23:51:00 +0100 |
Update of qmailldap/inc
Modified Files:
Branch: Version-0_9_16-branch
class.uiuserdata.inc.php lines: +14 -14
class.uiqmailldap.inc.php lines: +10 -10
class.soqmailldap.inc.php lines: +15 -16
Log Message:
update
====================================================
Index: qmailldap/inc/class.uiuserdata.inc.php
diff -u qmailldap/inc/class.uiuserdata.inc.php:1.6.4.4
qmailldap/inc/class.uiuserdata.inc.php:1.6.4.5
--- qmailldap/inc/class.uiuserdata.inc.php:1.6.4.4 Mon Feb 28 18:51:28 2005
+++ qmailldap/inc/class.uiuserdata.inc.php Wed Mar 2 22:51:49 2005
@@ -2,7 +2,6 @@
/***************************************************************************\
* phpGroupWare - QMailLDAP
*
* http://www.phpgroupware.org
*
- * http://www.linux-at-work.de
*
* Written by : Lars Kneschke address@hidden *
* -------------------------------------------------------
*
* This program is free software; you can redistribute it and/or modify
it *
@@ -31,7 +30,7 @@
echo parse_navbar();
}
- function editUserData($_useCache='0')
+ function editUserData($_useCache = False)
{
$account_id = get_var('account_id',array('GET'));
@@ -42,15 +41,6 @@
$GLOBALS['phpgw']->template->set_file(array('editUserData' =>
'edituserdata.tpl'));
$GLOBALS['phpgw']->template->set_block('editUserData','form','form');
$GLOBALS['phpgw']->template->set_block('editUserData','link_row','link_row');
-
-
$GLOBALS['phpgw']->template->set_var('lang_email_config',lang('edit email
settings'));
-
$GLOBALS['phpgw']->template->set_var('lang_emailAddress',lang('email address'));
-
$GLOBALS['phpgw']->template->set_var('lang_emailaccount_active',lang('email
account active'));
-
$GLOBALS['phpgw']->template->set_var('lang_mailAlternateAddress',lang('alternate
email address'));
-
$GLOBALS['phpgw']->template->set_var('lang_mailRoutingAddress',lang('forward
emails to'));
-
$GLOBALS['phpgw']->template->set_var('lang_forward_also_to',lang('forward also
to'));
-
$GLOBALS['phpgw']->template->set_var('lang_deliver_extern',lang('deliver
extern'));
-
$GLOBALS['phpgw']->template->set_var('lang_edit_email_settings',lang('edit
email settings'));
$GLOBALS['phpgw']->template->set_var('link_back',$GLOBALS['phpgw']->link('/admin/accounts.php'));
$linkData = array
@@ -68,7 +58,7 @@
$options_mailAlternateAddress =
'<select size="6" name="mailAlternateAddress">' . "\n";
for ($i=0;$i <
count($userData['mailAlternateAddress']); $i++)
{
- $options_mailAlternateAddress
.= '<option value="$i">' . $userData['mailAlternateAddress'][$i] . '</option>'
. "\n";
+ $options_mailAlternateAddress
.= '<option value="' . $i . '">' . $userData['mailAlternateAddress'][$i] .
'</option>' . "\n";
}
$options_mailAlternateAddress .=
'</select>' . "\n";
}
@@ -138,7 +128,7 @@
else
{
// use cached data
- $this->editUserData('1');
+ $this->editUserData(True);
}
}
@@ -148,12 +138,22 @@
$GLOBALS['phpgw']->template->set_var('tr_color1',$GLOBALS['phpgw_info']['theme']['row_on']);
$GLOBALS['phpgw']->template->set_var('tr_color2',$GLOBALS['phpgw_info']['theme']['row_off']);
$GLOBALS['phpgw']->template->set_var('lang_add',lang('add'));
+
$GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
$GLOBALS['phpgw']->template->set_var('lang_remove',lang('remove'));
$GLOBALS['phpgw']->template->set_var('lang_advanced_options',lang('advanced
options'));
$GLOBALS['phpgw']->template->set_var('lang_qmaildotmode',lang('qmaildotmode'));
$GLOBALS['phpgw']->template->set_var('lang_default',lang('default'));
$GLOBALS['phpgw']->template->set_var('lang_deliveryProgramPath',lang('deliveryProgramPath'));
+
+
$GLOBALS['phpgw']->template->set_var('lang_email_config',lang('edit email
settings'));
+
$GLOBALS['phpgw']->template->set_var('lang_emailAddress',lang('email address'));
+
$GLOBALS['phpgw']->template->set_var('lang_emailaccount_active',lang('email
account active'));
+
$GLOBALS['phpgw']->template->set_var('lang_mailAlternateAddress',lang('alternate
email address'));
+
$GLOBALS['phpgw']->template->set_var('lang_mailRoutingAddress',lang('forward
emails to'));
+
$GLOBALS['phpgw']->template->set_var('lang_forward_also_to',lang('forward also
to'));
+
$GLOBALS['phpgw']->template->set_var('lang_deliver_extern',lang('deliver
extern'));
+
$GLOBALS['phpgw']->template->set_var('lang_edit_email_settings',lang('edit
email settings'));
}
}
?>
====================================================
Index: qmailldap/inc/class.uiqmailldap.inc.php
diff -u qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.7
qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.8
--- qmailldap/inc/class.uiqmailldap.inc.php:1.11.2.1.2.7 Wed Mar 2
22:26:59 2005
+++ qmailldap/inc/class.uiqmailldap.inc.php Wed Mar 2 22:51:49 2005
@@ -101,7 +101,7 @@
reset($menu);
$i=0;
- while (list($key,$value) = each($menu))
+ foreach($menu as $key => $value)
{
$GLOBALS['phpgw']->template->set_var('menu_description',$value['name']);
$linkData = array
@@ -120,7 +120,7 @@
{
$GLOBALS['phpgw']->template->parse('menu_rows','menu_row',True);
}
- $i++;
+ ++$i;
}
if ($_ldapData['needActivation'] == 1)
@@ -196,7 +196,7 @@
if (count($ldapData['rcpthosts']) > 0)
{
$selectBox = '<select
size="10" name="values[rcpthosts]">' . "\n";
- for ($i=0;$i <
count($ldapData['rcpthosts']); $i++)
+ for ($i=0;$i <
count($ldapData['rcpthosts']);++$i)
{
$selectBox .= '<option
value="' . $i .'">' . $ldapData['rcpthosts'][$i] . '</option>' . "\n";
}
@@ -211,7 +211,7 @@
if (count($ldapData['locals']) > 0)
{
$selectBox = '<select
size="10" name="values[locals]">' . "\n";
- for ($i=0;$i <
count($ldapData['locals']); $i++)
+ for ($i=0;$i <
count($ldapData['locals']);++$i)
{
$selectBox .= '<option
value="' . $i . '">' . $ldapData['locals'][$i] . '</option>' . "\n";
}
@@ -243,6 +243,7 @@
'pagenumber'
=> 15,
'serverid'
=> $serverid
);
+
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('delete_route_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
$GLOBALS['phpgw']->template->parse('smtproute_rows','smtproute_row',True);
}
@@ -254,7 +255,6 @@
'pagenumber' => 15,
'serverid' =>
$serverid
);
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('add_route_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
break;
case '20':
@@ -336,22 +336,22 @@
if ($serverList)
{
- for ($i=0; $i < count($serverList); $i++)
+ for ($i=0; $i < count($serverList);++$i)
{
$GLOBALS['phpgw']->template->set_var('server_name',$serverList[$i]['qmail_servername']);
$GLOBALS['phpgw']->template->set_var('server_description',$serverList[$i]['description']);
$linkData = array
(
'menuaction' =>
'qmailldap.uiqmailldap.editServer',
- 'nocache' => '1',
- 'pagenumber' => '0',
+ 'nocache' => 1,
+ 'pagenumber' => 0,
'serverid' =>
$serverList[$i]['id']
);
$GLOBALS['phpgw']->template->set_var('edit_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
$linkData = array
(
'menuaction' =>
'qmailldap.uiqmailldap.editSettings',
- 'nocache' => '1',
+ 'nocache' => 1,
'serverid' =>
$serverList[$i]['id']
);
$GLOBALS['phpgw']->template->set_var('settings_link',$GLOBALS['phpgw']->link('/index.php',$linkData));
====================================================
Index: qmailldap/inc/class.soqmailldap.inc.php
diff -u qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.3
qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.4
--- qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.3 Wed Mar 2
22:26:59 2005
+++ qmailldap/inc/class.soqmailldap.inc.php Wed Mar 2 22:51:49 2005
@@ -156,39 +156,38 @@
if ($allValues['count'] > 0)
{
//print "found something<br>";
- $userData["mailLocalAddress"]
= $allValues[0][$mail_address][0];
- $userData["mailAlternateAddress"]
= $allValues[0]["mailalternateaddress"];
- $userData["accountStatus"]
= $allValues[0]["accountstatus"][0];
- $userData["mailRoutingingAddress"]
= $allValues[0][$routing_address][0];
- $userData["qmailDotMode"]
= $allValues[0]["qmaildotmode"][0];
- $userData["deliveryProgramPath"]
= $allValues[0]["deliveryprogrampath"][0];
- if
($userData["mailAlternateAddress"]["count"] == 0)
+ $userData['mailLocalAddress']
= $allValues[0][$mail_address][0];
+ $userData['mailAlternateAddress']
= $allValues[0]['mailalternateaddress'];
+ $userData['accountStatus']
= $allValues[0]['accountstatus'][0];
+ $userData['mailRoutingingAddress']
= $allValues[0][$routing_address][0];
+ $userData['qmailDotMode']
= $allValues[0]['qmaildotmode'][0];
+ $userData['deliveryProgramPath']
= $allValues[0]['deliveryprogrampath'][0];
+ if
($userData['mailAlternateAddress']['count'] == 0)
{
-
$userData["mailAlternateAddress"]='';
+
$userData['mailAlternateAddress']='';
}
else
{
-
unset($userData["mailAlternateAddress"]["count"]);
+
unset($userData['mailAlternateAddress']['count']);
}
return $userData;
}
}
-
// if we did not return before, return false
- return false;
+ return False;
}
function saveUserData($_accountID, $_accountData)
{
$ldap = $GLOBALS['phpgw']->common->ldapConnect();
- $filter = "uidnumber=$_accountID";
+ $filter = 'uidnumber=' . $_accountID;
$sri =
@ldap_search($ldap,$GLOBALS['phpgw_info']['server']['ldap_context'],$filter);
if ($sri)
{
- $allValues = ldap_get_entries($ldap, $sri);
- $accountDN = $allValues[0]['dn'];
- $uid = $allValues[0]['uid'][0];
+ $allValues =
ldap_get_entries($ldap, $sri);
+ $accountDN = $allValues[0]['dn'];
+ $uid =
$allValues[0]['uid'][0];
$homedirectory =
$allValues[0]['homedirectory'][0];
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] qmailldap/inc class.uiuserdata.inc.php, 1.6.4.5 class.uiqmailldap.inc.php, 1.11.2.1.2.8 class.soqmailldap.inc.php, 1.13.2.2.2.4,
ceb <=