Merge branch 'main' of github.com:WoW-CMS/BlizzCMS

WoW-CMS · Jan 14, 2024 · 2be87da · 2be87da
2 parents bd1542f + de1acaf
commit 2be87da
Show file tree

Hide file tree

Showing 119 changed files with 293 additions and 211 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -14,10 +14,12 @@ BlizzCMS is a free, easy-to-use, open-source CMS developed for private World of
 
 ## Requirements
 
-1. **PHP version** >= 7.4 with the following extensions installed:
-   - bcmath - curl - gd - gmp - mbstring - mysqli - openssl - soap - zip
-2. **DB Server** MySQL 5.7+ or MariaDB 10.6+
-3. **Composer**
+1. **Web Server**
+   - Enable modules: mod_headers - mod_rewrite
+2. **PHP** 7.4 or newer recommended
+   - Enable extensions: bcmath - curl - gd - gmp - intl - mbstring - mysqli - openssl - soap - zip
+3. **DB Server** MySQL 5.7+ or MariaDB 10.6+
+4. **Composer**
 
 ## Links
 

diff --git a/application/config/constants.php b/application/config/constants.php
@@ -92,9 +92,6 @@
 | These constants are used when working with the base functions of the CMS
 |
 */
-defined('CURRENCY_BOTH') OR define('CURRENCY_BOTH', 'both');
-defined('CURRENCY_DP')   OR define('CURRENCY_DP', 'dp');
-defined('CURRENCY_VP')   OR define('CURRENCY_VP', 'vp');
 defined('ITEM_LINK')     OR define('ITEM_LINK', 'link');
 defined('ITEM_DROPDOWN') OR define('ITEM_DROPDOWN', 'dropdown');
 defined('SLIDE_IMAGE')   OR define('SLIDE_IMAGE', 'image');

diff --git a/application/controllers/Auth.php b/application/controllers/Auth.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/controllers/Home.php b/application/controllers/Home.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/controllers/Install.php b/application/controllers/Install.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/controllers/News.php b/application/controllers/News.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/controllers/Page.php b/application/controllers/Page.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/helpers/BS_language_helper.php b/application/helpers/BS_language_helper.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/helpers/base_helper.php b/application/helpers/base_helper.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/helpers/db_helper.php b/application/helpers/db_helper.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/helpers/exception_helper.php b/application/helpers/exception_helper.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/helpers/extra_helper.php b/application/helpers/extra_helper.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
@@ -35,28 +35,36 @@ function current_date($format = null, $timezone = null)
     }
 }
 
-if (! function_exists('format_date'))
+if (! function_exists('locate_date'))
 {
     /**
-     * Change datetime format
+     * Change a specific datetime in a localized pattern
      *
-     * @see https://www.php.net/manual/en/datetime.format.php
+     * @see https://unicode-org.github.io/icu/userguide/format_parse/datetime
      *
      * @param string $date
-     * @param string|null $format
+     * @param string|null $pattern
+     * @param string|null $timezone
      * @return string
      */
-    function format_date($date, $format = null)
+    function locate_date($date, $pattern = null, $timezone = null)
     {
-        $format ??= 'Y-m-d H:i:s';
+        $pattern ??= lang('datetime_pattern');
+        $timezone ??= config_item('time_reference');
 
         if (empty($date) || $date === '0000-00-00' || $date === '0000-00-00 00:00:00') {
             return '';
         }
 
-        $dateTime = new \DateTime($date);
+        $CI =& get_instance();
+        $CI->load->library('multilanguage');
 
-        return $dateTime->format($format);
+        $dateTime  = new \DateTime($date);
+        $formatter = new \IntlDateFormatter($CI->multilanguage->current_language('locale'), \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, $timezone, \IntlDateFormatter::GREGORIAN);
+
+        $formatter->setPattern($pattern);
+
+        return $formatter->format($dateTime);
     }
 }
 

diff --git a/application/helpers/module_helper.php b/application/helpers/module_helper.php
@@ -3,7 +3,7 @@
  * @author Michel Roca
  * @author WoW-CMS
  * @copyright Copyright (c) 2013 - 2015, Michel Roca (https://github.com/mRoca)
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/helpers/wow_helper.php b/application/helpers/wow_helper.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/hooks/Base_hook.php b/application/hooks/Base_hook.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/hooks/Tasks_hook.php b/application/hooks/Tasks_hook.php
@@ -3,7 +3,7 @@
  * BlizzCMS
  *
  * @author WoW-CMS
- * @copyright Copyright (c) 2019 - 2022, WoW-CMS (https://wow-cms.com)
+ * @copyright Copyright (c) 2019 - 2023, WoW-CMS (https://wow-cms.com)
  * @license https://opensource.org/licenses/MIT MIT License
  */
 defined('BASEPATH') OR exit('No direct script access allowed');

diff --git a/application/language/english/general_lang.php b/application/language/english/general_lang.php
@@ -12,8 +12,8 @@
 $lang['powered_by'] = 'Powered by';
 
 $lang['register'] = 'Register';
-$lang['login'] = 'Log In';
-$lang['logout'] = 'Log Out';
+$lang['login'] = 'Login';
+$lang['logout'] = 'Logout';
 $lang['reset'] = 'Reset';
 $lang['forgot_your_password'] = 'Forgot your password?';
 $lang['remember'] = 'Remember me';
@@ -35,10 +35,8 @@
 $lang['close'] = 'Close';
 $lang['reply'] = 'Reply';
 $lang['continue'] = 'Continue';
-$lang['view_cart'] = 'View Cart';
-$lang['checkout'] = 'Checkout';
+$lang['go_cart'] = 'Go to cart';
 $lang['check'] = 'Check';
-$lang['continue_buying'] = 'Continue buying';
 $lang['install'] = 'Install';
 $lang['uninstall'] = 'Uninstall';
 $lang['reload'] = 'Reload';
@@ -79,7 +77,7 @@
 $lang['content'] = 'Content';
 $lang['description'] = 'Description';
 $lang['url'] = 'URL';
-$lang['slug'] = 'Slug';
+$lang['slug'] = 'URL slug';
 $lang['highlight'] = 'Highlight';
 $lang['lock'] = 'Lock';
 $lang['unlock'] = 'Unlock';
@@ -156,7 +154,6 @@
 $lang['tls'] = 'TLS';
 $lang['dp'] = 'DP';
 $lang['vp'] = 'VP';
-$lang['dp_vp'] = 'DP & VP';
 $lang['new_tab'] = 'New tab/window';
 $lang['same_tab'] = 'Same tab/window';
 $lang['no_parent'] = 'No parent';
@@ -221,6 +218,7 @@
 $lang['canceled'] = 'Canceled';
 $lang['declined'] = 'Declined';
 $lang['pending'] = 'Pending';
+$lang['processing'] = 'Processing';
 $lang['enable'] = 'Enable';
 $lang['disable'] = 'Disable';
 $lang['error'] = 'Error';
@@ -240,18 +238,20 @@
 $lang['terms_service'] = 'Terms of service';
 $lang['privacy_policy'] = 'Privacy policy';
 $lang['and'] = 'and';
+$lang['or'] = 'or';
 $lang['rights_reserved'] = 'All rights reserved.';
 
 $lang['comment'] = 'Comment';
 $lang['comments'] = 'Comments';
-$lang['commented_on'] = 'Commented on';
 $lang['latest_comments'] = 'Latest Comments';
 $lang['add_comment'] = 'Add comment';
 $lang['edit_comment'] = 'Edit comment';
 $lang['latest_news'] = 'Latest News';
 $lang['realm_status'] = 'Realm Status';
 $lang['social_networks'] = 'Social Networks';
-$lang['registered_in'] = 'Registered in';
+$lang['published_on'] = 'Published on';
+$lang['written_on'] = 'Written on';
+$lang['registered_on'] = 'Registered on';
 $lang['donation_points'] = 'Donation points';
 $lang['voting_points'] = 'Voting points';
 $lang['facebook'] = 'Facebook';
@@ -299,6 +299,12 @@
 $lang['all_characters'] = 'All characters';
 $lang['all_categories'] = 'All categories';
 
+/**
+ * DateTime
+*/
+$lang['datetime_pattern'] = "MMMM d, y";
+$lang['datetime_full_pattern'] = "MMMM d, y 'at' h:mm a";
+
 /**
  * Alerts
 */

diff --git a/application/language/english/wow_lang.php b/application/language/english/wow_lang.php
@@ -8721,5 +8721,10 @@
     14899 => 'The Flowing Forest',
     14900 => 'Shifting Sands',
     14934 => "The Chronosmith's Forge",
-    14935 => "Ironormu's Vault"
+    14935 => "Ironormu's Vault",
+    14963 => 'Dev Map - Quest Training',
+    14966 => "Dev Map - Exile's Reach",
+    14967 => 'Dev Map - Zereth Mortis',
+    14968 => 'Dev Map - Mechagon',
+    14970 => 'The Black Empire'
 ];