joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Checking that the session handle worked

Browse source 
Hadn't used MySQL mode in a while, seems to work fine. Going to add memcached support back in as well.
This commit is contained in:
Josh Sherman 2013-02-12 00:11:56 -05:00
parent 927d04452a
commit 4b414783f0
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/Database/PDO/Common.php
View file

@ -9,7 +9,7 @@
* Redistribution of these files must retain the above copyright notice. * Redistribution of these files must retain the above copyright notice.
* *
* @author Josh Sherman <pickles@joshtronic.com> * @author Josh Sherman <pickles@joshtronic.com>
* @copyright Copyright 2007-2012, Josh Sherman * @copyright Copyright 2007-2013, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES * @package PICKLES
* @link https://github.com/joshtronic/pickles * @link https://github.com/joshtronic/pickles
@ -166,7 +166,7 @@ class Database_PDO_Common extends Database_Common
foreach ($backtrace as $file) foreach ($backtrace as $file)
{ {
if (isset($file['class'])) if (isset($file['class'], $file['line']))
{ {
$files[] = $file['class'] . ':' . $file['line']; $files[] = $file['class'] . ':' . $file['line'];
} }

7
classes/Session.php
View file

@ -9,7 +9,7 @@
* Redistribution of these files must retain the above copyright notice. * Redistribution of these files must retain the above copyright notice.
* *
* @author Josh Sherman <pickles@joshtronic.com> * @author Josh Sherman <pickles@joshtronic.com>
* @copyright Copyright 2007-2012, Josh Sherman * @copyright Copyright 2007-2013, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES * @package PICKLES
* @link https://github.com/joshtronic/pickles * @link https://github.com/joshtronic/pickles
@ -40,8 +40,9 @@
* id varchar(32) COLLATE utf8_unicode_ci NOT NULL, * id varchar(32) COLLATE utf8_unicode_ci NOT NULL,
* session text COLLATE utf8_unicode_ci NOT NULL, * session text COLLATE utf8_unicode_ci NOT NULL,
* expires_at datetime NOT NULL, * expires_at datetime NOT NULL,
* PRIMARY KEY (id) * PRIMARY KEY (id),
* ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; * INDEX (expires_at)
* ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
* *
* Note: The reason for not using a model class was to avoid a naming conflict * Note: The reason for not using a model class was to avoid a naming conflict
* between the Session model and the Session class itself. This will eventually * between the Session model and the Session class itself. This will eventually

13
jar.php
View file

@ -1101,7 +1101,7 @@ class Config extends Object
* Redistribution of these files must retain the above copyright notice. * Redistribution of these files must retain the above copyright notice.
* *
* @author Josh Sherman <pickles@joshtronic.com> * @author Josh Sherman <pickles@joshtronic.com>
* @copyright Copyright 2007-2012, Josh Sherman * @copyright Copyright 2007-2013, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES * @package PICKLES
* @link https://github.com/joshtronic/pickles * @link https://github.com/joshtronic/pickles
@ -1894,7 +1894,7 @@ abstract class Database_Common extends Object
* Redistribution of these files must retain the above copyright notice. * Redistribution of these files must retain the above copyright notice.
* *
* @author Josh Sherman <pickles@joshtronic.com> * @author Josh Sherman <pickles@joshtronic.com>
* @copyright Copyright 2007-2012, Josh Sherman * @copyright Copyright 2007-2013, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES * @package PICKLES
* @link https://github.com/joshtronic/pickles * @link https://github.com/joshtronic/pickles
@ -2051,7 +2051,7 @@ class Database_PDO_Common extends Database_Common
foreach ($backtrace as $file) foreach ($backtrace as $file)
{ {
if (isset($file['class'])) if (isset($file['class'], $file['line']))
{ {
$files[] = $file['class'] . ':' . $file['line']; $files[] = $file['class'] . ':' . $file['line'];
} }
@ -7363,7 +7363,7 @@ class Security
* Redistribution of these files must retain the above copyright notice. * Redistribution of these files must retain the above copyright notice.
* *
* @author Josh Sherman <pickles@joshtronic.com> * @author Josh Sherman <pickles@joshtronic.com>
* @copyright Copyright 2007-2012, Josh Sherman * @copyright Copyright 2007-2013, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES * @package PICKLES
* @link https://github.com/joshtronic/pickles * @link https://github.com/joshtronic/pickles
@ -7394,8 +7394,9 @@ class Security
* id varchar(32) COLLATE utf8_unicode_ci NOT NULL, * id varchar(32) COLLATE utf8_unicode_ci NOT NULL,
* session text COLLATE utf8_unicode_ci NOT NULL, * session text COLLATE utf8_unicode_ci NOT NULL,
* expires_at datetime NOT NULL, * expires_at datetime NOT NULL,
* PRIMARY KEY (id) * PRIMARY KEY (id),
* ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; * INDEX (expires_at)
* ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
* *
* Note: The reason for not using a model class was to avoid a naming conflict * Note: The reason for not using a model class was to avoid a naming conflict
* between the Session model and the Session class itself. This will eventually * between the Session model and the Session class itself. This will eventually