o2system / session

src/DataStructures/Config.php

Spacing +27 added lines, -27 removed lines

@@ -32,33 +32,33 @@ 
     public function __construct(array $config)

     {

         // Define Session Name

-        $config[ 'name' ] = isset($config[ 'name' ]) ? $config[ 'name' ] : 'o2session';

+        $config['name'] = isset($config['name']) ? $config['name'] : 'o2session';

 

         // Define Session Match IP

-        $config[ 'match' ][ 'ip' ] = isset($config[ 'match' ][ 'ip' ]) ? $config[ 'match' ][ 'ip' ] : false;

+        $config['match']['ip'] = isset($config['match']['ip']) ? $config['match']['ip'] : false;

 

         // Re-Define Session Name base on Match IP

-        $config[ 'name' ] = $config[ 'name' ] . ':' . ($config[ 'match' ][ 'ip' ] ? $_SERVER[ 'REMOTE_ADDR' ] . ':' : '');

-        $config[ 'name' ] = rtrim($config[ 'name' ], ':');

+        $config['name'] = $config['name'] . ':' . ($config['match']['ip'] ? $_SERVER['REMOTE_ADDR'] . ':' : '');

+        $config['name'] = rtrim($config['name'], ':');

 

-        if (isset($config[ 'handler' ])) {

-            $config[ 'handler' ] = $config[ 'handler' ] === 'files' ? 'file' : $config[ 'handler' ];

+        if (isset($config['handler'])) {

+            $config['handler'] = $config['handler'] === 'files' ? 'file' : $config['handler'];

             // $config[ 'handler' ] = $config[ 'handler' ] === 'memcache' ? 'memcached' : $config[ 'handler' ];

         }

 

-        if ($config[ 'handler' ] === 'file') {

-            if (isset($config[ 'filePath' ])) {

-                $config[ 'filePath' ] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $config[ 'filePath' ]);

+        if ($config['handler'] === 'file') {

+            if (isset($config['filePath'])) {

+                $config['filePath'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $config['filePath']);

 

-                if ( ! is_dir($config[ 'filePath' ])) {

+                if ( ! is_dir($config['filePath'])) {

                     if (defined('PATH_CACHE')) {

-                        $config[ 'filePath' ] = PATH_CACHE . $config[ 'filePath' ];

+                        $config['filePath'] = PATH_CACHE . $config['filePath'];

                     } else {

-                        $config[ 'filePath' ] = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $config[ 'filePath' ];

+                        $config['filePath'] = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $config['filePath'];

                     }

                 }

             } elseif (defined('PATH_CACHE')) {

-                $config[ 'filePath' ] = PATH_CACHE . 'sessions';

+                $config['filePath'] = PATH_CACHE . 'sessions';

             } else {

                 $this->path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . implode(

                         DIRECTORY_SEPARATOR,

@@ -66,37 +66,37 @@ 
                     );

             }

 

-            $config[ 'filePath' ] = rtrim($config[ 'filePath' ], DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;

+            $config['filePath'] = rtrim($config['filePath'], DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;

 

-            if ( ! is_writable($config[ 'filePath' ])) {

-                if ( ! file_exists($config[ 'filePath' ])) {

-                    @mkdir($config[ 'filePath' ], 0777, true);

+            if ( ! is_writable($config['filePath'])) {

+                if ( ! file_exists($config['filePath'])) {

+                    @mkdir($config['filePath'], 0777, true);

                 }

             }

         }

 

-        if (empty($config[ 'cookie' ]) AND php_sapi_name() !== 'cli') {

-            $config[ 'cookie' ] = [

+        if (empty($config['cookie']) AND php_sapi_name() !== 'cli') {

+            $config['cookie'] = [

                 'name'     => 'o2session',

                 'lifetime' => 7200,

-                'domain'   => isset($_SERVER[ 'HTTP_HOST' ]) ? $_SERVER[ 'HTTP_HOST' ] : $_SERVER[ 'SERVER_NAME' ],

+                'domain'   => isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'],

                 'path'     => '/',

                 'secure'   => false,

                 'httpOnly' => false,

             ];

         }

 

-        if ( ! isset($config[ 'regenerate' ])) {

-            $config[ 'regenerate' ][ 'destroy' ] = false;

-            $config[ 'regenerate' ][ 'lifetime' ] = 600;

+        if ( ! isset($config['regenerate'])) {

+            $config['regenerate']['destroy'] = false;

+            $config['regenerate']['lifetime'] = 600;

         }

 

-        if ( ! isset($config[ 'lifetime' ])) {

-            $config[ 'lifetime' ] = $config[ 'cookie' ][ 'lifetime' ];

+        if ( ! isset($config['lifetime'])) {

+            $config['lifetime'] = $config['cookie']['lifetime'];

         }

 

-        if ( ! isset($config[ 'path' ])) {

-            $config[ 'path' ] = '/';

+        if ( ! isset($config['path'])) {

+            $config['path'] = '/';

         }

 

         parent::__construct($config, Config::CAMELCASE_OFFSET);

src/Session.php

Spacing +94 added lines, -94 removed lines

@@ -112,7 +112,7 @@ 
      */

     public function setLogger(LoggerInterface $logger)

     {

-        $this->logger =& $logger;

+        $this->logger = & $logger;

 

         // Load Session Language

         language()->loadFile('session');

@@ -156,12 +156,12 @@ 
         session_set_save_handler($this->handler, true);

 

         // Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers

-        if (isset($_COOKIE[ $this->config[ 'name' ] ]) && (

-                ! is_string($_COOKIE[ $this->config[ 'name' ] ]) || ! preg_match('#\A' . $this->sidRegexp . '\z#',

-                    $_COOKIE[ $this->config[ 'name' ] ])

+        if (isset($_COOKIE[$this->config['name']]) && (

+                ! is_string($_COOKIE[$this->config['name']]) || ! preg_match('#\A' . $this->sidRegexp . '\z#',

+                    $_COOKIE[$this->config['name']])

             )

         ) {

-            unset($_COOKIE[ $this->config[ 'name' ] ]);

+            unset($_COOKIE[$this->config['name']]);

         }

 

         session_start();

@@ -169,37 +169,37 @@ 
         $this->initializeVariables();

 

         // Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers

-        if (isset($_COOKIE[ $this->config[ 'name' ] ]) && (

-                ! is_string($this->config[ 'name' ]) ||

-                ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[ $this->config[ 'name' ] ]

+        if (isset($_COOKIE[$this->config['name']]) && (

+                ! is_string($this->config['name']) ||

+                ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[$this->config['name']]

                 )

             )

         ) {

-            unset($_COOKIE[ $this->config[ 'name' ] ]);

+            unset($_COOKIE[$this->config['name']]);

         }

 

         // Is session ID auto-regeneration configured? (ignoring ajax requests)

-        if ((empty($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) ||

-                strtolower($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) !== 'xmlhttprequest') &&

-            ($regenerateTime = $this->config[ 'regenerate' ]->lifetime) > 0

+        if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) ||

+                strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest') &&

+            ($regenerateTime = $this->config['regenerate']->lifetime) > 0

         ) {

-            if ( ! isset($_SESSION[ 'last_regenerate' ])) {

-                $_SESSION[ 'last_regenerate' ] = time();

-            } elseif ($_SESSION[ 'last_regenerate' ] < (time() - $regenerateTime)) {

+            if ( ! isset($_SESSION['last_regenerate'])) {

+                $_SESSION['last_regenerate'] = time();

+            } elseif ($_SESSION['last_regenerate'] < (time() - $regenerateTime)) {

                 $this->regenerate();

             }

         }

         // Another work-around ... PHP doesn't seem to send the session cookie

         // unless it is being currently created or regenerated

-        elseif (isset($_COOKIE[ $this->config[ 'name' ] ]) && $_COOKIE[ $this->config[ 'name' ] ] === session_id()

+        elseif (isset($_COOKIE[$this->config['name']]) && $_COOKIE[$this->config['name']] === session_id()

         ) {

             setcookie(

-                $this->config[ 'name' ],

+                $this->config['name'],

                 session_id(),

-                (empty($this->config[ 'lifetime' ]) ? 0 : time() + $this->config[ 'lifetime' ]),

-                $this->config[ 'cookie' ]->path,

-                '.' . ltrim($this->config[ 'cookie' ]->domain, '.'),

-                $this->config[ 'cookie' ]->secure,

+                (empty($this->config['lifetime']) ? 0 : time() + $this->config['lifetime']),

+                $this->config['cookie']->path,

+                '.' . ltrim($this->config['cookie']->domain, '.'),

+                $this->config['cookie']->secure,

                 true

             );

         }

@@ -220,23 +220,23 @@ 
      */

     private function setConfiguration()

     {

-        ini_set('session.name', $this->config[ 'name' ]);

+        ini_set('session.name', $this->config['name']);

 

-        if (empty($this->config[ 'lifetime' ])) {

-            $this->config[ 'lifetime' ] = (int)ini_get('session.gc_maxlifetime');

+        if (empty($this->config['lifetime'])) {

+            $this->config['lifetime'] = (int)ini_get('session.gc_maxlifetime');

         } else {

-            ini_set('session.gc_maxlifetime', (int)$this->config[ 'lifetime' ]);

+            ini_set('session.gc_maxlifetime', (int)$this->config['lifetime']);

         }

 

-        if (empty($this->config[ 'cookie' ]->domain)) {

-            $this->config[ 'cookie' ]->domain = (isset($_SERVER[ 'HTTP_HOST' ]) ? $_SERVER[ 'HTTP_HOST' ]

-                : (isset($_SERVER[ 'SERVER_NAME' ]) ? $_SERVER[ 'SERVER_NAME' ] : null));

+        if (empty($this->config['cookie']->domain)) {

+            $this->config['cookie']->domain = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST']

+                : (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null));

         }

 

-        $this->config[ 'cookie' ]->domain = ltrim($this->config[ 'cookie' ]->domain, '.');

+        $this->config['cookie']->domain = ltrim($this->config['cookie']->domain, '.');

 

-        ini_set('session.cookie_domain', '.' . $this->config[ 'cookie' ]->domain);

-        ini_set('session.cookie_path', $this->config[ 'cookie' ]->path);

+        ini_set('session.cookie_domain', '.' . $this->config['cookie']->domain);

+        ini_set('session.cookie_path', $this->config['cookie']->path);

 

         // Security is king

         ini_set('session.cookie_lifetime', 0);

@@ -323,25 +323,25 @@ 
      */

     private function initializeVariables()

     {

-        if (empty($_SESSION[ 'system_variables' ])) {

+        if (empty($_SESSION['system_variables'])) {

             return;

         }

 

         $currentTime = time();

 

-        foreach ($_SESSION[ 'system_variables' ] as $key => &$value) {

+        foreach ($_SESSION['system_variables'] as $key => &$value) {

             if ($value === 'new') {

-                $_SESSION[ 'system_variables' ][ $key ] = 'old';

+                $_SESSION['system_variables'][$key] = 'old';

             }

             // Hacky, but 'old' will (implicitly) always be less than time() ;)

             // DO NOT move this above the 'new' check!

             elseif ($value < $currentTime) {

-                unset($_SESSION[ $key ], $_SESSION[ 'system_variables' ][ $key ]);

+                unset($_SESSION[$key], $_SESSION['system_variables'][$key]);

             }

         }

 

-        if (empty($_SESSION[ 'system_variables' ])) {

-            unset($_SESSION[ 'system_variables' ]);

+        if (empty($_SESSION['system_variables'])) {

+            unset($_SESSION['system_variables']);

         }

     }

 

@@ -354,8 +354,8 @@ 
      */

     public function regenerate()

     {

-        $_SESSION[ 'last_regenerate' ] = time();

-        session_regenerate_id($this->config[ 'regenerate' ]->destroy);

+        $_SESSION['last_regenerate'] = time();

+        session_regenerate_id($this->config['regenerate']->destroy);

     }

 

     //--------------------------------------------------------------------

@@ -389,12 +389,12 @@ 
     public function stop()

     {

         setcookie(

-            $this->config[ 'name' ],

+            $this->config['name'],

             session_id(),

             1,

-            $this->config[ 'cookie' ]->path,

-            '.' . ltrim($this->config[ 'cookie' ]->domain, '.'),

-            $this->config[ 'cookie' ]->secure,

+            $this->config['cookie']->path,

+            '.' . ltrim($this->config['cookie']->domain, '.'),

+            $this->config['cookie']->secure,

             true

         );

 

@@ -453,7 +453,7 @@ 
      */

     public function offsetExists($offset)

     {

-        return (bool)isset($_SESSION[ $offset ]);

+        return (bool)isset($_SESSION[$offset]);

     }

 

     // ------------------------------------------------------------------------

@@ -488,14 +488,14 @@ 
     public function &__get($offset)

     {

         if ($offset === 'id') {

-            $_SESSION[ 'id' ] = session_id();

+            $_SESSION['id'] = session_id();

         }

 

-        if ( ! isset($_SESSION[ $offset ])) {

-            $_SESSION[ $offset ] = null;

+        if ( ! isset($_SESSION[$offset])) {

+            $_SESSION[$offset] = null;

         }

 

-        return $_SESSION[ $offset ];

+        return $_SESSION[$offset];

     }

 

     // ------------------------------------------------------------------------

@@ -535,7 +535,7 @@ 
      */

     public function offsetSet($offset, $value)

     {

-        $_SESSION[ $offset ] =& $value;

+        $_SESSION[$offset] = & $value;

     }

 

     // ------------------------------------------------------------------------

@@ -573,8 +573,8 @@ 
      */

     public function offsetUnset($offset)

     {

-        if (isset($_SESSION[ $offset ])) {

-            unset($_SESSION[ $offset ]);

+        if (isset($_SESSION[$offset])) {

+            unset($_SESSION[$offset]);

         }

     }

 

@@ -637,13 +637,13 @@ 
     {

         if (is_array($offset)) {

             foreach ($offset as $key => &$value) {

-                $_SESSION[ $key ] = $value;

+                $_SESSION[$key] = $value;

             }

 

             return;

         }

 

-        $_SESSION[ $offset ] =& $value;

+        $_SESSION[$offset] = & $value;

     }

 

     //--------------------------------------------------------------------

@@ -661,26 +661,26 @@ 
     {

         if (is_array($offset)) {

             for ($i = 0, $c = count($offset); $i < $c; $i++) {

-                if ( ! isset($_SESSION[ $offset[ $i ] ])) {

+                if ( ! isset($_SESSION[$offset[$i]])) {

                     return false;

                 }

             }

 

             $new = array_fill_keys($offset, 'new');

 

-            $_SESSION[ 'system_variables' ] = isset($_SESSION[ 'system_variables' ]) ? array_merge(

-                $_SESSION[ 'system_variables' ],

+            $_SESSION['system_variables'] = isset($_SESSION['system_variables']) ? array_merge(

+                $_SESSION['system_variables'],

                 $new

             ) : $new;

 

             return true;

         }

 

-        if ( ! isset($_SESSION[ $offset ])) {

+        if ( ! isset($_SESSION[$offset])) {

             return false;

         }

 

-        $_SESSION[ 'system_variables' ][ $offset ] = 'new';

+        $_SESSION['system_variables'][$offset] = 'new';

 

         return true;

     }

@@ -718,10 +718,10 @@ 
     public function offsetGet($offset)

     {

         if ($offset === 'id') {

-            $_SESSION[ 'id' ] = session_id();

+            $_SESSION['id'] = session_id();

         }

 

-        return (isset($_SESSION[ $offset ])) ? $_SESSION[ $offset ] : false;

+        return (isset($_SESSION[$offset])) ? $_SESSION[$offset] : false;

     }

 

     //--------------------------------------------------------------------

@@ -739,15 +739,15 @@ 
     public function getFlash($offset = null)

     {

         if (isset($offset)) {

-            return (isset($_SESSION[ 'system_variables' ], $_SESSION[ 'system_variables' ][ $offset ], $_SESSION[ $offset ]) &&

-                ! is_int($_SESSION[ 'system_variables' ][ $offset ])) ? $_SESSION[ $offset ] : null;

+            return (isset($_SESSION['system_variables'], $_SESSION['system_variables'][$offset], $_SESSION[$offset]) &&

+                ! is_int($_SESSION['system_variables'][$offset])) ? $_SESSION[$offset] : null;

         }

 

         $flashVariables = [];

 

-        if ( ! empty($_SESSION[ 'system_variables' ])) {

-            foreach ($_SESSION[ 'system_variables' ] as $offset => &$value) {

-                is_int($value) OR $flashVariables[ $offset ] = $_SESSION[ $offset ];

+        if ( ! empty($_SESSION['system_variables'])) {

+            foreach ($_SESSION['system_variables'] as $offset => &$value) {

+                is_int($value) OR $flashVariables[$offset] = $_SESSION[$offset];

             }

         }

 

@@ -779,23 +779,23 @@ 
      */

     public function unsetFlash($offset)

     {

-        if (empty($_SESSION[ 'system_variables' ])) {

+        if (empty($_SESSION['system_variables'])) {

             return;

         }

 

         is_array($offset) OR $offset = [$offset];

 

         foreach ($offset as $key) {

-            if (isset($_SESSION[ 'system_variables' ][ $key ]) && ! is_int(

-                    $_SESSION[ 'system_variables' ][ $key ]

+            if (isset($_SESSION['system_variables'][$key]) && ! is_int(

+                    $_SESSION['system_variables'][$key]

                 )

             ) {

-                unset($_SESSION[ 'system_variables' ][ $key ]);

+                unset($_SESSION['system_variables'][$key]);

             }

         }

 

-        if (empty($_SESSION[ 'system_variables' ])) {

-            unset($_SESSION[ 'system_variables' ]);

+        if (empty($_SESSION['system_variables'])) {

+            unset($_SESSION['system_variables']);

         }

     }

 

@@ -810,13 +810,13 @@ 
      */

     public function getFlashOffsets()

     {

-        if ( ! isset($_SESSION[ 'system_variables' ])) {

+        if ( ! isset($_SESSION['system_variables'])) {

             return [];

         }

 

         $offsets = [];

-        foreach (array_keys($_SESSION[ 'system_variables' ]) as $offset) {

-            is_int($_SESSION[ 'system_variables' ][ $offset ]) OR $offsets[] = $offset;

+        foreach (array_keys($_SESSION['system_variables']) as $offset) {

+            is_int($_SESSION['system_variables'][$offset]) OR $offsets[] = $offset;

         }

 

         return $offsets;

@@ -868,26 +868,26 @@ 
                     $value += time();

                 }

 

-                if ( ! isset($_SESSION[ $key ])) {

+                if ( ! isset($_SESSION[$key])) {

                     return false;

                 }

 

-                $temp[ $key ] = $value;

+                $temp[$key] = $value;

             }

 

-            $_SESSION[ 'system_variables' ] = isset($_SESSION[ 'system_variables' ]) ? array_merge(

-                $_SESSION[ 'system_variables' ],

+            $_SESSION['system_variables'] = isset($_SESSION['system_variables']) ? array_merge(

+                $_SESSION['system_variables'],

                 $temp

             ) : $temp;

 

             return true;

         }

 

-        if ( ! isset($_SESSION[ $offset ])) {

+        if ( ! isset($_SESSION[$offset])) {

             return false;

         }

 

-        $_SESSION[ 'system_variables' ][ $offset ] = $ttl;

+        $_SESSION['system_variables'][$offset] = $ttl;

 

         return true;

     }

@@ -906,15 +906,15 @@ 
     public function getTemp($offset = null)

     {

         if (isset($offset)) {

-            return (isset($_SESSION[ 'system_variables' ], $_SESSION[ 'system_variables' ][ $offset ], $_SESSION[ $offset ]) &&

-                is_int($_SESSION[ 'system_variables' ][ $offset ])) ? $_SESSION[ $offset ] : null;

+            return (isset($_SESSION['system_variables'], $_SESSION['system_variables'][$offset], $_SESSION[$offset]) &&

+                is_int($_SESSION['system_variables'][$offset])) ? $_SESSION[$offset] : null;

         }

 

         $tempVariables = [];

 

-        if ( ! empty($_SESSION[ 'system_variables' ])) {

-            foreach ($_SESSION[ 'system_variables' ] as $offset => &$value) {

-                is_int($value) && $tempVariables[ $offset ] = $_SESSION[ $offset ];

+        if ( ! empty($_SESSION['system_variables'])) {

+            foreach ($_SESSION['system_variables'] as $offset => &$value) {

+                is_int($value) && $tempVariables[$offset] = $_SESSION[$offset];

             }

         }

 

@@ -932,23 +932,23 @@ 
      */

     public function unsetTemp($offset)

     {

-        if (empty($_SESSION[ 'system_variables' ])) {

+        if (empty($_SESSION['system_variables'])) {

             return;

         }

 

         is_array($offset) OR $offset = [$offset];

 

         foreach ($offset as $key) {

-            if (isset($_SESSION[ 'system_variables' ][ $key ]) && is_int(

-                    $_SESSION[ 'system_variables' ][ $key ]

+            if (isset($_SESSION['system_variables'][$key]) && is_int(

+                    $_SESSION['system_variables'][$key]

                 )

             ) {

-                unset($_SESSION[ 'system_variables' ][ $key ]);

+                unset($_SESSION['system_variables'][$key]);

             }

         }

 

-        if (empty($_SESSION[ 'system_variables' ])) {

-            unset($_SESSION[ 'system_variables' ]);

+        if (empty($_SESSION['system_variables'])) {

+            unset($_SESSION['system_variables']);

         }

     }

 

@@ -963,13 +963,13 @@ 
      */

     public function getTempOffsets()

     {

-        if ( ! isset($_SESSION[ 'system_variables' ])) {

+        if ( ! isset($_SESSION['system_variables'])) {

             return [];

         }

 

         $offsets = [];

-        foreach (array_keys($_SESSION[ 'system_variables' ]) as $offset) {

-            is_int($_SESSION[ 'system_variables' ][ $offset ]) && $offsets[] = $offset;

+        foreach (array_keys($_SESSION['system_variables']) as $offset) {

+            is_int($_SESSION['system_variables'][$offset]) && $offsets[] = $offset;

         }

 

         return $offsets;