diff --git a/include/class.dept.php b/include/class.dept.php index 4eb0b8e2229d906bbce2031f6690c8d54af23778..88cbcad9772e8236b253372ba9813b0532efeeac 100644 --- a/include/class.dept.php +++ b/include/class.dept.php @@ -736,23 +736,23 @@ implements TemplateVariable, Searchable { $this->setFlag(self::FLAG_DISABLE_AUTO_CLAIM, isset($vars['disable_auto_claim'])); $filter_actions = FilterAction::objects()->filter(array('type' => 'dept', 'configuration' => '{"dept_id":'. $this->getId().'}')); - if ($filter_actions && $vars['status'] == __('Active')) + if ($filter_actions && $vars['status'] == 'active') FilterAction::setFilterFlag($filter_actions, 'dept', false); else FilterAction::setFilterFlag($filter_actions, 'dept', true); switch ($vars['status']) { - case __('Active'): + case 'active': $this->setFlag(self::FLAG_ACTIVE, true); $this->setFlag(self::FLAG_ARCHIVED, false); break; - case __('Disabled'): + case 'disabled': $this->setFlag(self::FLAG_ACTIVE, false); $this->setFlag(self::FLAG_ARCHIVED, false); break; - case __('Archived'): + case 'archived': $this->setFlag(self::FLAG_ACTIVE, false); $this->setFlag(self::FLAG_ARCHIVED, true); break; diff --git a/include/class.topic.php b/include/class.topic.php index 245b3c39f88535ab0afe34a24e8d189d126ca01e..8ef9de2124b646f5b671c40be2e8f82382d5e025 100644 --- a/include/class.topic.php +++ b/include/class.topic.php @@ -471,23 +471,23 @@ implements TemplateVariable, Searchable { $this->notes = Format::sanitize($vars['notes']); $filter_actions = FilterAction::objects()->filter(array('type' => 'topic', 'configuration' => '{"topic_id":'. $this->getId().'}')); - if ($filter_actions && $vars['status'] == __('Active')) + if ($filter_actions && $vars['status'] == 'active') FilterAction::setFilterFlag($filter_actions, 'topic', false); else FilterAction::setFilterFlag($filter_actions, 'topic', true); switch ($vars['status']) { - case __('Active'): + case 'active': $this->setFlag(self::FLAG_ACTIVE, true); $this->setFlag(self::FLAG_ARCHIVED, false); break; - case __('Disabled'): + case 'disabled': $this->setFlag(self::FLAG_ACTIVE, false); $this->setFlag(self::FLAG_ARCHIVED, false); break; - case __('Archived'): + case 'archived': $this->setFlag(self::FLAG_ACTIVE, false); $this->setFlag(self::FLAG_ARCHIVED, true); break; diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php index 4352badf30eb6e2dc3647712795d335a65c874f5..2005cf53490b00a4db5ceb1a97124e74d5a052fd 100644 --- a/include/staff/department.inc.php +++ b/include/staff/department.inc.php @@ -99,9 +99,9 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info); </td> <td> <select name="status"> - <option value="Active"<?php echo ($info['status'] == __('Active'))?'selected="selected"':'';?>><?php echo __('Active'); ?></option> - <option value="Disabled"<?php echo ($info['status'] == __('Disabled'))?'selected="selected"':'';?>><?php echo __('Disabled'); ?></option> - <option value="Archived"<?php echo ($info['status'] == __('Archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option> + <option value="active"<?php echo ($info['status'] == __('Active'))?'selected="selected"':'';?>><?php echo __('Active'); ?></option> + <option value="disabled"<?php echo ($info['status'] == __('Disabled'))?'selected="selected"':'';?>><?php echo __('Disabled'); ?></option> + <option value="archived"<?php echo ($info['status'] == __('Archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option> </select> <span class="error"> </span> <i class="help-tip icon-question-sign" href="#status"></i> </td> diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php index b6783666998c52af37d30c4e3ed401c272ff65f0..23e813d373289f5cff31b169214b4cc96dab78b3 100644 --- a/include/staff/helptopic.inc.php +++ b/include/staff/helptopic.inc.php @@ -61,9 +61,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); </td> <td> <select name="status"> - <option value="Active"<?php echo ($info['status'] == __('Active'))?'selected="selected"':'';?>><?php echo __('Active'); ?></option> - <option value="Disabled"<?php echo ($info['status'] == __('Disabled'))?'selected="selected"':'';?>><?php echo __('Disabled'); ?></option> - <option value="Archived"<?php echo ($info['status'] == __('Archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option> + <option value="active"<?php echo ($info['status'] == __('Active'))?'selected="selected"':'';?>><?php echo __('Active'); ?></option> + <option value="disabled"<?php echo ($info['status'] == __('Disabled'))?'selected="selected"':'';?>><?php echo __('Disabled'); ?></option> + <option value="archived"<?php echo ($info['status'] == __('Archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option> </select> <span class="error">* </span> <i class="help-tip icon-question-sign" href="#status"></i> </td>