holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove superfluous globals, format

Browse Source
This commit is contained in:
Miles Lott 2005-11-26 14:04:40 +00:00
parent 2a44512e96
commit a828b3cf85
3 changed files with 178 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
admin/inc/class.boldap_mgr.inc.php
View File

@ -134,7 +134,7 @@
{ {
switch($_encoding) switch($_encoding)
{ {
case "q": case 'q':
if(!preg_match("/[\x80-\xFF]/",$_string)) if(!preg_match("/[\x80-\xFF]/",$_string))
{ {
// nothing to quote, only 7 bit ascii // nothing to quote, only 7 bit ascii
@ -145,9 +145,9 @@
$stringParts = explode("=\r\n",$string); $stringParts = explode("=\r\n",$string);
while(list($key,$value) = each($stringParts)) while(list($key,$value) = each($stringParts))
{ {
if(!empty($retString)) $retString .= " "; if(!empty($retString)) $retString .= ' ';
$value = str_replace(" ","_",$value); $value = str_replace(' ','_',$value);
// imap_8bit does not convert "?" // imap_8bit does not convert '?'
// it does not need, but it should // it does not need, but it should
$value = str_replace("?","=3F",$value); $value = str_replace("?","=3F",$value);
$retString .= "=?".strtoupper($this->displayCharset)."?Q?".$value."?="; $retString .= "=?".strtoupper($this->displayCharset)."?Q?".$value."?=";
@ -214,7 +214,7 @@
{ {
if (!empty($this->imapClass)) if (!empty($this->imapClass))
{ {
return ExecMethod("emailadmin.".$this->imapClass.".getMailboxString",$_folderName,3,$this->profileData); return ExecMethod('emailadmin.'.$this->imapClass.'.getMailboxString',$_folderName,3,$this->profileData);
} }
else else
{ {
@ -280,8 +280,6 @@
function restoreSessionData() function restoreSessionData()
{ {
$this->sessionData = $GLOBALS['egw']->session->appsession('session_data'); $this->sessionData = $GLOBALS['egw']->session->appsession('session_data');
$this->userSessionData = $GLOBALS['egw']->session->appsession('user_session_data'); $this->userSessionData = $GLOBALS['egw']->session->appsession('user_session_data');
@ -304,29 +302,17 @@
} }
} }
function saveSessionData() function saveSessionData()
{ {
$GLOBALS['egw']->session->appsession('session_data','',$this->sessionData); $GLOBALS['egw']->session->appsession('session_data','',$this->sessionData);
$GLOBALS['egw']->session->appsession('user_session_data','',$this->userSessionData); $GLOBALS['egw']->session->appsession('user_session_data','',$this->userSessionData);
} }
function saveUserData($_accountID, $_formData, $_boAction) function saveUserData($_accountID, $_formData, $_boAction)
{ {
$this->userSessionData[$_accountID]['mail'] = $_formData["mail"]; $this->userSessionData[$_accountID]['mail'] = $_formData['mail'];
$this->userSessionData[$_accountID]['mailForwardingAddress'] = $_formData["mailForwardingAddress"]; $this->userSessionData[$_accountID]['mailForwardingAddress'] = $_formData['mailForwardingAddress'];
$this->userSessionData[$_accountID]['accountStatus'] = $_formData["accountStatus"]; $this->userSessionData[$_accountID]['accountStatus'] = $_formData['accountStatus'];
switch ($_boAction) switch ($_boAction)
{ {
@ -371,15 +357,17 @@
case 'save': case 'save':
$this->soldapmgr->saveUserData( $this->soldapmgr->saveUserData(
$_accountID, $_accountID,
$this->userSessionData[$_accountID]); $this->userSessionData[$_accountID]
);
$bofelamimail =& CreateObject('felamimail.bofelamimail'); $bofelamimail =& CreateObject('felamimail.bofelamimail');
$bofelamimail->openConnection('','',true); $bofelamimail->openConnection('','',true);
$bofelamimail->imapSetQuota($GLOBALS['egw']->accounts->id2name($_accountID), $bofelamimail->imapSetQuota(
$this->userSessionData[$_accountID]['quotaLimit']); $GLOBALS['egw']->accounts->id2name($_accountID),
$this->userSessionData[$_accountID]['quotaLimit']
);
$bofelamimail->closeConnection(); $bofelamimail->closeConnection();
$GLOBALS['egw']->accounts->cache_invalidate($_accountID); $GLOBALS['egw']->accounts->cache_invalidate($_accountID);
break; break;
} }
} }
@ -388,14 +376,13 @@
{ {
if (!empty($this->imapClass)) if (!empty($this->imapClass))
{ {
ExecMethod("emailadmin.".$this->imapClass.".updateAccount",$_hookValues,3,$this->profileData); ExecMethod('emailadmin.'.$this->imapClass.'.updateAccount',$_hookValues,3,$this->profileData);
} }
if (!empty($this->smtpClass)) if (!empty($this->smtpClass))
{ {
ExecMethod("emailadmin.".$this->smtpClass.".updateAccount",$_hookValues,3,$this->profileData); ExecMethod('emailadmin.'.$this->smtpClass.'.updateAccount',$_hookValues,3,$this->profileData);
} }
} }
} }
?> ?>

60
admin/inc/class.soldap_mgr.inc.php
View File

@ -1,9 +1,9 @@
<?php <?php
/***************************************************************************\ /***************************************************************************\
* EGroupWare - LDAPManager * * EGroupWare - LDAPManager *
* http://www.egroupware.org * * http://www.egroupware.org *
* Written by : Andreas Krause (ak703@users.sourceforge.net * * Written by : Andreas Krause (ak703@users.sourceforge.net *
* based on EmailAdmin by Lars Kneschke [lkneschke@egroupware.org] * * based on EmailAdmin by Lars Kneschke [lkneschke@egroupware.org] *
* ------------------------------------------------- * * ------------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the * * under the terms of the GNU General Public License as published by the *
@ -15,18 +15,15 @@
{ {
function soldap_mgr() function soldap_mgr()
{ {
$this->db = clone($GLOBALS['egw']->db); $this->db = clone($GLOBALS['egw']->db);
include(EGW_INCLUDE_ROOT.'/emailadmin/setup/tables_current.inc.php'); include(EGW_INCLUDE_ROOT.'/emailadmin/setup/tables_current.inc.php');
$this->tables = &$phpgw_baseline; $this->tables = &$phpgw_baseline;
unset($phpgw_baseline); unset($phpgw_baseline);
$this->table = &$this->tables['phpgw_emailadmin']; $this->table = &$this->tables['phpgw_emailadmin'];
} }
function getUserData($_accountID) function getUserData($_accountID)
{ {
global $phpgw, $phpgw_info;
$ldap = $GLOBALS['egw']->common->ldapConnect(); $ldap = $GLOBALS['egw']->common->ldapConnect();
$filter = "(&(uidnumber=$_accountID))"; $filter = "(&(uidnumber=$_accountID))";
@ -36,15 +33,15 @@
$allValues = ldap_get_entries($ldap, $sri); $allValues = ldap_get_entries($ldap, $sri);
if ($allValues['count'] > 0) if ($allValues['count'] > 0)
{ {
#print "found something<br>"; #print 'found something<br>';
$userData["mail"] = $allValues[0]["mail"][0]; $userData['mail'] = $allValues[0]['mail'][0];
$userData["mailAlternateAddress"] = $allValues[0]["mailalternateaddress"]; $userData['mailAlternateAddress'] = $allValues[0]['mailalternateaddress'];
$userData["accountStatus"] = $allValues[0]["accountstatus"][0]; $userData['accountStatus'] = $allValues[0]['accountstatus'][0];
$userData["mailForwardingAddress"] = $allValues[0]["mailforwardingaddress"][0]; $userData['mailForwardingAddress'] = $allValues[0]['mailforwardingaddress'][0];
$userData["deliveryMode"] = $allValues[0]["deliverymode"][0]; $userData['deliveryMode'] = $allValues[0]['deliverymode'][0];
unset($userData["mailAlternateAddress"]["count"]); unset($userData['mailAlternateAddress']['count']);
unset($userData["mailForwardingAddress"]["count"]); unset($userData['mailForwardingAddress']['count']);
return $userData; return $userData;
} }
@ -56,7 +53,6 @@
function saveUserData($_accountID, $_accountData) function saveUserData($_accountID, $_accountData)
{ {
$ldap = $GLOBALS['egw']->common->ldapConnect(); $ldap = $GLOBALS['egw']->common->ldapConnect();
// need to be fixed // need to be fixed
if(is_numeric($_accountID)) if(is_numeric($_accountID))
@ -92,14 +88,14 @@
// the old code for qmail ldap // the old code for qmail ldap
$newData = array $newData = array
( (
'mail' => $_accountData["mail"], 'mail' => $_accountData['mail'],
'mailAlternateAddress' => $_accountData["mailAlternateAddress"], 'mailAlternateAddress' => $_accountData['mailAlternateAddress'],
'mailForwardingAddress' => $_accountData["mailForwardingAddress"], 'mailForwardingAddress' => $_accountData['mailForwardingAddress'],
// 'homedirectory' => $homedirectory, // 'homedirectory' => $homedirectory,
// 'mailMessageStore' => $homedirectory."/Maildir/", // 'mailMessageStore' => $homedirectory.'/Maildir/',
// 'gidnumber' => '1000', // 'gidnumber' => '1000',
// 'qmailDotMode' => $_accountData["qmailDotMode"], // 'qmailDotMode' => $_accountData['qmailDotMode'],
// 'deliveryProgramPath' => $_accountData["deliveryProgramPath"] // 'deliveryProgramPath' => $_accountData['deliveryProgramPath']
); );
if(!in_array('qmailUser',$objectClasses) && if(!in_array('qmailUser',$objectClasses) &&
@ -111,21 +107,21 @@
// the new code for postfix+cyrus+ldap // the new code for postfix+cyrus+ldap
$newData = array $newData = array
( (
'mail' => $_accountData["mail"], 'mail' => $_accountData['mail'],
'accountStatus' => $_accountData["accountStatus"], 'accountStatus' => $_accountData['accountStatus'],
'objectclass' => $objectClasses 'objectclass' => $objectClasses
); );
if(is_array($_accountData["mailAlternateAddress"])) if(is_array($_accountData['mailAlternateAddress']))
{ {
$newData['mailAlternateAddress'] = $_accountData["mailAlternateAddress"]; $newData['mailAlternateAddress'] = $_accountData['mailAlternateAddress'];
} }
else else
{ {
$newData['mailAlternateAddress'] = array(); $newData['mailAlternateAddress'] = array();
} }
if($_accountData["accountStatus"] == 'active') if($_accountData['accountStatus'] == 'active')
{ {
$newData['accountStatus'] = 'active'; $newData['accountStatus'] = 'active';
} }
@ -134,9 +130,9 @@
$newData['accountStatus'] = 'disabled'; $newData['accountStatus'] = 'disabled';
} }
/* /*
if(!empty($_accountData["deliveryMode"])) if(!empty($_accountData['deliveryMode']))
{ {
$newData['deliveryMode'] = $_accountData["deliveryMode"]; $newData['deliveryMode'] = $_accountData['deliveryMode'];
} }
else else
{ {
@ -144,9 +140,9 @@
} }
*/ */
// if(is_array($_accountData["mailForwardingAddress"])) // if(is_array($_accountData['mailForwardingAddress']))
// { // {
$newData['mailForwardingAddress'] = $_accountData["mailForwardingAddress"]; $newData['mailForwardingAddress'] = $_accountData['mailForwardingAddress'];
// } // }
// else // else
// { // {
@ -161,7 +157,7 @@
if($GLOBALS['egw_info']['server']['account_repository'] == 'sql') if($GLOBALS['egw_info']['server']['account_repository'] == 'sql')
{ {
$this->db->update('egw_accounts',array( $this->db->update('egw_accounts',array(
'account_email' => $_accountData["mail"] 'account_email' => $_accountData['mail']
), ),
array( array(
'account_id' => $_accountID 'account_id' => $_accountID

139
admin/inc/class.uildap_mgr.inc.php
View File

@ -1,9 +1,9 @@
<?php <?php
/***************************************************************************\ /***************************************************************************\
* EGroupWare - LDAPManager * * EGroupWare - LDAPManager *
* http://www.egroupware.org * * http://www.egroupware.org *
* Written by : Andreas Krause (ak703@users.sourceforge.net * * Written by : Andreas Krause (ak703@users.sourceforge.net *
* based on EmailAdmin by Lars Kneschke [lkneschke@egroupware.org] * * based on EmailAdmin by Lars Kneschke [lkneschke@egroupware.org] *
* ------------------------------------------------- * * ------------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the * * under the terms of the GNU General Public License as published by the *
@ -16,27 +16,24 @@
var $public_functions = array var $public_functions = array
( (
'editUserData' => True, 'editUserData' => True,
'saveUserData' => True 'saveUserData' => True
); );
function uildap_mgr() function uildap_mgr()
{ {
$this->t =& CreateObject('phpgwapi.Template',EGW_APP_TPL); $this->t =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
$this->boldapmgr =& CreateObject('admin.boldap_mgr'); $this->boldapmgr =& CreateObject('admin.boldap_mgr');
} }
function display_app_header() function display_app_header()
{ {
$GLOBALS['egw']->common->egw_header(); $GLOBALS['egw']->common->egw_header();
echo parse_navbar(); echo parse_navbar();
} }
function editUserData($_useCache='0') function editUserData($_useCache='0')
{ {
global $phpgw, $phpgw_info, $_GET;
$accountID = $_GET['account_id']; $accountID = $_GET['account_id'];
$GLOBALS['account_id'] = $accountID; $GLOBALS['account_id'] = $accountID;
@ -44,44 +41,43 @@
$this->translate(); $this->translate();
$this->t->set_file(array("editUserData" => "account_form_ldapdata.tpl")); $this->t->set_file(array('editUserData' => 'account_form_ldapdata.tpl'));
$this->t->set_block('editUserData','form','form'); $this->t->set_block('editUserData','form','form');
$this->t->set_block('editUserData','link_row','link_row'); $this->t->set_block('editUserData','link_row','link_row');
$this->t->set_var("th_bg",$GLOBALS['egw_info']["theme"]["th_bg"]); $this->t->set_var('th_bg',$GLOBALS['egw_info']['theme']['th_bg']);
$this->t->set_var("tr_color1",$GLOBALS['egw_info']["theme"]["row_on"]); $this->t->set_var('tr_color1',$GLOBALS['egw_info']['theme']['row_on']);
$this->t->set_var("tr_color2",$GLOBALS['egw_info']["theme"]["row_off"]); $this->t->set_var('tr_color2',$GLOBALS['egw_info']['theme']['row_off']);
$this->t->set_var("lang_email_config",lang("edit email settings"));
$this->t->set_var("lang_emailAddress",lang("email address"));
$this->t->set_var("lang_emailaccount_active",lang("email account active"));
$this->t->set_var("lang_mailAlternateAddress",lang("alternate email address"));
$this->t->set_var("lang_mailForwardingAddress",lang("forward email's to"));
$this->t->set_var("lang_forward_also_to",lang("forward also to"));
$this->t->set_var("lang_button",lang("save"));
$this->t->set_var("lang_deliver_extern",lang("deliver extern"));
$this->t->set_var("lang_edit_email_settings",lang("edit email settings"));
$this->t->set_var("lang_ready",lang("Done"));
$this->t->set_var("link_back",$GLOBALS['egw']->link('/admin/accounts.php'));
$this->t->set_var("info_icon",EGW_IMAGES_DIR.'/info.gif');
$this->t->set_var('lang_email_config',lang('edit email settings'));
$this->t->set_var('lang_emailAddress',lang('email address'));
$this->t->set_var('lang_emailaccount_active',lang('email account active'));
$this->t->set_var('lang_mailAlternateAddress',lang('alternate email address'));
$this->t->set_var('lang_mailForwardingAddress',lang('forward emails to'));
$this->t->set_var('lang_forward_also_to',lang('forward also to'));
$this->t->set_var('lang_button',lang('save'));
$this->t->set_var('lang_deliver_extern',lang('deliver extern'));
$this->t->set_var('lang_edit_email_settings',lang('edit email settings'));
$this->t->set_var('lang_ready',lang('Done'));
$this->t->set_var('link_back',$GLOBALS['egw']->link('/admin/accounts.php'));
$this->t->set_var('info_icon',EGW_IMAGES_DIR.'/info.gif');
$linkData = array $linkData = array
( (
'menuaction' => 'admin.uildap_mgr.saveUserData', 'menuaction' => 'admin.uildap_mgr.saveUserData',
'account_id' => $accountID 'account_id' => $accountID
); );
$this->t->set_var("form_action", $GLOBALS['egw']->link('/index.php',$linkData)); $this->t->set_var('form_action', $GLOBALS['egw']->link('/index.php',$linkData));
// only when we show a existing user // only when we show a existing user
if($userData = $this->boldapmgr->getUserData($accountID, $_useCache)) if($userData = $this->boldapmgr->getUserData($accountID, $_useCache))
{ {
echo "<br><br><br>"; echo '<br><br><br>';
if ($userData['mailAlternateAddress'] != '') if ($userData['mailAlternateAddress'] != '')
{ {
$options_mailAlternateAddress = "<select size=\"6\" name=\"mailAlternateAddress\">\n"; $options_mailAlternateAddress = '<select size="6" name="mailAlternateAddress">' . "\n";
for ($i=0;$i < count($userData['mailAlternateAddress']); $i++) for ($i=0;$i < count($userData['mailAlternateAddress']); $i++)
{ {
$options_mailAlternateAddress .= "<option value=\"".$i."\">". $options_mailAlternateAddress .= '<option value="' . $i. '">' .
$userData['mailAlternateAddress'][$i]. $userData['mailAlternateAddress'][$i].
"</option>\n"; "</option>\n";
} }
@ -92,66 +88,69 @@
$options_mailAlternateAddress = lang('no alternate email address'); $options_mailAlternateAddress = lang('no alternate email address');
} }
$this->t->set_var("mail",$userData["mail"]); $this->t->set_var('mail',$userData['mail']);
//$this->t->set_var("mailAlternateAddress",''); could be deleted? //$this->t->set_var('mailAlternateAddress',''); could be deleted?
if ($userData["mailForwardingAddress"] == "") if ($userData['mailForwardingAddress'] == '')
{ {
$this->t->set_var("mailForwardingAddress",$userData["mail"]); $this->t->set_var('mailForwardingAddress',$userData['mail']);
} }
else else
{ {
$this->t->set_var("mailForwardingAddress",$userData["mailForwardingAddress"]); $this->t->set_var('mailForwardingAddress',$userData['mailForwardingAddress']);
} }
$this->t->set_var("options_mailAlternateAddress",$options_mailAlternateAddress); $this->t->set_var('options_mailAlternateAddress',$options_mailAlternateAddress);
$this->t->set_var("uid",rawurlencode($_accountData["dn"])); $this->t->set_var('uid',rawurlencode($_accountData['dn']));
if ($userData["accountStatus"] == "active") if ($userData['accountStatus'] == 'active')
$this->t->set_var("account_checked","checked"); {
if ($userData["deliveryMode"] == "forwardOnly") $this->t->set_var('account_checked','checked');
$this->t->set_var("forwardOnly_checked","checked"); }
if ($_accountData["deliverExtern"] == "active") if ($userData['deliveryMode'] == 'forwardOnly')
$this->t->set_var("deliver_checked","checked"); {
$this->t->set_var('forwardOnly_checked','checked');
}
if ($_accountData['deliverExtern'] == 'active')
{
$this->t->set_var('deliver_checked','checked');
}
} }
else else
{ {
$this->t->set_var("mail",''); $this->t->set_var('mail','');
$this->t->set_var("mailAlternateAddress",''); $this->t->set_var('mailAlternateAddress','');
$this->t->set_var("mailForwardingAddress",''); $this->t->set_var('mailForwardingAddress','');
$this->t->set_var("options_mailAlternateAddress",lang('no alternate email address')); $this->t->set_var('options_mailAlternateAddress',lang('no alternate email address'));
$this->t->set_var("account_checked",''); $this->t->set_var('account_checked','');
$this->t->set_var("forwardOnly_checked",''); $this->t->set_var('forwardOnly_checked','');
} }
// create the menu on the left, if needed // create the menu on the left, if needed
$menuClass =& CreateObject('admin.uimenuclass'); $menuClass =& CreateObject('admin.uimenuclass');
$this->t->set_var('rows',$menuClass->createHTMLCode('edit_user')); $this->t->set_var('rows',$menuClass->createHTMLCode('edit_user'));
$this->t->pparse("out","form"); $this->t->pparse('out','form');
} }
function saveUserData() function saveUserData()
{ {
global $_POST, $_GET; if($_POST['accountStatus'] == 'on')
if($_POST["accountStatus"] == "on")
{ {
$accountStatus = "active"; $accountStatus = 'active';
} }
if($_POST["forwardOnly"] == "on") if($_POST['forwardOnly'] == 'on')
{ {
$deliveryMode = "forwardOnly"; $deliveryMode = 'forwardOnly';
} }
$formData = array $formData = array
( (
'mail' => $_POST["mail"], 'mail' => $_POST['mail'],
'mailAlternateAddress' => $_POST["mailAlternateAddress"], 'mailAlternateAddress' => $_POST['mailAlternateAddress'],
'mailForwardingAddress' => $_POST["mailForwardingAddress"], 'mailForwardingAddress' => $_POST['mailForwardingAddress'],
'add_mailAlternateAddress' => $_POST["mailAlternateAddressInput"], 'add_mailAlternateAddress' => $_POST['mailAlternateAddressInput'],
'remove_mailAlternateAddress' => $_POST["mailAlternateAddress"], 'remove_mailAlternateAddress' => $_POST['mailAlternateAddress'],
'accountStatus' => $accountStatus, 'accountStatus' => $accountStatus,
'deliveryMode' => $deliveryMode 'deliveryMode' => $deliveryMode
); );
@ -159,11 +158,11 @@
//echo "<br><br>DebugArray in uiuserdata"; //echo "<br><br>DebugArray in uiuserdata";
// echo _debug_array($formData); // echo _debug_array($formData);
if($_POST["add_mailAlternateAddress"]) $bo_action='add_mailAlternateAddress'; if($_POST['add_mailAlternateAddress']) $bo_action='add_mailAlternateAddress';
if($_POST["remove_mailAlternateAddress"]) $bo_action='remove_mailAlternateAddress'; if($_POST['remove_mailAlternateAddress']) $bo_action='remove_mailAlternateAddress';
if($_POST["save"]) $bo_action='save'; if($_POST['save']) $bo_action='save';
if (!$_POST["mail"]== "") //attribute 'mail'is not allowed to be empty if (!$_POST['mail'] == '') //attribute 'mail'is not allowed to be empty
{ {
// error generator necessary!! // error generator necessary!!
$this->boldapmgr->saveUserData($_GET['account_id'], $formData, $bo_action); $this->boldapmgr->saveUserData($_GET['account_id'], $formData, $bo_action);
@ -182,8 +181,6 @@
function translate() function translate()
{ {
$this->t->set_var('th_bg',$GLOBALS['egw_info']['theme']['th_bg']); $this->t->set_var('th_bg',$GLOBALS['egw_info']['theme']['th_bg']);
$this->t->set_var('lang_add',lang('add')); $this->t->set_var('lang_add',lang('add'));