From f5b993dbe4fb281b9f1877bf31f0a4c586516e1b Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 12 Apr 2013 23:18:16 +0200 Subject: [PATCH] Resolved some TODOs and removed 'Did you know' --- .../install/files/acp/templates/index.tpl | 4 ---- .../files/lib/acp/form/LoginForm.class.php | 20 +++++++------------ .../acp/form/PackageUpdateAuthForm.class.php | 2 +- .../files/lib/acp/page/IndexPage.class.php | 18 +---------------- .../menu/item/PageMenuItemEditor.class.php | 12 ----------- 5 files changed, 9 insertions(+), 47 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl index 2a64e96c35..ba0dc0f726 100644 --- a/wcfsetup/install/files/acp/templates/index.tpl +++ b/wcfsetup/install/files/acp/templates/index.tpl @@ -15,10 +15,6 @@ } -{if $didYouKnow !== ''} -

{lang}wcf.acp.index.didYouKnow{/lang}: {@$didYouKnow|language}

-{/if} -

{lang}wcf.acp.index.health.summary.{@$health}{/lang}

{event name='boxes'} diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php index 5e03f77180..c6cf6321ec 100755 --- a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php @@ -15,7 +15,7 @@ use wcf\util\StringUtil; * Shows the acp login form. * * @author Marcel Werk - * @copyright 2001-2012 WoltLab GmbH + * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.form @@ -84,19 +84,13 @@ class LoginForm extends AbstractForm { $this->user = UserAuthenticationFactory::getInstance()->getUserAuthentication()->loginManually($this->username, $this->password); } catch (UserInputException $e) { - // TODO: create an option for the authentication with email address - if (true) { - if ($e->getField() == 'username') { - try { - $this->user = EmailUserAuthentication::getInstance()->loginManually($this->username, $this->password); - } - catch (UserInputException $e2) { - if ($e2->getField() == 'username') throw $e; - throw $e2; - } + if ($e->getField() == 'username') { + try { + $this->user = EmailUserAuthentication::getInstance()->loginManually($this->username, $this->password); } - else { - throw $e; + catch (UserInputException $e2) { + if ($e2->getField() == 'username') throw $e; + throw $e2; } } else { diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php index 49e53212f1..420a3d13e2 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php @@ -134,7 +134,7 @@ class PackageUpdateAuthForm extends AbstractForm { } /** - * @todo This whole page is carzy, it's manipulating the requested page, but RequestHandler does not work this way + * @todo This whole page is crazy, it's manipulating the requested page, but RequestHandler does not work this way * @see wcf\page\IPage::readParameters() */ public function readParameters() { diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php index b8e1752e5e..e03c50324a 100755 --- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php @@ -13,19 +13,13 @@ use wcf\system\WCF; * Shows the welcome page in admin control panel. * * @author Marcel Werk - * @copyright 2001-2012 WoltLab GmbH + * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage acp.page * @category Community Framework */ class IndexPage extends AbstractPage { - /** - * did you know language item - * @var string - */ - public $didYouKnow = ''; - /** * health status data * @var array @@ -44,7 +38,6 @@ class IndexPage extends AbstractPage { else if (!empty($this->healthDetails['info'])) $health = 'info'; WCF::getTPL()->assign(array( - 'didYouKnow' => $this->didYouKnow, 'health' => $health, 'healthDetails' => $this->healthDetails )); @@ -116,15 +109,6 @@ class IndexPage extends AbstractPage { parent::readData(); $this->calculateHealth(); - - $sql = "SELECT languageItem - FROM wcf".WCF_N."_language_item - WHERE languageCategoryID = ? - ORDER BY ".(WCF::getDB()->getDBType() == 'wcf\system\database\PostgreSQLDatabase' ? 'RANDOM()' : 'RAND()'); - $statement = WCF::getDB()->prepareStatement($sql, 1); - // TODO: Change category - $statement->execute(array(LanguageFactory::getInstance()->getCategory('wcf.global')->languageCategoryID)); - $this->didYouKnow = $statement->fetchColumn(); } /** diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php index ffbed894d6..5e834d6910 100644 --- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php +++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php @@ -23,8 +23,6 @@ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCached /** * @see wcf\data\IEditableObject::create() - * - * @todo Handle language id and create related language item */ public static function create(array $parameters = array()) { // calculate show order @@ -33,16 +31,6 @@ class PageMenuItemEditor extends DatabaseObjectEditor implements IEditableCached return parent::create($parameters); } - /** - * @see wcf\data\IEditableObject::update() - * - * @todo Handle language id and update related language item - */ - public function update(array $parameters = array()) { - 1 == 0; // TODO: fix me (avoid sniffing error) - parent::update($parameters); - } - /** * @see wcf\data\IEditableObject::delete() */ -- 2.20.1