From bb574fad20bf2bb06f1c319bccfb27afa82692ca Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Wed, 22 Oct 2025 21:35:57 -0400 Subject: [PATCH 1/2] remove hardcoded language constants --- docs/lang_diff.txt | 26 +++++++++++++++------ htdocs/install/include/makedata.php | 14 +++++------ htdocs/install/language/english/install.php | 8 +++++++ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/docs/lang_diff.txt b/docs/lang_diff.txt index 9c1c1f3d3..e145c0818 100644 --- a/docs/lang_diff.txt +++ b/docs/lang_diff.txt @@ -13,22 +13,34 @@ Below are language differences from a version to next version. - updated PHP & MySQL versions /htdocs/modules/pm/language/english/main.php -define('_PM_EMAIL_DESC', 'Dear %s, this is a message transfered from your account at ' . $GLOBALS['xoopsConfig']['sitename']); -define('_PM_EMAIL_DESC', 'Dear %s, this is a message transferred from your account at ' . $GLOBALS['xoopsConfig']['sitename']); +- updated define('_PM_EMAIL_DESC', 'Dear %s, this is a message transfered from your account at ' . $GLOBALS['xoopsConfig']['sitename']); +- updated define('_PM_EMAIL_DESC', 'Dear %s, this is a message transferred from your account at ' . $GLOBALS['xoopsConfig']['sitename']); /htdocs/class/xoopseditor/tinymce5/language/english.php -define('_XOOPS_EDITOR_TINYMCE_LANGUAGE5', 'en'); -define('_XOOPS_EDITOR_TINYMCE5_LANGUAGE', 'en'); +- ranamed _XOOPS_EDITOR_TINYMCE_LANGUAGE5 to _XOOPS_EDITOR_TINYMCE5_LANGUAGE /htdocs/modules/system/themes/transition/language/english/admin.php - renamed _OXYGEN_Server_API to _OXYGEN_SERVER_API /htdocs/modules/system/language/english/admin/preferences.php. -define('_MD_AM_SENDMAIL_NOT_FOUND', 'Sendmail binary not found. Please check your server configuration.'); -define('_MD_AM_SENDMAIL_HELP_MISSING_BIN', 'No valid sendmail-compatible binary was detected. Install an MTA (e.g. Postfix, msmtp) or switch to SMTP in Preferences.'); +- added define('_MD_AM_SENDMAIL_NOT_FOUND', 'Sendmail binary not found. Please check your server configuration.'); +- added define('_MD_AM_SENDMAIL_HELP_MISSING_BIN', 'No valid sendmail-compatible binary was detected. Install an MTA (e.g. Postfix, msmtp) or switch to SMTP in Preferences.'); /htdocs/modules/system/language/english/admin/users.php -define('_AM_SYSTEM_USERS_UNKNOWN_GROUP', 'Unknown group'); +- added define('_AM_SYSTEM_USERS_UNKNOWN_GROUP', 'Unknown group'); + +/htdocs/modules/system/language/english/comment.php +- added define('_CM_ADDCOMMENT', 'Add Comment'); + + +/htdocs/install/language/english/install.php +- added define('_WEBSITE_NAME', 'XOOPS Site'); +- added define('_WEBSITE_SLOGAN', 'Just use it!'); +- added define('_WEBSITE_META_KEYWORDS', 'xoops, web application framework, cms, content management system'); +- added define('_WEBSITE_FOOTER', "Powered by XOOPS © 2001-{X_YEAR} The XOOPS Project"); +- added define('_WEBSITE_COPYRIGHT', 'Copyright © 2001-{X_YEAR}'); +- added define('_WEBSITE_DESCRIPTION', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.'); +- added define('_WEBSITE_CENSOR_REPLACE', 'OOPS'); ================================ diff --git a/htdocs/install/include/makedata.php b/htdocs/install/include/makedata.php index 24386f234..906efbb51 100644 --- a/htdocs/install/include/makedata.php +++ b/htdocs/install/include/makedata.php @@ -162,8 +162,8 @@ function make_data($dbm, $adminname, $hashedAdminPass, $adminmail, $language, $g } } // data for table 'config' - $dbm->insert('config', " VALUES (1, 0, 1, 'sitename', '_MD_AM_SITENAME', 'XOOPS Site', '_MD_AM_SITENAMEDSC', 'textbox', 'text', 0)"); - $dbm->insert('config', " VALUES (2, 0, 1, 'slogan', '_MD_AM_SLOGAN', 'Just Use it!', '_MD_AM_SLOGANDSC', 'textbox', 'text', 2)"); + $dbm->insert('config', " VALUES (1, 0, 1, 'sitename', '_MD_AM_SITENAME', '" . _WEBSITE_NAME . "', '_MD_AM_SITENAMEDSC', 'textbox', 'text', 0)"); + $dbm->insert('config', " VALUES (2, 0, 1, 'slogan', '_MD_AM_SLOGAN', '" . _WEBSITE_SLOGAN . "', '_MD_AM_SLOGANDSC', 'textbox', 'text', 2)"); $dbm->insert('config', " VALUES (3, 0, 1, 'language', '_MD_AM_LANGUAGE', '" . addslashes($language) . "', '_MD_AM_LANGUAGEDSC', 'language', 'other', 4)"); $dbm->insert('config', " VALUES (4, 0, 1, 'startpage', '_MD_AM_STARTPAGE', '--', '_MD_AM_STARTPAGEDSC', 'startpage', 'other', 6)"); $dbm->insert('config', " VALUES (5, 0, 1, 'server_TZ', '_MD_AM_SERVERTZ', '0', '_MD_AM_SERVERTZDSC', 'timezone', 'float', 8)"); @@ -203,8 +203,8 @@ function make_data($dbm, $adminname, $hashedAdminPass, $adminmail, $language, $g $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '" . addslashes(serialize(['xoops.org$'])) . "', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)"); $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)"); $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '" . addslashes(serialize(['127\.0\.0\.1'])) . "', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)"); - $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'xoops, web application framework, cms, content management system', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)"); - $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS © 2001-{X_YEAR} The XOOPS Project', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)"); + $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', '" . _WEBSITE_META_KEYWORDS . "', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)"); + $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', '" . addslashes(_WEBSITE_FOOTER) . "', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)"); $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize( [ @@ -212,7 +212,7 @@ function make_data($dbm, $adminname, $hashedAdminPass, $adminmail, $language, $g 'shit', ], )) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)"); - $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)"); + $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '" . _WEBSITE_CENSOR_REPLACE . "', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)"); $dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'textbox', 'text', 2)"); $dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (45, 0, 5, 'keyword_min', '_MD_AM_MINSEARCH', '5', '_MD_AM_MINSEARCHDSC', 'textbox', 'int', 1)"); @@ -220,8 +220,8 @@ function make_data($dbm, $adminname, $hashedAdminPass, $adminmail, $language, $g $dbm->insert('config', " VALUES (47, 0, 1, 'enable_badips', '_MD_AM_DOBADIPS', '0', '_MD_AM_DOBADIPSDSC', 'yesno', 'int', 40)"); $dbm->insert('config', " VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)"); $dbm->insert('config', " VALUES (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)"); - $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright © 2001-{X_YEAR}', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)"); - $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)"); + $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', '" . _WEBSITE_COPYRIGHT . "', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)"); + $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', '" . _WEBSITE_DESCRIPTION . "', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)"); $dbm->insert('config', " VALUES (52, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)"); $dbm->insert('config', " VALUES (53, 0, 1, 'use_mysession', '_MD_AM_USEMYSESS', '1', '_MD_AM_USEMYSESSDSC', 'yesno', 'int', 19)"); $dbm->insert('config', " VALUES (54, 0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', 1, '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30)"); diff --git a/htdocs/install/language/english/install.php b/htdocs/install/language/english/install.php index 315c893c2..a4d40ae9a 100644 --- a/htdocs/install/language/english/install.php +++ b/htdocs/install/language/english/install.php @@ -165,6 +165,14 @@ define('NO_INSTALLED_MODULES', 'No module installed.'); define('THEME_NO_SCREENSHOT', 'No screenshot found'); define('IS_VALOR', ' => '); +// website name and slogan +define('_WEBSITE_NAME', 'XOOPS Site'); +define('_WEBSITE_SLOGAN', 'Just use it!'); +define('_WEBSITE_META_KEYWORDS', 'xoops, web application framework, cms, content management system'); +define('_WEBSITE_FOOTER', "Powered by XOOPS © 2001-{X_YEAR} The XOOPS Project"); +define('_WEBSITE_COPYRIGHT', 'Copyright © 2001-{X_YEAR}'); +define('_WEBSITE_DESCRIPTION', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.'); +define('_WEBSITE_CENSOR_REPLACE', 'OOPS'); // password message define('PASSWORD_LABEL', 'Password strength'); define('PASSWORD_DESC', 'Password not entered'); From a0bc03969957242df4532e64ce27f688e601c963 Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Mon, 27 Oct 2025 17:35:24 -0400 Subject: [PATCH 2/2] rearranging --- htdocs/install/language/english/install.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/htdocs/install/language/english/install.php b/htdocs/install/language/english/install.php index a4d40ae9a..1acff5ef7 100644 --- a/htdocs/install/language/english/install.php +++ b/htdocs/install/language/english/install.php @@ -165,14 +165,6 @@ define('NO_INSTALLED_MODULES', 'No module installed.'); define('THEME_NO_SCREENSHOT', 'No screenshot found'); define('IS_VALOR', ' => '); -// website name and slogan -define('_WEBSITE_NAME', 'XOOPS Site'); -define('_WEBSITE_SLOGAN', 'Just use it!'); -define('_WEBSITE_META_KEYWORDS', 'xoops, web application framework, cms, content management system'); -define('_WEBSITE_FOOTER', "Powered by XOOPS © 2001-{X_YEAR} The XOOPS Project"); -define('_WEBSITE_COPYRIGHT', 'Copyright © 2001-{X_YEAR}'); -define('_WEBSITE_DESCRIPTION', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.'); -define('_WEBSITE_CENSOR_REPLACE', 'OOPS'); // password message define('PASSWORD_LABEL', 'Password strength'); define('PASSWORD_DESC', 'Password not entered'); @@ -204,3 +196,12 @@ define('INSTALL_THIS_MODULE', 'Add %s'); //2.5.11 define('ERR_COPY_CONFIG_FILE', 'Could not copy the configuration file %s'); +//2.5.12 +// website name and slogan +define('_WEBSITE_NAME', 'XOOPS Site'); +define('_WEBSITE_SLOGAN', 'Just use it!'); +define('_WEBSITE_META_KEYWORDS', 'xoops, web application framework, cms, content management system'); +define('_WEBSITE_FOOTER', "Powered by XOOPS © 2001-{X_YEAR} The XOOPS Project"); +define('_WEBSITE_COPYRIGHT', 'Copyright © 2001-{X_YEAR}'); +define('_WEBSITE_DESCRIPTION', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.'); +define('_WEBSITE_CENSOR_REPLACE', 'OOPS');