Merge pull request #18 from Lavoaster/fix/ucp_missing_managesteam

Fix UCP Missing Manage Steam link
LavaToaster · Nov 3, 2014 · 6c0a236 · 6c0a236
2 parents c741f06 + 04b8935
commit 6c0a236
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/Hook Files/steamLinkAccount.php b/Hook Files/steamLinkAccount.php
@@ -11,21 +11,28 @@ public function getLinks()
     {
         $this->lang->loadLanguageFile(array('public_steam_login'));
         $return = parent::getLinks();
+        $totalLinks = count($return);
+        $target = 6;
+
+        if ($totalLinks - 1 < $target) {
+            $target = $totalLinks - 1;
+        }
+
         foreach ($return as $tabk => $tabv) {
-            if ($tabk == 6) {
-                $return[6] = array('url' => 'area=managesteam',
-                    'title' => $this->lang->words['manage_steam'],
-                    'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'managesteam' ? 1 : 0,
-                    'area' => 'managesteam'
-                );
-                $return[7] = $tabv;
-            } elseif ($tabk > 6) {
+            if ($tabk >= $target) {
+                if ($tabk == $target) {
+                    $return[$tabk] = array('url' => 'area=managesteam',
+                        'title' => $this->lang->words['manage_steam'],
+                        'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'managesteam' ? 1 : 0,
+                        'area' => 'managesteam'
+                    );
+                }
                 $return[$tabk + 1] = $tabv;
             } else {
                 $return[$tabk] = $tabv;
             }
         }
-
+        
         return $return;
     }
 
@@ -80,4 +87,4 @@ public function showForm($current_area, $errors = array())
 
         return parent::showForm($current_area, $errors);
     }
-}
+}
diff --git a/Steam_Login.xml b/Steam_Login.xml
@@ -9,8 +9,8 @@
       <hook_website>http://www.lavoaster.co.uk</hook_website>
       <hook_update_check>http://www.lavoaster.co.uk/update.php?app=steam_login</hook_update_check>
       <hook_requirements><![CDATA[a:3:{s:21:"required_applications";a:0:{}s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.1.0</hook_version_human>
-      <hook_version_long>11000</hook_version_long>
+      <hook_version_human>1.1.2</hook_version_human>
+      <hook_version_long>11002</hook_version_long>
       <hook_extra_data><![CDATA[a:4:{s:7:"display";a:3:{s:8:"language";s:197:"From core_public_steam_login: log_in_steam, manage_steam, sign_in_steam, steam_already_linked, steam_linked_account, steam_link_account, unlink_steam, unlink_steam_desc, unlink_steam_sub, use_steam";s:9:"templates";s:132:"From skin_steamlogin: globalTemplateIcon, inlineLoginButton, registerFormButton, showLoginFormButton<br />From skin_ucp: manageSteam";s:6:"custom";s:24:"install_steamInstall.php";}s:8:"language";a:1:{s:23:"core_public_steam_login";a:10:{i:0;s:9:"use_steam";i:1;s:13:"sign_in_steam";i:2;s:12:"manage_steam";i:3;s:20:"steam_already_linked";i:4;s:12:"log_in_steam";i:5;s:18:"steam_link_account";i:6;s:20:"steam_linked_account";i:7;s:12:"unlink_steam";i:8;s:17:"unlink_steam_desc";i:9;s:16:"unlink_steam_sub";}}s:9:"templates";a:2:{s:15:"skin_steamlogin";a:4:{i:0;s:18:"globalTemplateIcon";i:1;s:17:"inlineLoginButton";i:2;s:18:"registerFormButton";i:3;s:19:"showLoginFormButton";}s:8:"skin_ucp";a:1:{i:0;s:11:"manageSteam";}}s:6:"custom";s:16:"steamInstall.php";}]]></hook_extra_data>
       <hook_key>steam_login</hook_key>
       <hook_global_caches/>
@@ -223,15 +223,22 @@ class steamLinkAccount extends (~extends~)
     {
         $this->lang->loadLanguageFile(array('public_steam_login'));
         $return = parent::getLinks();
+        $totalLinks = count($return);
+        $target = 6;
+
+        if ($totalLinks - 1 < $target) {
+            $target = $totalLinks - 1;
+        }
+
         foreach ($return as $tabk => $tabv) {
-            if ($tabk == 6) {
-                $return[6] = array('url' => 'area=managesteam',
-                    'title' => $this->lang->words['manage_steam'],
-                    'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'managesteam' ? 1 : 0,
-                    'area' => 'managesteam'
-                );
-                $return[7] = $tabv;
-            } elseif ($tabk > 6) {
+            if ($tabk >= $target) {
+                if ($tabk == $target) {
+                    $return[$tabk] = array('url' => 'area=managesteam',
+                        'title' => $this->lang->words['manage_steam'],
+                        'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'managesteam' ? 1 : 0,
+                        'area' => 'managesteam'
+                    );
+                }
                 $return[$tabk + 1] = $tabv;
             } else {
                 $return[$tabk] = $tabv;