Changeset 154 for trunk/lib


Ignore:
Timestamp:
Jun 8, 2006 5:36:10 AM (18 years ago)
Author:
scdev
Message:

${1}

Location:
trunk/lib
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/lib/App.inc.php

    r144 r154  
    152152    {
    153153        // Set namespace of application instance.
    154         $this->_ns = '_app_' . $namespace;
     154        $this->_ns = $namespace;
    155155
    156156        // Initialize default parameters.
    … …  
    281281            session_start();
    282282
    283             if (!isset($_SESSION[$this->_ns])) {
     283            if (!isset($_SESSION['_app'][$this->_ns])) {
    284284                // Access session data using: $_SESSION['...'].
    285285                // Initialize here _after_ session has started.
    286                 $_SESSION[$this->_ns] = array(
     286                $_SESSION['_app'][$this->_ns] = array(
    287287                    'messages' => array(),
    288288                    'boomerang' => array('url'),
    … …  
    363363        // Save message in session under unique key to avoid duplicate messages.
    364364        $msg_id = md5($type . $message . $file . $line);
    365         $_SESSION[$this->_ns]['messages'][$msg_id] = array(
     365        $_SESSION['_app'][$this->_ns]['messages'][$msg_id] = array(
    366366            'type'    => $type,
    367367            'message' => $message,
    368368            'file'    => $file,
    369369            'line'    => $line,
    370             'count'   => (isset($_SESSION[$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION[$this->_ns]['messages'][$msg_id]['count']) : 1)
     370            'count'   => (isset($_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) : 1)
    371371        );
    372372
    … …  
    391391        }
    392392
    393         return isset($_SESSION[$this->_ns]['messages']) ? $_SESSION[$this->_ns]['messages'] : array();
     393        return isset($_SESSION['_app'][$this->_ns]['messages']) ? $_SESSION['_app'][$this->_ns]['messages'] : array();
    394394    }
    395395   
    … …  
    408408        }
    409409       
    410         $_SESSION[$this->_ns]['messages'] = array();
     410        $_SESSION['_app'][$this->_ns]['messages'] = array();
    411411    }
    412412
    … …  
    843843        // Get URL from stored boomerang. Allow non specific URL if ID not valid.
    844844        if ($this->validBoomerangURL($id, true)) {
    845             if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
    846                 $url = $_SESSION[$this->_ns]['boomerang']['url'][$id];
     845            if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
     846                $url = $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
    847847                $this->logMsg(sprintf('dieBoomerangURL(%s) found: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
    848848            } else {
    849                 $url = end($_SESSION[$this->_ns]['boomerang']['url']);
     849                $url = end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
    850850                $this->logMsg(sprintf('dieBoomerangURL(%s) using: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
    851851            }
    … …  
    866866        // A redirection will never happen immediately twice.
    867867        // Set the time so ensure this doesn't happen.
    868         $_SESSION[$this->_ns]['boomerang']['time'] = time();
     868        $_SESSION['_app'][$this->_ns]['boomerang']['time'] = time();
    869869        $this->dieURL($url, $carry_args);
    870870    }
    … …  
    890890            $url = preg_replace('/boomerang=[\w]+/', '', $url);
    891891
    892             if (isset($_SESSION[$this->_ns]['boomerang']['url']) && is_array($_SESSION[$this->_ns]['boomerang']['url']) && !empty($_SESSION[$this->_ns]['boomerang']['url'])) {
     892            if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url']) && is_array($_SESSION['_app'][$this->_ns]['boomerang']['url']) && !empty($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
    893893                // If the URL currently exists in the boomerang array, delete.
    894                 while ($existing_key = array_search($url, $_SESSION[$this->_ns]['boomerang']['url'])) {
    895                     unset($_SESSION[$this->_ns]['boomerang']['url'][$existing_key]);
     894                while ($existing_key = array_search($url, $_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
     895                    unset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$existing_key]);
    896896                }
    897897            }
    898898
    899899            if (isset($id)) {
    900                 $_SESSION[$this->_ns]['boomerang']['url'][$id] = $url;
     900                $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id] = $url;
    901901            } else {
    902                 $_SESSION[$this->_ns]['boomerang']['url'][] = $url;
     902                $_SESSION['_app'][$this->_ns]['boomerang']['url'][] = $url;
    903903            }
    904904            $this->logMsg(sprintf('setBoomerangURL(%s): %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
    … …  
    923923
    924924        if (isset($id)) {
    925             if (isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
    926                 return $_SESSION[$this->_ns]['boomerang']['url'][$id];
     925            if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
     926                return $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
    927927            } else {
    928928                return '';
    929929            }
    930         } else if (is_array($_SESSION[$this->_ns]['boomerang']['url'])) {
    931             return end($_SESSION[$this->_ns]['boomerang']['url']);
     930        } else if (is_array($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
     931            return end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
    932932        } else {
    933933            return false;
    … …  
    949949        $this->logMsg(sprintf('deleteBoomerangURL(%s): %s', $id, $this->getBoomerangURL($id)), LOG_DEBUG, __FILE__, __LINE__);
    950950
    951         if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
    952             unset($_SESSION[$this->_ns]['boomerang']['url'][$id]);
    953         } else if (is_array($_SESSION[$this->_ns]['boomerang']['url'])) {
    954             array_pop($_SESSION[$this->_ns]['boomerang']['url']);
     951        if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
     952            unset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id]);
     953        } else if (is_array($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
     954            array_pop($_SESSION['_app'][$this->_ns]['boomerang']['url']);
    955955        }
    956956    }
    … …  
    969969        }
    970970
    971         if (!isset($_SESSION[$this->_ns]['boomerang']['url'])) {
     971        if (!isset($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
    972972            $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set.', $id), LOG_DEBUG, __FILE__, __LINE__);
    973973            return false;
    … …  
    977977        // a boomerang redirection will always occur at least several seconds after the last boomerang redirect
    978978        // or a boomerang being set.
    979         $boomerang_time = isset($_SESSION[$this->_ns]['boomerang']['time']) ? $_SESSION[$this->_ns]['boomerang']['time'] : 0;
     979        $boomerang_time = isset($_SESSION['_app'][$this->_ns]['boomerang']['time']) ? $_SESSION['_app'][$this->_ns]['boomerang']['time'] : 0;
    980980
    981981        $url = '';
    982         if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
    983             $url = $_SESSION[$this->_ns]['boomerang']['url'][$id];
     982        if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
     983            $url = $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
    984984        } else if (!isset($id) || $use_nonspecificboomerang) {
    985985            // Use non specific boomerang if available.
    986             $url = end($_SESSION[$this->_ns]['boomerang']['url']);
     986            $url = end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
    987987        }
    988988

  • trunk/lib/Auth_File.inc.php

    r149 r154  
    6868    function Auth_File($namespace='null')
    6969    {
    70         $this->_ns = '_auth_' . $namespace;
     70        $this->_ns = $namespace;
    7171
    7272        // Initialize default parameters.
    … …  
    114114    function clear()
    115115    {
    116         $_SESSION[$this->_ns] = array('authenticated' => false);
     116        $_SESSION['_auth_file'][$this->_ns] = array('authenticated' => false);
    117117    }
    118118
    … …  
    127127    function set($key, $val)
    128128    {
    129         if (!isset($_SESSION[$this->_ns]['user_data'])) {
    130             $_SESSION[$this->_ns]['user_data'] = array();
    131         }
    132         $_SESSION[$this->_ns]['user_data'][$key] = $val;
     129        if (!isset($_SESSION['_auth_file'][$this->_ns]['user_data'])) {
     130            $_SESSION['_auth_file'][$this->_ns]['user_data'] = array();
     131        }
     132        $_SESSION['_auth_file'][$this->_ns]['user_data'][$key] = $val;
    133133    }
    134134
    … …  
    143143    function get($key, $default='')
    144144    {
    145         if (isset($_SESSION[$this->_ns][$key])) {
    146             return $_SESSION[$this->_ns][$key];
    147         } else if (isset($_SESSION[$this->_ns]['user_data'][$key])) {
    148             return $_SESSION[$this->_ns]['user_data'][$key];
     145        if (isset($_SESSION['_auth_file'][$this->_ns][$key])) {
     146            return $_SESSION['_auth_file'][$this->_ns][$key];
     147        } else if (isset($_SESSION['_auth_file'][$this->_ns]['user_data'][$key])) {
     148            return $_SESSION['_auth_file'][$this->_ns]['user_data'][$key];
    149149        } else {
    150150            return $default;
    … …  
    209209        }
    210210       
    211         $_SESSION[$this->_ns] = array(
     211        $_SESSION['_auth_file'][$this->_ns] = array(
    212212            'authenticated' => true,
    213213            'username' => $username,
    … …  
    238238        if ($trusted_net = ipInRange(getRemoteAddr(), $this->_params['trusted_networks'])) {
    239239            $user_in_trusted_network = true;
    240             $app->logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION[$this->_ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
     240            $app->logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION['_auth_file'][$this->_ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
    241241        } else if (preg_match('/proxy.aol.com$/i', getRemoteAddr(true))) {
    242242            $user_in_trusted_network = true;
    243             $app->logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION[$this->_ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
     243            $app->logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION['_auth_file'][$this->_ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
    244244        } else {
    245245            $user_in_trusted_network = false;
    … …  
    247247
    248248        // Test login with information stored in session. Skip IP matching for users from trusted networks.
    249         if (isset($_SESSION[$this->_ns])
    250             && true === $_SESSION[$this->_ns]['authenticated']
    251             && !empty($_SESSION[$this->_ns]['username'])
    252             && strtotime($_SESSION[$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
    253             && strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
    254             && ($_SESSION[$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
     249        if (isset($_SESSION['_auth_file'][$this->_ns])
     250            && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']
     251            && !empty($_SESSION['_auth_file'][$this->_ns]['username'])
     252            && strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
     253            && strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
     254            && ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
    255255        ) {
    256256            // User is authenticated!
    257             $_SESSION[$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
     257            $_SESSION['_auth_file'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
    258258            return true;
    259         } else if (isset($_SESSION[$this->_ns]) && true === $_SESSION[$this->_ns]['authenticated']) {
    260             if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - 43200) {
     259        } else if (isset($_SESSION['_auth_file'][$this->_ns]) && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']) {
     260            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - 43200) {
    261261                // Only raise message if last session is less than 12 hours old.
    262262                $app->raiseMsg(_("Your session has closed. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
    … …  
    265265            // Log the reason for login expiration.
    266266            $expire_reasons = array();
    267             if (empty($_SESSION[$this->_ns]['username'])) {
     267            if (empty($_SESSION['_auth_file'][$this->_ns]['username'])) {
    268268                $expire_reasons[] = 'username not found';
    269269            }
    270             if (strtotime($_SESSION[$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
     270            if (strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
    271271                $expire_reasons[] = 'login_timeout expired';
    272272            }
    273             if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
     273            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
    274274                $expire_reasons[] = 'idle_timeout expired';
    275275            }
    276             if ($_SESSION[$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
    277                 $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION[$this->_ns]['remote_ip'], getRemoteAddr());
    278             }
    279             $app->logMsg(sprintf('User %s session expired: %s', $_SESSION[$this->_ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
     276            if ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
     277                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_file'][$this->_ns]['remote_ip'], getRemoteAddr());
     278            }
     279            $app->logMsg(sprintf('User %s session expired: %s', $_SESSION['_auth_file'][$this->_ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
    280280        }
    281281

  • trunk/lib/Auth_SQL.inc.php

    r149 r154  
    100100        $app =& App::getInstance();
    101101       
    102         $this->_ns = '_auth_' . $namespace;
     102        $this->_ns = $namespace;
    103103
    104104        // Initialize default parameters.
    … …  
    264264            WHERE " . $this->_params['db_primary_key'] . " = '" . $this->get('user_id') . "'
    265265        ");
    266         $_SESSION[$this->_ns] = array('authenticated' => false);
     266        $_SESSION['_auth_sql'][$this->_ns] = array('authenticated' => false);
    267267    }
    268268
    … …  
    276276    function set($key, $val)
    277277    {
    278         if (!isset($_SESSION[$this->_ns]['user_data'])) {
    279             $_SESSION[$this->_ns]['user_data'] = array();
    280         }
    281         $_SESSION[$this->_ns]['user_data'][$key] = $val;
     278        if (!isset($_SESSION['_auth_sql'][$this->_ns]['user_data'])) {
     279            $_SESSION['_auth_sql'][$this->_ns]['user_data'] = array();
     280        }
     281        $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key] = $val;
    282282    }
    283283
    … …  
    292292    function get($key, $default='')
    293293    {
    294         if (isset($_SESSION[$this->_ns][$key])) {
    295             return $_SESSION[$this->_ns][$key];
    296         } else if (isset($_SESSION[$this->_ns]['user_data'][$key])) {
    297             return $_SESSION[$this->_ns]['user_data'][$key];
     294        if (isset($_SESSION['_auth_sql'][$this->_ns][$key])) {
     295            return $_SESSION['_auth_sql'][$this->_ns][$key];
     296        } else if (isset($_SESSION['_auth_sql'][$this->_ns]['user_data'][$key])) {
     297            return $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key];
    298298        } else {
    299299            return $default;
    … …  
    373373
    374374        // Register authenticated session.
    375         $_SESSION[$this->_ns] = array(
     375        $_SESSION['_auth_sql'][$this->_ns] = array(
    376376            'authenticated'         => true,
    377377            'user_id'               => $user_data['user_id'],
    … …  
    497497
    498498        // User login test need only be run once per script execution. We cache the result in the session.
    499         if ($this->_authentication_tested && isset($_SESSION[$this->_ns]['authenticated'])) {
    500             return $_SESSION[$this->_ns]['authenticated'];
     499        if ($this->_authentication_tested && isset($_SESSION['_auth_sql'][$this->_ns]['authenticated'])) {
     500            return $_SESSION['_auth_sql'][$this->_ns]['authenticated'];
    501501        }
    502502
    … …  
    521521
    522522        // Test login with information stored in session. Skip IP matching for users from trusted networks.
    523         if (isset($_SESSION[$this->_ns])
    524             && true === $_SESSION[$this->_ns]['authenticated']
    525             && !empty($_SESSION[$this->_ns]['username'])
    526             && strtotime($_SESSION[$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
    527             && strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
    528             && ($_SESSION[$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
     523        if (isset($_SESSION['_auth_sql'][$this->_ns])
     524            && true === $_SESSION['_auth_sql'][$this->_ns]['authenticated']
     525            && !empty($_SESSION['_auth_sql'][$this->_ns]['username'])
     526            && strtotime($_SESSION['_auth_sql'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
     527            && strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
     528            && ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
    529529        ) {
    530530            // User is authenticated!
    531             $_SESSION[$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
     531            $_SESSION['_auth_sql'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
    532532
    533533            // Update the DB with the last_access_datetime and increment the seconds_online.
    … …  
    544544                $app->logMsg(sprintf('User update failed. Record not found for user %s (%s).', $this->get('user_id'), $this->get('username')), LOG_NOTICE, __FILE__, __LINE__);
    545545            }
    546         } else if (isset($_SESSION[$this->_ns]) && true === $_SESSION[$this->_ns]['authenticated']) {
     546        } else if (isset($_SESSION['_auth_sql'][$this->_ns]) && true === $_SESSION['_auth_sql'][$this->_ns]['authenticated']) {
    547547            // User is authenticated, but login has expired.
    548             if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - 43200) {
     548            if (strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) > time() - 43200) {
    549549                // Only raise message if last session is less than 12 hours old.
    550550                $app->raiseMsg(_("Your session has expired. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
    … …  
    553553            // Log the reason for login expiration.
    554554            $expire_reasons = array();
    555             if (empty($_SESSION[$this->_ns]['username'])) {
     555            if (empty($_SESSION['_auth_sql'][$this->_ns]['username'])) {
    556556                $expire_reasons[] = 'username not found';
    557557            }
    558             if (strtotime($_SESSION[$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
     558            if (strtotime($_SESSION['_auth_sql'][$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
    559559                $expire_reasons[] = 'login_timeout expired';
    560560            }
    561             if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
     561            if (strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
    562562                $expire_reasons[] = 'idle_timeout expired';
    563563            }
    564             if ($_SESSION[$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
    565                 $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION[$this->_ns]['remote_ip'], getRemoteAddr());
     564            if ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
     565                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_sql'][$this->_ns]['remote_ip'], getRemoteAddr());
    566566            }
    567567            $app->logMsg(sprintf('User %s (%s) session expired: %s', $this->get('user_id'), $this->get('username'), join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);

  • trunk/lib/Cache.inc.php

    r153 r154  
    4747    function Cache($namespace='')
    4848    {
    49         $this->_ns = '_cache' . $namespace;
    50        
    51         if (!isset($_SESSION[$this->_ns])) {
     49        $this->_ns = $namespace;
     50       
     51        if (!isset($_SESSION['_cache'][$this->_ns])) {
    5252            $this->clear();
    5353        }
    … …  
    146146
    147147        // Remove any value already stored under this key.
    148         unset($_SESSION[$this->_ns][$keyhash]);
     148        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
    149149
    150150        // Continue to prune the cache if its size is greater than stack_size_limit, but keep at least min_items.
    151         while (strlen(serialize($_SESSION[$this->_ns])) + $var_len >= $this->getParam('stack_size_limit') && sizeof($_SESSION[$this->_ns]) >= $this->getParam('min_items')) {
    152             array_shift($_SESSION[$this->_ns]);
     151        while (strlen(serialize($_SESSION['_cache'][$this->_ns])) + $var_len >= $this->getParam('stack_size_limit') && sizeof($_SESSION['_cache'][$this->_ns]) >= $this->getParam('min_items')) {
     152            array_shift($_SESSION['_cache'][$this->_ns]);
    153153        }
    154154
    155155        // Save this value under the specified key.
    156         $_SESSION[$this->_ns][$keyhash] =& $var;
     156        $_SESSION['_cache'][$this->_ns][$keyhash] =& $var;
    157157
    158158        if ($var_len >= 1024000) {
    … …  
    182182
    183183        $keyhash = md5($key);
    184         if (isset($_SESSION[$this->_ns][$keyhash])) {
     184        if (isset($_SESSION['_cache'][$this->_ns][$keyhash])) {
    185185            $app->logMsg(sprintf('Retreiving %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
    186186            // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
    187             $tmp =& $_SESSION[$this->_ns][$keyhash];
    188             unset($_SESSION[$this->_ns][$keyhash]);
    189             $_SESSION[$this->_ns][$keyhash] =& $tmp;
     187            $tmp =& $_SESSION['_cache'][$this->_ns][$keyhash];
     188            unset($_SESSION['_cache'][$this->_ns][$keyhash]);
     189            $_SESSION['_cache'][$this->_ns][$keyhash] =& $tmp;
    190190            // Return the unserialized datum.
    191             return unserialize($_SESSION[$this->_ns][$keyhash]);
     191            return unserialize($_SESSION['_cache'][$this->_ns][$keyhash]);
    192192        } else {
    193193            return false;
    … …  
    208208
    209209        $keyhash = md5($key);
    210         return array_key_exists($keyhash, $_SESSION[$this->_ns]);
     210        return array_key_exists($keyhash, $_SESSION['_cache'][$this->_ns]);
    211211    }
    212212
    … …  
    220220    {
    221221        $keyhash = md5($key);
    222         unset($_SESSION[$this->_ns][$keyhash]);
     222        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
    223223    }
    224224   
    … …  
    233233    function clear()
    234234    {
    235         $_SESSION[$this->_ns] = array();
     235        $_SESSION['_cache'][$this->_ns] = array();
    236236    }
    237237

  • trunk/lib/ImageThumb.inc.php

    r152 r154  
    320320        if (!$this->_validFileExtension($file_name)) {
    321321            $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s not a valid type. It must have one of the following file name extensions: %s"), $file_name, join(', ', $this->getParam('valid_file_extensions'))), MSG_ERR, __FILE__, __LINE__);
    322             $app->logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_ERR, __FILE__, __LINE__);
     322            $app->logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
    323323            return false;
    324324        }
    … …  
    382382            if (IMAGETHUMB_METHOD_NETPBM === $this->getParam('resize_method') && file_exists($this->getParam('anytopnm_binary')) && file_exists($this->getParam('pnmscale_binary')) && file_exists($this->getParam('cjpeg_binary'))) {
    383383                // Resize using Netpbm binaries.
    384                 $app->logMsg(sprintf('Resizing with Netpbm: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
     384                // $app->logMsg(sprintf('Resizing with Netpbm: %s', $source_file), LOG_DEBUG, __FILE__, __LINE__);
    385385                $return_val += $this->_resizeWithNetpbm($source_file, $dest_file, $spec);
    386386            } else if (IMAGETHUMB_METHOD_GD === $this->getParam('resize_method') && extension_loaded('gd')) {
    387387                // Resize with GD.
    388                 $app->logMsg(sprintf('Resizing with GD: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
     388                // $app->logMsg(sprintf('Resizing with GD: %s', $source_file), LOG_DEBUG, __FILE__, __LINE__);
    389389                $return_val += $this->_resizeWithGD($source_file, $dest_file, $spec);
    390390            } else {
    … …  
    739739                }
    740740                if (!file_exists($dest_dir)) {
    741                     if (phpversion() > '5' && false) { ///
     741                    if (phpversion() > '5') {
    742742                        // Recursive.
    743                         if (! ($ret = mkdir($dest_dir, $this->getParam('dest_dir_perms'), true))) {
     743                        if (!file_exists($dest_dir) && !($ret = mkdir($dest_dir, $this->getParam('dest_dir_perms'), true))) {
    744744                            $return_val++;
    745745                            $app->logMsg(sprintf('mkdir failure: %s', $dest_dir), LOG_ERR, __FILE__, __LINE__);

  • trunk/lib/PageNumbers.inc.php

    r153 r154  
    6666        $this->url_base = $_SERVER['PHP_SELF'] . '?page_number=';
    6767       
    68         $this->prefs = new Prefs();
     68        $this->prefs = new Prefs($_SERVER['PHP_SELF']);
    6969        $this->prefs->setParam(array('persistent' => false));
    7070    }

  • trunk/lib/Prefs.inc.php

    r153 r154  
    6363        $app =& App::getInstance();
    6464
    65         $this->_ns = '_prefs_' . $namespace;
     65        $this->_ns = $namespace;
    6666       
    6767        // Initialized the prefs array.
    68         if (!isset($_SESSION[$this->_ns])) {
     68        if (!isset($_SESSION['_prefs'][$this->_ns])) {
    6969            $this->clear();
    7070        }
    … …  
    158158    {
    159159        if (isset($defaults) && is_array($defaults)) {
    160             $_SESSION[$this->_ns]['defaults'] = array_merge($_SESSION[$this->_ns]['defaults'], $defaults);
     160            $_SESSION['_prefs'][$this->_ns]['defaults'] = array_merge($_SESSION['_prefs'][$this->_ns]['defaults'], $defaults);
    161161        }
    162162    }
    … …  
    180180        }
    181181       
    182         if (!isset($_SESSION[$this->_ns]['defaults'][$key]) || $_SESSION[$this->_ns]['defaults'][$key] != $val || isset($_SESSION[$this->_ns]['persistent'][$key])) {
    183             $_SESSION[$this->_ns]['persistent'][$key] = $val;           
     182        if (!isset($_SESSION['_prefs'][$this->_ns]['defaults'][$key]) || $_SESSION['_prefs'][$this->_ns]['defaults'][$key] != $val || isset($_SESSION['_prefs'][$this->_ns]['persistent'][$key])) {
     183            $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;           
    184184        }
    185185    }
    … …  
    196196    {
    197197        $app =& App::getInstance();
    198         if (array_key_exists($key, $_SESSION[$this->_ns]['persistent'])) {
    199             return $_SESSION[$this->_ns]['persistent'][$key];
    200         } else if (array_key_exists($key, $_SESSION[$this->_ns]['defaults'])) {
    201             return $_SESSION[$this->_ns]['defaults'][$key];
     198        if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent'])) {
     199            return $_SESSION['_prefs'][$this->_ns]['persistent'][$key];
     200        } else if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])) {
     201            return $_SESSION['_prefs'][$this->_ns]['defaults'][$key];
    202202        } else {
    203             $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_NOTICE, __FILE__, __LINE__);
     203            $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_DEBUG, __FILE__, __LINE__);
    204204            return null;
    205205        }
    … …  
    214214    function exists($key)
    215215    {
    216         return array_key_exists($key, $_SESSION[$this->_ns]['persistent']);
     216        return array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent']);
    217217    }
    218218
    … …  
    224224    function delete($key)
    225225    {
    226         unset($_SESSION[$this->_ns]['persistent'][$key]);
     226        unset($_SESSION['_prefs'][$this->_ns]['persistent'][$key]);
    227227    }
    228228
    … …  
    233233    function clear()
    234234    {
    235         $_SESSION[$this->_ns] = array(
     235        $_SESSION['_prefs'][$this->_ns] = array(
    236236            'loaded' => false,
    237237            'load_datetime' => '1970-01-01',
    … …  
    286286        ");
    287287        while (list($key, $val) = mysql_fetch_row($qid)) {
    288             $_SESSION[$this->_ns]['persistent'][$key] = $val;
     288            $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;
    289289        }
    290290       
    291         $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION[$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
     291        $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION['_prefs'][$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
    292292       
    293293        // Data loaded only once per session.
    294         $_SESSION[$this->_ns]['loaded'] = true;
    295         $_SESSION[$this->_ns]['load_datetime'] = date('Y-m-d H:i:s');
     294        $_SESSION['_prefs'][$this->_ns]['loaded'] = true;
     295        $_SESSION['_prefs'][$this->_ns]['load_datetime'] = date('Y-m-d H:i:s');
    296296       
    297297        return true;
    … …  
    310310    function _isLoaded()
    311311    {
    312         if (isset($_SESSION[$this->_ns]['load_datetime'])
    313         && strtotime($_SESSION[$this->_ns]['load_datetime']) > time() - $this->getParam('load_timeout')
    314         && isset($_SESSION[$this->_ns]['loaded'])
    315         && true === $_SESSION[$this->_ns]['loaded']) {
     312        if (isset($_SESSION['_prefs'][$this->_ns]['load_datetime'])
     313        && strtotime($_SESSION['_prefs'][$this->_ns]['load_datetime']) > time() - $this->getParam('load_timeout')
     314        && isset($_SESSION['_prefs'][$this->_ns]['loaded'])
     315        && true === $_SESSION['_prefs'][$this->_ns]['loaded']) {
    316316            return true;
    317317        } else {
    … …  
    347347        $this->initDB();
    348348
    349         if (isset($_SESSION[$this->_ns]['persistent']) && is_array($_SESSION[$this->_ns]['persistent'])) {
     349        if (isset($_SESSION['_prefs'][$this->_ns]['persistent']) && is_array($_SESSION['_prefs'][$this->_ns]['persistent'])) {
    350350            // Delete old prefs from database.
    351351            $db->query("
    … …  
    357357            // Insert new prefs.
    358358            $insert_values = array();
    359             foreach ($_SESSION[$this->_ns]['persistent'] as $key => $val) {
     359            foreach ($_SESSION['_prefs'][$this->_ns]['persistent'] as $key => $val) {
    360360                $insert_values[] = sprintf("('%s', '%s', '%s', '%s')", $db->escapeString($this->getParam('user_id')), $db->escapeString($this->_ns), $db->escapeString($key), $db->escapeString($val));
    361361            }

  • trunk/lib/SortOrder.inc.php

    r153 r154  
    3535    function SortOrder($default_sort = '', $default_order = '')
    3636    {
     37        $this->prefs = new Prefs($_SERVER['PHP_SELF']);
     38        $this->prefs->setParam(array('persistent' => false));
     39
    3740        $this->setDefault($default_sort, $default_order);
    3841
    3942        $this->default_sort = $default_sort;
    40         $this->default_order = $default_order;
    41        
    42         $this->prefs = new Prefs();
    43         $this->prefs->setParam(array('persistent' => false));
     43        $this->default_order = $default_order;       
    4444    }
    4545

  • trunk/lib/Utilities.inc.php

    r136 r154  
    250250 * @version     1.1.0
    251251 */
    252 function humanFileSize($size, $unit=null, $format='%01.2f %s')
     252function humanFileSize($size, $max_unit=null, $format='%01.2f %s')
    253253{
    254254    // Units
    … …  
    257257
    258258    // Max unit
    259     $unit = array_search((string) $unit, $units);
    260     if ($unit === null || $unit === false) {
    261         $unit = $ii;
     259    $max_unit = array_search((string) $max_unit, $units);
     260    if ($max_unit === null || $max_unit === false) {
     261        $max_unit = $ii;
    262262    }
    263263
    264264    // Loop
    265265    $i = 0;
    266     while ($unit != $i && $size >= 1024 && $i < $ii) {
     266    while ($max_unit != $i && $size >= 1024 && $i < $ii) {
    267267        $size /= 1024;
    268268        $i++;
Note: See TracChangeset for help on using the changeset viewer.