v3.1.05

GibbonEdu · Oct 17, 2021 · 759fc31 · 759fc31
1 parent 4714300
commit 759fc31
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/Credentials/CHANGEDB.php b/Credentials/CHANGEDB.php
@@ -144,3 +144,8 @@
 ++$count;
 $sql[$count][0] = '3.1.04';
 $sql[$count][1] = "";
+
+//3.1.05
+++$count;
+$sql[$count][0] = '3.1.05';
+$sql[$count][1] = "";
diff --git a/Credentials/CHANGELOG.txt b/Credentials/CHANGELOG.txt
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v3.1.05
+-------
+Final session refactoring
+
 v3.1.04
 -------
 Fixed session issue in View Credentials

diff --git a/Credentials/manifest.php b/Credentials/manifest.php
@@ -25,7 +25,7 @@
 $entryURL = 'credentials.php';
 $type = 'Additional';
 $category = 'Admin';
-$version = '3.1.04';
+$version = '3.1.05';
 $author = 'Ross Parker';
 $url = 'http://rossparker.org';
 

diff --git a/Credentials/moduleFunctions.php b/Credentials/moduleFunctions.php
@@ -24,6 +24,8 @@
 define('ENCRYPTION_DIVIDER_TOKEN', '$$');
 
 function getHookCredentialGrid($guid, $connection2, $gibbonPersonID, $mini = false) {
+    global $session;
+
     $return = null;
 
     try {
@@ -82,9 +84,9 @@ function getHookCredentialGrid($guid, $connection2, $gibbonPersonID, $mini = fal
                 $size = '75px';
             }
             if ($row['logo'] != '') {
-                $return .= "<img class='user' style='max-width: $size' src='".$_SESSION[$guid]['absoluteURL'].'/'.$row['logo']."'/>";
+                $return .= "<img class='user' style='max-width: $size' src='".$session->get('absoluteURL').'/'.$row['logo']."'/>";
             } else {
-                $return .= "<img class='user' style='max-width: $size' src='".$_SESSION[$guid]['absoluteURL'].'/themes/'.$_SESSION[$guid]['gibbonThemeName']."/img/anonymous_240_square.jpg'/>";
+                $return .= "<img class='user' style='max-width: $size' src='".$session->get('absoluteURL').'/themes/'.$session->get('gibbonThemeName')."/img/anonymous_240_square.jpg'/>";
             }
             $return .= '</td>';
             $return .= '<td>';
@@ -114,7 +116,7 @@ function getHookCredentialGrid($guid, $connection2, $gibbonPersonID, $mini = fal
             $return .= '});';
             $return .= '</script>';
             if ($row['credentialNotes'] != '' or $row['websiteNotes'] != '') {
-                $return .= "<a title='".__m('View Notes')."' class='show_hide-$count-$gibbonPersonID' onclick='false' href='#'><img style='padding-right: 5px' src='".$_SESSION[$guid]['absoluteURL'].'/themes/'.$_SESSION[$guid]['gibbonThemeName']."/img/page_down.png' alt='".__m('View Notes')."' onclick='return false;' /></a>";
+                $return .= "<a title='".__m('View Notes')."' class='show_hide-$count-$gibbonPersonID' onclick='false' href='#'><img style='padding-right: 5px' src='".$session->get('absoluteURL').'/themes/'.$session->get('gibbonThemeName')."/img/page_down.png' alt='".__m('View Notes')."' onclick='return false;' /></a>";
             }
             echo '</td>';
             $return .= '</tr>';

diff --git a/Credentials/version.php b/Credentials/version.php
@@ -20,5 +20,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '3.1.04';
+$moduleVersion = '3.1.05';
 $coreVersion = '22.0.00';