Changeset 163

Timestamp:

07/01/07 12:00:48 (2 years ago)

Author:

shupp

Message:

add space between control structure keyword and opening parentheses for PEAR CS compliance

Files:

• trunk/Framework/Auth/Vpopmail.php (modified) (2 diffs)
• trunk/Framework/Module/Accounts.php (modified) (25 diffs)
• trunk/Framework/Module/Domains.php (modified) (10 diffs)
• trunk/Framework/Module/Forwards.php (modified) (22 diffs)
• trunk/Framework/Module/Login.php (modified) (1 diff)
• trunk/Framework/Module/Responders.php (modified) (24 diffs)
• trunk/Framework/Object/Web.php (modified) (2 diffs)
• trunk/Framework/Site/Default/config.xml (modified) (1 diff)
• trunk/Framework/User/toasterAdmin.php (modified) (7 diffs)
• trunk/Vpopmail/Base.php (modified) (6 diffs)
• trunk/Vpopmail/Main.php (modified) (48 diffs)

trunk/Framework/Auth/Vpopmail.php

@@ -33 +33 @@
-        $timeLimit = (int)Framework::$site->config->inactiveTimeout;
-        $this->user->recordio("timeout info: time: $time, lastActionTime: $lastActionTime, timeLimit: $timeLimit");
-
+ 
-            header('Location: ./?module=Login&event=logoutInactive');
-            return false;
@@ -41 +41 @@
-        $encryptedPass = $this->session->__get('password');
-        $plainPass =  Framework_User_passEncryption::decryptPass($encryptedPass, (string)Framework::$site->config->mcryptKey);
-
+ 
-            $this->session->__set('lastActionTime', $time);
-            $this->setData('logged_in_as', $this->session->__get('email'));

trunk/Framework/Module/Accounts.php

@@ -41 +41 @@
-        parent::__construct();
-        // Make sure doamin was supplied
-
+ 
-            throw new Framework_Exception(_("Error: no domain supplied"));
-        $this->domain = $_REQUEST['domain'];
@@ -56 +56 @@
-    protected function checkPrivileges() {
-        // Verify that they have access to this domain
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $this->domain);
-        }
@@ -75 +75 @@
-
-        $privs = $this->checkPrivileges();
-
+ 
-
-        // Pagintation setup
-        $total = $this->user->userCount($this->domain);
-
+ 
-        $this->paginate($total);
-
@@ -86 +86 @@
-        $accounts = array();
-        $count = 0;
-
+ 
-            $accounts[$count]['account'] = $key;
-            $accounts[$count]['comment'] = $val['comment'];
@@ -124 +124 @@
-
-        $privs = $this->checkPrivileges();
-
+ 
-
-        $form = $this->addAccountForm();
@@ -137 +137 @@
-    static function sameDomain ($name, $value) {
-        $emailArray = explode('@', $value);
-
+ 
-            return true;
-        } else {
@@ -147 +147 @@
-
-        $privs = $this->checkPrivileges();
-
+ 
-
-        $form = $this->addAccountForm();
-
+ 
-            $renderer =& new HTML_QuickForm_Renderer_Array();
-            $form->accept($renderer);
@@ -161 +161 @@
-        $emailArray = explode('@', $_REQUEST['account']);
-        $result = $this->user->addUser($this->domain, $emailArray[0], $_REQUEST['password'], $_REQUEST['comment']);
-
+ 
-            $this->setData('message', _("Error: ") . $result->getMessage());
-            $renderer =& new HTML_QuickForm_Renderer_Array();
@@ -202 +202 @@
-
-        $privs = $this->checkPrivileges();
-
-
-
+ 
+
+ 
-            return PEAR::raiseError(_("Error: no account supplied"));
-        }
@@ -221 +221 @@
-
-        $privs = $this->checkPrivileges();
-
-
-
+ 
+
+ 
-            return PEAR::raiseError(_("Error: no account supplied"));
-        }
-
-
+ 
-            return PEAR::raiseError(_("Error: no domain supplied"));
-        }
-
-        $result = $this->user->delUser($this->domain, $_REQUEST['account']);
-
+ 
-            return $result;
-        }
@@ -244 +244 @@
-
-        $privs = $this->checkPrivileges();
-
+ 
-
-        $this->setData('message', _("Delete Canceled"));
@@ -254 +254 @@
-
-        // Make sure account was supplied
-
+ 
-            return PEAR::raiseError(_("Error: no account supplied"));
-        }
@@ -260 +260 @@
-
-        // Check privs
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $this->domain);
-        }
-
-        // See what user_info to use
-
+ 
-            $account_info = $this->user->userInfo($this->domain, $_REQUEST['account']);
-
+ 
-        } else {
-            $account_info = $this->user->loginUser;
@@ -274 +274 @@
-        // Get .qmail info if it exists
-        $dot_qmail = $this->user->readFile($this->domain, $_REQUEST['account'], '.qmail');
-
+ 
-            return $dot_qmail;
-        }
@@ -294 +294 @@
-        $this->setData('LANG_Modify_Account', _("Modify Account"));
-        $this->setData('LANG_Domain_Menu', _("Domain Menu"));
-
+ 
-            $this->setData('isDomainAdmin', 1);
-            $this->setData('LANG_Main_Menu', _("Main Menu"));
@@ -329 +329 @@
-
-        // Make sure account was supplied
-
+ 
-            return PEAR::raiseError(_("Error: no account supplied"));
-        }
@@ -335 +335 @@
-
-        // Check privs
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $this->domain);
-        }
@@ -341 +341 @@
-        // See what user_info to use
-        $account_info = $this->user->userInfo($this->domain, $_REQUEST['account']);
-
+ 
-            return $account_info;
-        }
@@ -352 +352 @@
-        $defaults = $this->user->parseHomeDotqmail($dot_qmail, $account_info);
-        $form = $this->modifyAccountForm($account, $defaults);
-
+ 
-            $this->setData('message', _("Error Modifying Account"));
-            $renderer =& new HTML_QuickForm_Renderer_Array();
@@ -364 +364 @@
-        $routing = '';
-        $save_a_copy = 0;
-
+ 
-            $routing = 'standard';
-
+ 
-            $routing = 'deleted';
-
-
+ 
+ 
-                $this->setData('message', _('Error: you must supply a forward address'));
-                return $this->modifyAccount();
@@ -376 +376 @@
-            }
-            $routing = 'forwarded';
-
+ 
-        } else {
-                $this->setData('message', _('Error: unsupported routing selection'));
@@ -384 +384 @@
-        // Check for vacation
-        $vacation = 0;
-
+ 
-            $vacation = 1;
-            $vacation_subject = $_REQUEST['vacation_subject'];
@@ -392 +392 @@
-        // Build .qmail contents
-        $dot_qmail_contents = '';
-
+ 
-            $dot_qmail_contents = "# delete";
-
+ 
-            $dot_qmail_contents = "&$forward";
-
-
-
-
-
+ 
+
+
+ 
+ 
-            $vacation_dir = $account_info['user_dir'] . '/vacation';
-            $dot_qmail_contents .= '| ' . VPOPMAIL_ROBOT_PROGRAM;
@@ -409 +409 @@
-
-        $dot_qmail_file = '.qmail';
-
+ 
-            $contents = explode("\n", $dot_qmail_contents);
-            // Delete existing file
@@ -417 +417 @@
-
-            // Add vacation files
-
+ 
-                $vcontents = "From: " . $account_info['name'] . "@{$this->domain}\n";
-                $vcontents .= "Subject: $vacation_subject\n\n";

trunk/Framework/Module/Domains.php

@@ -47 +47 @@
-    public function accessDirector()
-    {
-
+ 
-            $domain = $this->session->__get('domain');
-            // Redirect to appropriate page
-
+ 
-                header("Location: ./?module=Domains&event=domainMenu&domain=" . urlencode($domain));
-                return;
@@ -72 +72 @@
-        // Pagination setup
-        $total = $this->user->domainCount();
-
+ 
-        $this->paginate($total);
-
@@ -79 +79 @@
-        $domains = array();
-        $count = 0;
-
+ 
-            $domains[$count]['name'] = $key;
-            $domains[$count]['edit_url'] = htmlspecialchars('./?module=Domains&event=domainMenu&domain=' . $key);
@@ -104 +104 @@
-    {
-        // Make sure the domain was supplied
-
-
+ 
+ 
-                return PEAR::raiseError(_("Error: no domain supplied"));
-            $domain = $_REQUEST['domain'];
-        }
-
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $domain);
-        }
-
-
+ 
-        // Setup URLs
-        $this->setData('domain', $domain);
@@ -135 +135 @@
-    function addDomain()
-    {
-
+ 
-            return PEAR::raiseError(_('Error: you do not have add domain privileges'));
-        }
@@ -149 +149 @@
-    function addDomainNow()
-    {
-
+ 
-            return PEAR::raiseError(_('Error: you do not have add domain privileges'));
-        }
-
-        $form = $this->addDomainForm();
-
+ 
-            $this->addDomain();
-            return;
@@ -161 +161 @@
-        // Add domain
-        $result = $this->user->AddDomain($_REQUEST['domain'], $_REQUEST['password']);
-
+ 
-            $this->setData('message', _("Error: ") . $result->getMessage());
-            return $this->addDomain();
@@ -187 +187 @@
-    {
-        // Make sure the domain was supplied
-
-
+ 
+ 
-                return PEAR::raiseError(_("Error: no domain supplied"));
-            $domain = $_REQUEST['domain'];
-        }
-
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $domain);
-        }
@@ -211 +211 @@
-    {
-        // Make sure the domain was supplied
-
-
+ 
+ 
-                return PEAR::raiseError(_("Error: no domain supplied"));
-            $domain = $_REQUEST['domain'];
-        }
-
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $domain);
-        }
@@ -223 +223 @@
-        // Delete domain
-        $result = $this->user->delDomain($domain);
-
+ 
-            $this->setData('message', _("Error: ") . $result->getMessage());
-            return $this->listDomains();

trunk/Framework/Module/Forwards.php

@@ -41 +41 @@
-        parent::__construct();
-        // Make sure doamin was supplied
-
+ 
-            throw new Framework_Exception(_("Error: no domain supplied"));
-        $this->domain = $_REQUEST['domain'];
@@ -61 +61 @@
-    protected function checkPrivileges() {
-        // Verify that they have access to this domain
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $this->domain);
-        }
@@ -72 +72 @@
-        // Pagintation setup
-        $full_alias_array = $this->user->ListAlias($this->domain);
-
+ 
-        // Format the valias outpt from vpopmaild
-        $aliasesParsed = $this->user->parseAliases($full_alias_array, 'forwards');
@@ -79 +79 @@
-        $this->setData('total', $total);
-        $this->setData('limit', (integer)Framework::$site->config->maxPerPage);
-
-
+ 
+ 
-                $start = 1;
-            } else {
@@ -86 +86 @@
-            }
-        }
-
+ 
-        $this->setData('start', $start);
-        $this->setData('currentPage', ceil($this->data['start'] / $this->data['limit']));
@@ -93 +93 @@
-        // List Accounts
-        $alias_array = $this->user->listAliases($aliasesParsed, $this->data['currentPage'], $this->data['limit']);
-
-
-
+ 
+
+ 
-            $this->setData('message', _("No Forwards.  Care to add one?"));
-            return $this->addForward();
@@ -102 +102 @@
-        $aliases = array();
-        $count = 0;
-
+ 
-            $forwardName = ereg_replace('@.*$', '', $key);
-            $aliases[$count]['name'] = $forwardName;
@@ -132 +132 @@
-    function addForward() {
-        $result = $this->checkPrivileges();
-
+ 
-
-        $form = $this->addForwardForm();
@@ -168 +168 @@
-    function addForwardNow() {
-        $result = $this->checkPrivileges();
-
+ 
-
-        $form = $this->addForwardForm();
-
+ 
-            $renderer =& new HTML_QuickForm_Renderer_Array();
-            $form->accept($renderer);
@@ -184 +184 @@
-
-        $result = $this->addForwardLine();
-
-
+ 
+ 
-                $this->setData('message', _("Forward already exists"));
-                return $this->addForward();
@@ -198 +198 @@
-
-        $contents = $this->user->ReadFile($this->domain, '', ".qmail-" . $this->data['forward']);
-
-
+ 
+ 
-                return PEAR::raiseError("Forward Exists");
-
+ 
-                return PEAR::raiseError(_("Error: ") . $this->user->Error);
-            }
-        } else {
-
+ 
-        }
-    
-        // Now build a new array without that forward
-
-
+ 
+ 
-            return PEAR::raiseError('Error: destination already exists');
-        }
-        array_push($contents, "&" . $this->data['destination']);
-        $this->user->WriteFile($contents, $this->domain, '', ".qmail-" . $this->data['forward']);
-
+ 
-                return PEAR::raiseError(_("Error: ") . $this->user->Error);
-        }
@@ -223 +223 @@
-
-        $contents = $this->user->ReadFile($this->domain, '', ".qmail-" . $this->data['forward']);
-
+ 
-                return PEAR::raiseError($this->user->Error, 1);
-    
-        // Now build a new array without that forward
-
+ 
-            return PEAR::raiseError(_('Error: forward line does not exist'), 2);
-        }
-
-
+ 
-            // tell caller to delete instead
-            return PEAR::raiseError(_("Only one line, use delete instead"), 3);
@@ -237 +237 @@
-        $newContents = array();
-        $count = 1;
-
-
+ 
+ 
-            $newContents[$count] = $val;
-            $count++;
-        }
-        $this->user->WriteFile($newContents, $this->domain, '', ".qmail-" . $this->data['forward']);
-
+ 
-            return PEAR::raiseError(_("Error: ") . $this->user->Error, 4);
-        }
@@ -253 +253 @@
-        $this->checkPrivileges();
-        // Make sure forward was supplied
-
+ 
-            $this->setData('message', _("Error: no forward provided"));
-            return $this->listForwards();
@@ -262 +262 @@
-        // Get forward info if it exists
-        $contents = $this->user->ReadFile($this->domain, '', ".qmail-$forward");
-
+ 
-    
-        // Set template data
@@ -279 +279 @@
-        $count = 0;
-        $forward_array = array();
-
+ 
-            $forward_array[$count]['destination'] = $this->user->displayForwardLine($val);
-            $forward_array[$count]['delete_url'] = htmlspecialchars("./?module=Forwards&event=deleteForwardLineNow&domain={$this->domain}&forward=" . $_REQUEST['forward'] . "&line=" . urlencode($val));
@@ -295 +295 @@
-        // Get forward info if it exists
-        $contents = $this->user->ReadFile($this->domain, '', ".qmail-$forward");
-
+ 
-
-        $form = $this->modifyForwardForm();
-
+ 
-
-            // Set template data
@@ -313 +313 @@
-    
-        $result = $this->addForwardLine($type = 'modify');
-
-
+ 
+ 
-                $this->setData('message', _("Error: destination already exists"));
-                return $this->modifyForward();
@@ -354 +354 @@
-
-        // Make sure forward was supplied
-
+ 
-            $this->setData('message', _("Error: no forward provided"));
-            return $this->listForwards();
-        }
-        // Make sure line was supplied
-
+ 
-            $this->setData('message', _("Error: no forward line provided"));
-            return $this->modifyForward();
@@ -369 +369 @@
-
-        $result = $this->deleteForwardLine();
-
-
+ 
+ 
-                $this->setData('message', $result->getMessage());
-                return $this->listAliases();
-
+ 
-                $this->setData('message', $result->getMessage());
-                return $this->modifyForward();
-
+ 
-                return $this->deleteForward();
-            } else {
@@ -391 +391 @@
-
-        // Make sure forward was supplied
-
+ 
-            $this->setData('message', _("Error: no forward provided"));
-            return $this->listForwards();
@@ -397 +397 @@
-        $forward = ereg_replace('^.qmail-', '', $_REQUEST['forward']);
-        $contents = $this->user->ReadFile($this->domain, '', ".qmail-" . $forward);
-
+ 
-            return PEAR::raiseError($this->user->Error);
-        $this->user->RmFile($this->domain, '', '.qmail-' . $forward);
-
+ 
-            return PEAR::raiseError($this->user->Error);
-        $this->setData('message', _("Forward Deleted Successfully"));

trunk/Framework/Module/Login.php

@@ -39 +39 @@
-        if ($form->validate()) {
-            $result = $this->user->authenticate($_POST['email'], $_POST['password']);
-
+ 
-                $this->setData('loginError', $result->getMessage());
-                $this->setData('QF_Form', $form->toHtml());

trunk/Framework/Module/Responders.php

@@ -39 +39 @@
-        parent::__construct();
-        // Make sure doamin was supplied
-
+ 
-            throw new Framework_Exception(_("Error: no domain supplied"));
-        $this->domain = $_REQUEST['domain'];
@@ -54 +54 @@
-    protected function checkPrivileges() {
-        // Verify that they have access to this domain
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $this->domain);
-        }
@@ -79 +79 @@
-        // Pagintation setup
-        $total = count($autoresponders_raw);
-
+ 
-        $this->setData('total', $total);
-        $this->setData('limit', (integer)Framework::$site->config->maxPerPage);
-
-
+ 
+ 
-                $start = 1;
-            } else {
@@ -89 +89 @@
-            }
-        }
-
+ 
-        $this->setData('start', $start);
-        $this->setData('currentPage', ceil($this->data['start'] / $this->data['limit']));
@@ -98 +98 @@
-        $autoresponders = array();
-        $count = 0;
-
+ 
-            $autoresponders[$count]['autoresponder'] = $key;
-            $autoresponders[$count]['edit_url'] = htmlspecialchars("./?module=Responders&domain={$this->domain}&responder=$key&event=modifyResponder");
@@ -142 +142 @@
-    static function sameDomain ($name, $value) {
-        $emailArray = explode('@', $value);
-
+ 
-        return false;
-    }
@@ -149 +149 @@
-
-        $form = $this->addForm();
-
+ 
-            $renderer =& new HTML_QuickForm_Renderer_Array();
-            $form->accept($renderer);
@@ -167 +167 @@
-
-        $this->user->AddUser($this->domain, $emailArray[0], $_REQUEST['password'], $_REQUEST['comment']);
-
+ 
-            $this->setData('message', _("Error: ") . $this->user->Error);
-            $renderer =& new HTML_QuickForm_Renderer_Array();
@@ -209 +209 @@
-    function delete() {
-
-
+ 
-            return PEAR::raiseError(_("Error: no account supplied"));
-        }
@@ -225 +225 @@
-    function deleteNow() {
-
-
+ 
-            return PEAR::raiseError(_("Error: no account supplied"));
-        }
-
-
+ 
-            return PEAR::raiseError(_("Error: no domain supplied"));
-        }
-
-        $this->user->DelUser($this->domain, $_REQUEST['account']);
-
+ 
-            return PEAR::raiseError(_("Error: ") . $this->user->Error);
-        }
@@ -252 +252 @@
-
-        // Make sure account was supplied
-
+ 
-            return PEAR::raiseError(_("Error: no Auto-Responder supplied"));
-        }
@@ -258 +258 @@
-
-        // Check privs
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $this->domain);
-        }
@@ -266 +266 @@
-        print_r($responder);exit;
-
-
+ 
-            return PEAR::raiseError(_('Error: ') . $this->user->Error);
-        }
@@ -287 +287 @@
-        $this->setData('LANG_Modify_Account', _("Modify Account"));
-        $this->setData('LANG_Domain_Menu', _("Domain Menu"));
-
+ 
-            $this->setData('isDomainAdmin', 1);
-            $this->setData('LANG_Main_Menu', _("Main Menu"));
@@ -322 +322 @@
-
-        // Make sure account was supplied
-
+ 
-            return PEAR::raiseError(_("Error: no account supplied"));
-        }
@@ -328 +328 @@
-
-        // Check privs
-
+ 
-            return PEAR::raiseError(_('Error: you do not have edit privileges on domain ') . $this->domain);
-        }
@@ -334 +334 @@
-        // See what user_info to use
-        $account_info = $this->user->UserInfo($this->domain, $_REQUEST['account']);
-
+ 
-            return PEAR::raiseError(_('Error: ') . $this->user->Error);
-        }
@@ -340 +340 @@
-        // Get .qmail info if it exists
-        $dot_qmail = $this->user->ReadFile($this->domain, $_REQUEST['account'], '.qmail');
-
+ 
-            return PEAR::raiseError(_('Error: ') . $this->user->Error);
-        }
-        $defaults = $this->user->parseHomeDotqmail($dot_qmail, $account_info);
-        $form = $this->modifyAccountForm($account, $defaults);
-
+ 
-            $this->setData('message', _("Error Modifying Account"));
-            $renderer =& new HTML_QuickForm_Renderer_Array();
@@ -357 +357 @@
-        $routing = '';
-        $save_a_copy = 0;
-
+ 
-            $routing = 'standard';
-
+ 
-            $routing = 'deleted';
-
-
+ 
+ 
-                return PEAR::raiseError(_('Error: you must supply a forward address'));
-            } else {
@@ -368 +368 @@
-            }
-            $routing = 'forwarded';
-
+ 
-        } else {
-            return PEAR::raiseError(_('Error: unsupported routing selection'));
@@ -375 +375 @@
-        // Check for vacation
-        $vacation = 0;
-
+ 
-            $vacation = 1;
-            $vacation_subject = $_REQUEST['vacation_subject'];
@@ -383 +383 @@
-        // Build .qmail contents
-        $dot_qmail_contents = '';
-
+ 
-            $dot_qmail_contents = "# delete";
-
+ 
-            $dot_qmail_contents = "&$forward";
-
-
-
-
-
+ 
+
+
+ 
+ 
-            $vacation_dir = $account_info['user_dir'] . '/vacation';
-            $dot_qmail_contents .= "| $autorespond 86400 3 $vacation_dir/message $vacation_dir";