diff --git a/include/class.forms.php b/include/class.forms.php index dbd05a2b94e152849f15ee88d43f1e0943b98e97..47d6ae86db45c1426e097387dce13d180bd2d088 100644 --- a/include/class.forms.php +++ b/include/class.forms.php @@ -174,13 +174,13 @@ class Form { echo $this->getMedia(); } - function getLayout() { + function getLayout($title=false, $options=array()) { $rc = @$options['renderer'] ?: static::$renderer; return new $rc($title, $options); } function asTable($options=array()) { - return $this->getLayout()->asTable($this); + return $this->getLayout(false, $options)->asTable($this); // XXX: Media can't go in a table echo $this->getMedia(); } @@ -386,7 +386,7 @@ implements FormRenderer { $attrs = array('colspan' => $size, 'rowspan' => $layout->getHeight(), 'style' => '"'.$layout->getOption('style').'"'); if ($offs) { ?> - <td colspan="<?php echo $offset; ?>"></td> <?php + <td colspan="<?php echo $offs; ?>"></td> <?php } ?> <td class="cell" <?php echo Format::array_implode('=', ' ', array_filter($attrs)); ?> diff --git a/include/class.staff.php b/include/class.staff.php index 153bdc0a0d23a6b1d19b9379da7e33d36d9ef88c..6725a9c85ba105c4f619ac72f86af9e39ad6ee48 100644 --- a/include/class.staff.php +++ b/include/class.staff.php @@ -1047,7 +1047,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable { return !$errors; } - function updatePerms($vars, &$errors) { + function updatePerms($vars, &$errors=array()) { if (!$vars) { $this->permissions = ''; return; diff --git a/include/class.task.php b/include/class.task.php index b5c086a19b467c916bbb667c8c54ee73c7aaa8fb..f8c2ae765add39e30b48f182a8b1d617ad7b233b 100644 --- a/include/class.task.php +++ b/include/class.task.php @@ -805,6 +805,7 @@ class Task extends TaskModel implements RestrictedAccess, Threadable { )); // Send alert to collaborators if ($alert && $vars['emailcollab']) { + $signature = ''; $this->notifyCollaborators($response, array('signature' => $signature) ); diff --git a/scp/staff.inc.php b/scp/staff.inc.php index edbc813006964649e43d1ed6e40cc03282b9fda0..bb06f3eb8e92dcf8094b1f1500137c282eddceec 100644 --- a/scp/staff.inc.php +++ b/scp/staff.inc.php @@ -76,7 +76,7 @@ if (!$thisstaff || !$thisstaff->getId() || !$thisstaff->isValid()) { //2) if not super admin..check system status and group status if(!$thisstaff->isAdmin()) { //Check for disabled staff or group! - if(!$thisstaff->isactive() || !$thisstaff->isGroupActive()) { + if (!$thisstaff->isactive()) { staffLoginPage(__('Access Denied. Contact Admin')); exit; } diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php index 3986191a94c517f3cbdb39be38b00cc4081bf1cf..6ab645e7d6cdbe4da784f2b0396395cac2eb0d10 100644 --- a/setup/inc/class.installer.php +++ b/setup/inc/class.installer.php @@ -199,7 +199,7 @@ class Installer extends SetupWizard { Organization::PERM_DELETE, FAQ::PERM_MANAGE, Email::PERM_BANLIST, - ), $errors); + )); $staff->setPassword($vars['passwd']); if (!$staff->save()) { $this->errors['err'] = __('Unable to create admin user (#6)');