Merge pull request #392 from XGProyect/development

Latest fixes

Author: LucasKovacs

README.md

@@ -15,7 +15,7 @@ Live Server: Coming soon!
 Require PHP >= 7.3+  
 Require MySQLi >= 5.5+  
 
-![Free](https://www.gnu.org/graphics/agplv3-155x51.png)
+![General Public License v3](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)
 
 ## How to get XG Proyect?
 

src/upload/application/controllers/install/installation.php

@@ -222,7 +222,7 @@ private function buildPage(): void
                                 'v_host' => '',
                                 'v_user' => '',
                                 'v_db' => '',
-                                'v_prefix' => '',
+                                'v_prefix' => 'xgp_',
                             ],
                             $this->langs->language
                         )

src/upload/application/libraries/Users_library.php

@@ -11,8 +11,11 @@
  */
 namespace application\libraries;
 
+use application\core\enumerators\AllianceRanksEnumerator as AllianceRanks;
+use application\core\enumerators\SwitchIntEnumerator as SwitchInt;
 use application\core\Language;
 use application\core\Template;
+use application\libraries\alliance\Ranks;
 use application\libraries\FunctionsLib as Functions;
 use application\libraries\TimingLibrary as Timing;
 
@@ -122,12 +125,12 @@ public function deleteUser($user_id)
             $alliance = $this->Users_Model->getAllianceDataByAllianceId($user_data['user_ally_id']);
 
             if ($alliance['ally_members'] > 1 && (isset($alliance['alliance_ranks']) && !is_null($alliance['alliance_ranks']))) {
-                $ranks = unserialize($alliance['alliance_ranks']);
+                $ranks = new Ranks($alliance['alliance_ranks']);
                 $userRank = null;
 
                 // search for an user that has permission to receive the alliance.
-                foreach ($ranks as $id => $rank) {
-                    if ($rank['rechtehand'] == 1) {
+                foreach ($ranks->getAllRanksAsArray() as $id => $rank) {
+                    if (isset($rank['rights'][AllianceRanks::right_hand]) && $rank['rights'][AllianceRanks::right_hand] == SwitchInt::on) {
                         $userRank = $id;
                         break;
                     }