Update to v2.0.0

partydragen · Aug 5, 2022 · ba3826e · ba3826e
1 parent 2ed9bfa
commit ba3826e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Members List Module for NamelessMC v2.0.0 pr10 & pr 11
+# Members List Module for NamelessMC v2.0.0
 
 ## Installation:
 - Upload the contents of the **upload** directory straight into your NamelessMC installation's directory

diff --git a/upload/modules/Members/classes/Members.php b/upload/modules/Members/classes/Members.php
@@ -3,7 +3,7 @@
  *	Made by Partydragen
  *  https://github.com/partydragen/Members/
  *  https://partydragen.com/
- *  NamelessMC version 2.0.0-pr13
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  */
@@ -13,26 +13,18 @@ class Members {
      *  Check for Module updates
      *  Returns JSON object with information about any updates
      */
-    public static function updateCheck($current_version = null) {
-        $queries = new Queries();
-
-        // Check for updates
-        if (!$current_version) {
-            $current_version = $queries->getWhere('settings', ['name', '=', 'nameless_version']);
-            $current_version = $current_version[0]->value;
+    public static function updateCheck() {
+        $current_version = Util::getSetting('nameless_version');
+        $uid = Util::getSetting('unique_id');
+
+        $enabled_modules = Module::getModules();
+        foreach ($enabled_modules as $enabled_item) {
+            if ($enabled_item->getName() == 'Members') {
+                $module = $enabled_item;
+                break;
+            }
         }
 
-        $uid = $queries->getWhere('settings', ['name', '=', 'unique_id']);
-        $uid = $uid[0]->value;
-
-		$enabled_modules = Module::getModules();
-		foreach ($enabled_modules as $enabled_item) {
-			if ($enabled_item->getName() == 'Members') {
-				$module = $enabled_item;
-				break;
-			}
-		}
-
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);

diff --git a/upload/modules/Members/module.php b/upload/modules/Members/module.php
@@ -3,7 +3,7 @@
  *	Made by Partydragen And Samerton
  *  https://github.com/partydragen/Members/
  *  https://partydragen.com/
- *  NamelessMC version 2.0.0-pr13
+ *  NamelessMC version 2.0.0
  *
  *  License: MIT
  *
@@ -19,8 +19,8 @@ public function __construct($members_language, $pages, $navigation, $cache) {
 		$name = 'Members';
 		$author = '<a href="https://partydragen.com" target="_blank" rel="nofollow noopener">Partydragen</a>, <a href="https://samerton.me" target="_blank" rel="nofollow noopener">Samerton</a>';
 		$module_version = '2.3.2';
-		$nameless_version = '2.0.0-pr13';
-		
+		$nameless_version = '2.0.0';
+
 		parent::__construct($this, $name, $author, $module_version, $nameless_version);
 
 		// Define URLs which belong to this module
@@ -42,21 +42,18 @@ public function __construct($members_language, $pages, $navigation, $cache) {
 			}
 		}
 	}
-
-	public function onInstall() {
-		// Queries
-		$queries = new Queries();
 
+	public function onInstall() {
 		try {
 			// Update main admin group permissions
-			$group = $queries->getWhere('groups', ['id', '=', 2]);
+			$group = DB::getInstance()->get('groups', ['id', '=', 2])->results();
 			$group = $group[0];
 
 			$group_permissions = json_decode($group->permissions, TRUE);
 			$group_permissions['memberslist.edit'] = 1;
 
 			$group_permissions = json_encode($group_permissions);
-			$queries->update('groups', 2, ['permissions' => $group_permissions]);
+			DB::getInstance()->update('groups', 2, ['permissions' => $group_permissions]);
 		} catch (Exception $e) {
 			// Error
 		}
@@ -164,8 +161,8 @@ public function onPageLoad($user, $pages, $cache, $smarty, $navs, $widgets, $tem
                         'NEW_UPDATE_URGENT' => (isset($update_check->urgent) && $update_check->urgent == 'true'),
                         'CURRENT_VERSION' => $this->_members_language->get('members', 'current_version_x', ['version' => Output::getClean($this->getVersion())]),
                         'NEW_VERSION' => $this->_members_language->get('members', 'new_version_x', ['new_version' => Output::getClean($update_check->new_version)]),
-                        'UPDATE' => $this->_members_language->get('members', 'view_resource'),
-                        'UPDATE_LINK' => Output::getClean($update_check->link)
+                        'NAMELESS_UPDATE' => $this->_members_language->get('members', 'view_resource'),
+                        'NAMELESS_UPDATE_LINK' => Output::getClean($update_check->link)
                     ]);
                 }
             }