← Back to branch summary

~ubuntu-branches/ubuntu/lucid/phpmyadmin/lucid

« back to all changes in this revision

Viewing changes to libraries/auth/signon.auth.lib.php

  • Committer: Bazaar Package Importer
  • Author(s): Michal Čihař
  • Date: 2010-03-08 15:25:00 UTC
  • mfrom: (1.2.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100308152500-6e8hmuqc5co39de5
Tags: 4:3.3.0-1
* New upstream version.
* Rediff debian/patches.
* Fix permissions on mediawiki export extension.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/auth/signon.auth.lib.php
4
4
 * Set of functions used to run single signon authentication.
5
5
 *
6
6
 * @package phpMyAdmin-Auth-Signon
7
 
 * @version $Id: signon.auth.lib.php 11972 2008-11-24 09:14:31Z nijel $
 
7
 * @version $Id: signon.auth.lib.php 13030 2009-10-10 11:33:03Z lem9 $
8
8
 */
9
9
 
10
10
 
61
61
    /* Current host */
62
62
    $single_signon_host = $GLOBALS['cfg']['Server']['host'];
63
63
 
 
64
    /* Current port */
 
65
    $single_signon_port = $GLOBALS['cfg']['Server']['port'];
 
66
 
64
67
    /* Are we requested to do logout? */
65
68
    $do_logout = !empty($_REQUEST['old_usr']);
66
69
 
94
97
        if (isset($_SESSION['PMA_single_signon_host'])) {
95
98
                $single_signon_host = $_SESSION['PMA_single_signon_host'];
96
99
        }
 
100
 
 
101
        if (isset($_SESSION['PMA_single_signon_port'])) {
 
102
            $single_signon_port = $_SESSION['PMA_single_signon_port'];
 
103
        }
 
104
 
 
105
 
97
106
        /* Also get token as it is needed to access subpages */
98
107
        if (isset($_SESSION['PMA_single_signon_token'])) {
99
108
            /* No need to care about token on logout */
113
122
        /* Set the single signon host */
114
123
        $GLOBALS['cfg']['Server']['host']=$single_signon_host;
115
124
 
 
125
       /* Set the single signon port */
 
126
       $GLOBALS['cfg']['Server']['port'] = $single_signon_port;
116
127
        /* Restore our token */
117
128
        if (!empty($pma_token)) {
118
129
            $_SESSION[' PMA_token '] = $pma_token;