From: Johan Cwiklinski Date: Sat, 2 Oct 2021 08:57:31 +0000 (+0200) Subject: Use constants for modes; few typos. X-Git-Tag: 0.9.5.1~59 X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=a604cb5097850dece2beba04744e2c6a6aded014;p=galette.git Use constants for modes; few typos. --- diff --git a/galette/includes/galette.inc.php b/galette/includes/galette.inc.php index 90053532c..bbea374fb 100644 --- a/galette/includes/galette.inc.php +++ b/galette/includes/galette.inc.php @@ -110,7 +110,7 @@ if (!defined('GALETTE_HIDE_VERSION')) { define('GALETTE_COMPAT_VERSION', '0.9.5'); define('GALETTE_DB_VERSION', '0.950'); if (!defined('GALETTE_MODE')) { - define('GALETTE_MODE', 'PROD'); //DEV, PROD, MAINT or DEMO + define('GALETTE_MODE', \Galette\Core\Galette::MODE_PROD); } if (!isset($_COOKIE['show_galette_dashboard'])) { @@ -189,7 +189,7 @@ if (!$installer and !defined('GALETTE_TESTS')) { include_once GALETTE_CONFIG_PATH . 'config.inc.php'; /** - * Database instanciation + * Database instantiation */ $zdb = new Core\Db(); @@ -227,5 +227,5 @@ if (!$installer and !defined('GALETTE_TESTS')) { } $plugins = new Galette\Core\Plugins(); -//make sure plugins autoload is caleld before session start +//make sure plugins autoload is called before session start $plugins->autoload(GALETTE_PLUGINS_PATH); diff --git a/galette/includes/main.inc.php b/galette/includes/main.inc.php index 2b1123b71..7c1f190fc 100644 --- a/galette/includes/main.inc.php +++ b/galette/includes/main.inc.php @@ -3,11 +3,11 @@ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */ /** - * Galette's instanciation and routes + * Galette's instantiation and routes * * PHP version 5 * - * Copyright © 2012-2014 The Galette Team + * Copyright © 2012-2021 The Galette Team * * This file is part of Galette (http://galette.tuxfamily.org). * @@ -28,16 +28,14 @@ * @package Galette * * @author Johan Cwiklinski - * @copyright 2012-2014 The Galette Team + * @copyright 2012-2021 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version * @link http://galette.tuxfamily.org * @since 0.8.2dev 2014-11-10 */ use Slim\Slim; -use Slim\Route; -use Galette\Core\Login; -use Analog\Analog; +use Galette\Core\Galette; if (!defined('GLOB_BRACE')) { define('GLOB_BRACE', 0); @@ -116,7 +114,7 @@ require_once GALETTE_ROOT . 'includes/smarty.inc.php'; $authenticate = new \Galette\Middleware\Authenticate($container); //Maintainance middleware -if ('MAINT' === GALETTE_MODE && !$container->get('login')->isSuperAdmin()) { +if (Galette::MODE_MAINT === GALETTE_MODE && !$container->get('login')->isSuperAdmin()) { $app->add( new \Galette\Middleware\UpdateAndMaintenance( $i18n, diff --git a/galette/lib/Galette/Controllers/Crud/MailingsController.php b/galette/lib/Galette/Controllers/Crud/MailingsController.php index 77ffa774a..afef248ff 100644 --- a/galette/lib/Galette/Controllers/Crud/MailingsController.php +++ b/galette/lib/Galette/Controllers/Crud/MailingsController.php @@ -38,6 +38,7 @@ namespace Galette\Controllers\Crud; use Throwable; use Galette\Controllers\CrudController; +use Galette\Core\Galette; use Slim\Http\Request; use Slim\Http\Response; use Galette\Core\GaletteMail; @@ -96,7 +97,7 @@ class MailingsController extends CrudController if ( $this->preferences->pref_mail_method == Mailing::METHOD_DISABLED - && !GALETTE_MODE === 'DEMO' + && !GALETTE_MODE === Galette::MODE_DEMO ) { $this->history->add( _T("Trying to load mailing while email is disabled in preferences.") @@ -252,7 +253,7 @@ class MailingsController extends CrudController if ( $this->preferences->pref_mail_method == Mailing::METHOD_DISABLED - && !GALETTE_MODE === 'DEMO' + && !GALETTE_MODE === Galette::MODE_DEMO ) { $this->history->add( _T("Trying to load mailing while email is disabled in preferences.") diff --git a/galette/lib/Galette/Controllers/Crud/MembersController.php b/galette/lib/Galette/Controllers/Crud/MembersController.php index 38ce68c60..70e7d6e76 100644 --- a/galette/lib/Galette/Controllers/Crud/MembersController.php +++ b/galette/lib/Galette/Controllers/Crud/MembersController.php @@ -69,7 +69,7 @@ use Analog\Analog; * @name GaletteController * @package Galette * @author Johan Cwiklinski - * @copyright 2019-2020 The Galette Team + * @copyright 2019-2021 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version * @link http://galette.tuxfamily.org * @since Available since 0.9.4dev - 2019-12-02 @@ -1065,7 +1065,7 @@ class MembersController extends CrudController Request $request, Response $response, int $id = null, - $action = 'edit' + string $action = 'edit' ): Response { $deps = array( 'picture' => true, @@ -1076,7 +1076,7 @@ class MembersController extends CrudController 'dynamics' => true ); - //instanciate member object + //instantiate member object $member = new Adherent($this->zdb, $id, $deps); if ($this->session->member !== null) { diff --git a/galette/lib/Galette/Controllers/GaletteController.php b/galette/lib/Galette/Controllers/GaletteController.php index 9d7f04424..0688fe9f8 100644 --- a/galette/lib/Galette/Controllers/GaletteController.php +++ b/galette/lib/Galette/Controllers/GaletteController.php @@ -41,17 +41,15 @@ use Slim\Http\Request; use Slim\Http\Response; use Galette\Core\Logo; use Galette\Core\PrintLogo; +use Galette\Core\Galette; use Galette\Core\GaletteMail; use Galette\Core\SysInfos; -use Galette\Entity\Contribution; use Galette\Entity\FieldsCategories; use Galette\Entity\Status; use Galette\Entity\Texts; use Galette\Filters\MembersList; use Galette\IO\News; use Galette\IO\Charts; -use Galette\IO\PdfMembersCards; -use Galette\IO\PdfContribution; use Galette\Repository\Members; use Galette\Repository\Reminders; use Analog\Analog; @@ -191,7 +189,7 @@ class GaletteController extends AbstractController 'pref_card_vspace' => 1 ); - if ($this->login->isSuperAdmin() && GALETTE_MODE !== 'DEMO') { + if ($this->login->isSuperAdmin() && GALETTE_MODE !== Galette::MODE_DEMO) { $required['pref_admin_login'] = 1; } @@ -292,7 +290,7 @@ class GaletteController extends AbstractController $warning_detected = array_merge($warning_detected, $this->preferences->checkCardsSizes()); // picture upload - if (GALETTE_MODE !== 'DEMO' && isset($_FILES['logo'])) { + if (GALETTE_MODE !== Galette::MODE_DEMO && isset($_FILES['logo'])) { if ($_FILES['logo']['error'] === UPLOAD_ERR_OK) { if ($_FILES['logo']['tmp_name'] != '') { if (is_uploaded_file($_FILES['logo']['tmp_name'])) { @@ -315,7 +313,7 @@ class GaletteController extends AbstractController } } - if (GALETTE_MODE !== 'DEMO' && isset($post['del_logo'])) { + if (GALETTE_MODE !== Galette::MODE_DEMO && isset($post['del_logo'])) { if (!$this->logo->delete()) { $error_detected[] = _T("Delete failed"); } else { @@ -324,7 +322,7 @@ class GaletteController extends AbstractController } // Card logo upload - if (GALETTE_MODE !== 'DEMO' && isset($_FILES['card_logo'])) { + if (GALETTE_MODE !== Galette::MODE_DEMO && isset($_FILES['card_logo'])) { if ($_FILES['card_logo']['error'] === UPLOAD_ERR_OK) { if ($_FILES['card_logo']['tmp_name'] != '') { if (is_uploaded_file($_FILES['card_logo']['tmp_name'])) { @@ -347,7 +345,7 @@ class GaletteController extends AbstractController } } - if (GALETTE_MODE !== 'DEMO' && isset($post['del_card_logo'])) { + if (GALETTE_MODE !== Galette::MODE_DEMO && isset($post['del_card_logo'])) { if (!$this->print_logo->delete()) { $error_detected[] = _T("Delete failed"); } else { diff --git a/galette/lib/Galette/Controllers/PluginsController.php b/galette/lib/Galette/Controllers/PluginsController.php index 59d564427..2772a60cc 100644 --- a/galette/lib/Galette/Controllers/PluginsController.php +++ b/galette/lib/Galette/Controllers/PluginsController.php @@ -39,6 +39,7 @@ namespace Galette\Controllers; use Throwable; use Slim\Http\Request; use Slim\Http\Response; +use Galette\Core\Galette; use Galette\Core\Install; use Galette\Core\PluginInstall; use Laminas\Db\Adapter\Adapter; @@ -99,7 +100,7 @@ class PluginsController extends AbstractController */ public function togglePlugin(Request $request, Response $response, string $action, string $module_id): Response { - if (GALETTE_MODE !== 'DEMO') { + if (GALETTE_MODE !== Galette::MODE_DEMO) { $plugins = $this->plugins; $reload_plugins = false; if ($action == 'activate') { @@ -162,7 +163,7 @@ class PluginsController extends AbstractController */ public function initPluginDb(Request $request, Response $response, string $id): Response { - if (GALETTE_MODE === 'DEMO') { + if (GALETTE_MODE === Galette::MODE_DEMO) { Analog::log( 'Trying to access plugin database initialization in DEMO mode.', Analog::WARNING diff --git a/galette/lib/Galette/Core/Galette.php b/galette/lib/Galette/Core/Galette.php index 522d913a7..cb1ff48d9 100644 --- a/galette/lib/Galette/Core/Galette.php +++ b/galette/lib/Galette/Core/Galette.php @@ -50,6 +50,11 @@ namespace Galette\Core; */ class Galette { + public const MODE_PROD = 'PROD'; + public const MODE_DEV = 'DEV'; + public const MODE_MAINT = 'MAINT'; + public const MODE_DEMO = 'DEMO'; + /** * Retrieve Galette version from git, if present. * diff --git a/galette/lib/Galette/Core/Preferences.php b/galette/lib/Galette/Core/Preferences.php index a96b94a39..efd61f176 100644 --- a/galette/lib/Galette/Core/Preferences.php +++ b/galette/lib/Galette/Core/Preferences.php @@ -38,9 +38,9 @@ namespace Galette\Core; use Galette\Entity\PaymentType; use Throwable; use Analog\Analog; +use Galette\Core\Galette; use Galette\Entity\Adherent; use Galette\Entity\Status; -use Galette\Core\Db; use Galette\IO\PdfMembersCards; use Galette\Repository\Members; @@ -140,6 +140,8 @@ use Galette\Repository\Members; * @property integer $pref_password_length * @property boolean $pref_password_blacklist * @property integer $pref_password_strength + * @property integer $pref_default_paymenttype + * @property boolean $pref_bool_create_member * @property-read string $vpref_email_newadh Comma separated list of mail senders */ class Preferences @@ -478,7 +480,7 @@ class Preferences public function check(array $values, Login $login) { $insert_values = array(); - if ($login->isSuperAdmin() && GALETTE_MODE !== 'DEMO') { + if ($login->isSuperAdmin() && GALETTE_MODE !== Galette::MODE_DEMO) { $this->required[] = 'pref_admin_login'; } @@ -495,7 +497,7 @@ class Preferences // missing relations if ( - GALETTE_MODE !== 'DEMO' + GALETTE_MODE !== Galette::MODE_DEMO && isset($insert_values['pref_mail_method']) ) { if ($insert_values['pref_mail_method'] > GaletteMail::METHOD_DISABLED) { @@ -569,7 +571,7 @@ class Preferences } } - if (GALETTE_MODE !== 'DEMO' && isset($values['pref_admin_pass_check'])) { + if (GALETTE_MODE !== Galette::MODE_DEMO && isset($values['pref_admin_pass_check'])) { // Check passwords. Hash will be done into the Preferences class if (strcmp($insert_values['pref_admin_pass'], $values['pref_admin_pass_check']) != 0) { $this->errors[] = _T("Passwords mismatch"); @@ -645,7 +647,7 @@ class Preferences } break; case 'pref_admin_login': - if (GALETTE_MODE === 'DEMO') { + if (GALETTE_MODE === Galette::MODE_DEMO) { Analog::log( 'Trying to set superadmin login while in DEMO.', Analog::WARNING @@ -700,7 +702,7 @@ class Preferences } break; case 'pref_admin_pass': - if (GALETTE_MODE == 'DEMO') { + if (GALETTE_MODE == Galette::MODE_DEMO) { Analog::log( 'Trying to set superadmin pass while in DEMO.', Analog::WARNING @@ -767,7 +769,7 @@ class Preferences foreach (self::$defaults as $k => $v) { if ( - GALETTE_MODE == 'DEMO' + GALETTE_MODE == Galette::MODE_DEMO && in_array($k, ['pref_admin_pass', 'pref_admin_login', 'pref_mail_method']) ) { continue; @@ -941,7 +943,7 @@ class Preferences if (!in_array($name, $forbidden) && isset($this->prefs[$name])) { if ( - GALETTE_MODE === 'DEMO' + GALETTE_MODE === Galette::MODE_DEMO && $name == 'pref_mail_method' ) { return GaletteMail::METHOD_DISABLED; @@ -1010,7 +1012,7 @@ class Preferences || $name == 'pref_email_newadh' || $name == 'pref_email_reply_to' ) { - if (GALETTE_MODE === 'DEMO') { + if (GALETTE_MODE === Galette::MODE_DEMO) { Analog::log( 'Trying to set pref_email while in DEMO.', Analog::WARNING @@ -1050,7 +1052,7 @@ class Preferences } /** - * Get default URL (when not setted by user in preferences) + * Get default URL (when not set by user in preferences) * * @return string */ diff --git a/galette/lib/Galette/Entity/Adherent.php b/galette/lib/Galette/Entity/Adherent.php index 72fae4feb..5fdea7d05 100644 --- a/galette/lib/Galette/Entity/Adherent.php +++ b/galette/lib/Galette/Entity/Adherent.php @@ -423,7 +423,7 @@ class Adherent if ($r->parent_id !== null) { $this->_parent = (int)$r->parent_id; if ($this->_deps['parent'] === true) { - $this->loadParent($r->parent_id); + $this->loadParent(); } }