From 6a4c2e82fb415de3e4633e73277a3e056b8f82ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 31 May 2008 11:06:19 +0000 Subject: [PATCH] Factory renamed, emails can now be unique in game --- .gitattributes | 2 +- application/ship-simu/config.php | 9 ++++++--- ...ewsFactory.php => class_ShipSimuWebNewsFactory.php} | 0 application/ship-simu/templates/de/code/register.ctp | 3 +++ inc/classes/main/helper/web/class_WebFormHelper.php | 10 ++++++++++ 5 files changed, 20 insertions(+), 4 deletions(-) rename application/ship-simu/main/factories/{class_ShipSimuNewsFactory.php => class_ShipSimuWebNewsFactory.php} (100%) diff --git a/.gitattributes b/.gitattributes index 4078b21..332a418 100644 --- a/.gitattributes +++ b/.gitattributes @@ -81,7 +81,7 @@ application/ship-simu/main/drives/class_BaseDrive.php -text application/ship-simu/main/drives/motor/.htaccess -text application/ship-simu/main/drives/motor/class_Motor.php -text application/ship-simu/main/factories/.htaccess -text -application/ship-simu/main/factories/class_ShipSimuNewsFactory.php -text +application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php -text application/ship-simu/main/parts/.htaccess -text application/ship-simu/main/parts/class_BaseShipPart.php -text application/ship-simu/main/parts/maschineroom/.htaccess -text diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php index b83f402..57c81c0 100644 --- a/application/ship-simu/config.php +++ b/application/ship-simu/config.php @@ -40,15 +40,18 @@ $cfg->setConfigEntry('form_method', "post"); // CFG: FORM-TARGET $cfg->setConfigEntry('form_target', "_self"); -// CFG: REGISTRATION-REQUIRES-EMAIL +// CFG: REGISTER-REQUIRES-EMAIL $cfg->setConfigEntry('register_requires_email', "Y"); -// CFG: REGISTRATION-INCLUDES-PROFILE +// CFG: REGISTER-INCLUDES-PROFILE $cfg->setConfigEntry('register_includes_profile', "Y"); -// CFG: REGISTRATION-PERSONAL-DATA +// CFG: REGISTER-PERSONAL-DATA $cfg->setConfigEntry('register_personal_data', "Y"); +// CFG: REGISTER-EMAIL-UNIQUE +$cfg->setConfigEntry('register_email_unique', "Y"); + // CFG: CHAT-ENABLED-ICQ $cfg->setConfigEntry('chat_enabled_icq', "Y"); diff --git a/application/ship-simu/main/factories/class_ShipSimuNewsFactory.php b/application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php similarity index 100% rename from application/ship-simu/main/factories/class_ShipSimuNewsFactory.php rename to application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php diff --git a/application/ship-simu/templates/de/code/register.ctp b/application/ship-simu/templates/de/code/register.ctp index 4511dfc..f579b1b 100644 --- a/application/ship-simu/templates/de/code/register.ctp +++ b/application/ship-simu/templates/de/code/register.ctp @@ -22,6 +22,9 @@ if ($helper->ifRegisterRequiresEmailVerification()) { $helper->addInputTextField("email1"); $helper->addFieldText("email2", "Wiederholung Email-Adresse:"); $helper->addInputTextField("email2"); + if ($helper->ifEmailMustBeUnique()) { + $helper->addFormNote("Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein."); + } // END - Unique email addresses } // END - email verification if ($helper->ifRegisterIncludesProfile()) { diff --git a/inc/classes/main/helper/web/class_WebFormHelper.php b/inc/classes/main/helper/web/class_WebFormHelper.php index 00b7c0b..fb0f1b2 100644 --- a/inc/classes/main/helper/web/class_WebFormHelper.php +++ b/inc/classes/main/helper/web/class_WebFormHelper.php @@ -546,6 +546,16 @@ class WebFormHelper extends BaseHelper { return $required; } + /** + * Checks wether email addresses can only be once used + * + * @return $isUnique + */ + public function ifEmailMustBeUnique () { + $isUnique = ($this->getConfigInstance()->readConfig('register_email_unique') == "Y"); + return $isUnique; + } + /** * Checks wether the specified chat protocol is enabled in this form * -- 2.39.5