mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Valid login event added. Session conflict fix. Session test added. Featurebox tree() fix.

Browse Source
This commit is contained in:
Cameron
2021-01-14 10:31:51 -08:00
parent e51dfa1fc8
commit 7279e0273e
4 changed files with 88 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_handlers/login.php
View File

@@ -224,6 +224,8 @@ class userlogin
$userpass = ''; // Finished with any plaintext password - can get rid of it $userpass = ''; // Finished with any plaintext password - can get rid of it
$ret = $e_event->trigger("preuserlogin", $username); $ret = $e_event->trigger("preuserlogin", $username);
if ($ret != '') if ($ret != '')
{ {
@@ -247,8 +249,14 @@ class userlogin
} }
// User login definitely accepted here // User login definitely accepted here
if($ret = $e_event->trigger("user_validlogin", $user_id))
{
return false;
}
$cookieval = $this->userMethods->makeUserCookie($this->userData,$autologin); $cookieval = $this->userMethods->makeUserCookie($this->userData,$autologin);
@@ -649,7 +657,7 @@ class userlogin
$time = time(); $time = time();
$description = e107::getParser()->lanVars(LAN_LOGIN_18,$failLimit); $description = e107::getParser()->lanVars(LAN_LOGIN_18,$failLimit);
e107::getIPHandler()->add_ban(4, $description, $this->userIP, 1); e107::getIPHandler()->add_ban(4, $description, $this->userIP, 1);
e107::getDb()->insert("generic", "0, 'auto_banned', '".$time."', 0, '{$this->userIP}', '{$extra_text}', '".LAN_LOGIN_20.": ".e107::getParser()->toDB($username).", ".LAN_LOGIN_17.": ".md5($ouserpass)."' "); e107::getDb()->insert("generic", "0, 'auto_banned', '".$time."', 0, '{$this->userIP}', '{$extra_text}', '".LAN_LOGIN_20.": ".e107::getParser()->toDB($username).", ".LAN_LOGIN_17);
e107::getEvent()->trigger('user_ban_failed_login', array('time'=>$time, 'ip'=>$this->userIP, 'other'=>$extra_text)); e107::getEvent()->trigger('user_ban_failed_login', array('time'=>$time, 'ip'=>$this->userIP, 'other'=>$extra_text));
} }
} }

8
e107_handlers/session_handler.php
View File

@@ -118,7 +118,7 @@ class e_session
protected $_namespace; protected $_namespace;
protected $_name; protected $_name;
protected $_sessionStarted = false; // Fixes lost $_SESSION value problem. protected static $_sessionStarted = false; // Fixes lost $_SESSION value problem.
/** /**
* Validation options * Validation options
@@ -477,7 +477,7 @@ class e_session
public function start($sessionName = null) public function start($sessionName = null)
{ {
if (isset($_SESSION) && ($this->_sessionStarted == true)) if (isset($_SESSION) && (self::$_sessionStarted === true))
{ {
return $this; return $this;
} }
@@ -544,7 +544,7 @@ class e_session
session_start(); session_start();
$this->_sessionStarted = true; self::$_sessionStarted = true;
return $this; return $this;
} }
@@ -591,7 +591,7 @@ class e_session
if (!empty($name) && preg_match('#^[0-9a-z_]+$#i', $name)) if (!empty($name) && preg_match('#^[0-9a-z_]+$#i', $name))
{ {
$this->_name = $name; $this->_name = $name;
return session_name($name); // return session_name($name);
} }
return false; return false;
} }

2
e107_plugins/featurebox/includes/category.php
View File

@@ -156,7 +156,7 @@ class plugin_featurebox_category extends e_model
'random' => $this->getParam('random', $this->get('fb_category_random')), 'random' => $this->getParam('random', $this->get('fb_category_random')),
'ids' => $this->getParam('ids', '') 'ids' => $this->getParam('ids', '')
); );
$this->_tree->load($this->getId(), $options, $force); $this->_tree->load($this->getId(), $force, $options);
} }
return $this->_tree; return $this->_tree;

137
e107_tests/tests/unit/e107Test.php
View File

@@ -319,13 +319,33 @@ class e107Test extends \Codeception\Test\Unit
} }
/* /**
public function testGetSession() * Test sessions and namespaced sessions.
{ * Make sure data is kept separate.
$res = null; */
$this->assertTrue($res); public function testGetSession()
} {
$e107 = $this->e107;
// Simple session set/get
$sess = $e107::getSession();
$input = 'test-key-result';
$sess->set('test-key', $input);
$this->assertSame($input, $sess->get('test-key'));
// Create Session 2 with namespace. Make sure Session 1 key is not present.
$sess2 = $e107::getSession('other');
$this->assertEmpty($sess2->get('test-key'));
// Make sure Session 2 key is set and not present in Session 1.
$sess2->set('other-key', true);
$this->assertEmpty($sess->get('other-key'));
$this->assertTrue($sess2->get('other-key'));
}
/*
public function testGetRedirect() public function testGetRedirect()
{ {
$res = null; $res = null;
@@ -709,7 +729,8 @@ class e107Test extends \Codeception\Test\Unit
*/ */
public function testGetCoreTemplate() public function testGetCoreTemplate()
{ {
$templates = scandir(e_CORE."templates");
$templates = scandir(e_CORE . "templates");
$e107 = $this->e107; $e107 = $this->e107;
$exclude = array( $exclude = array(
@@ -722,7 +743,7 @@ class e107Test extends \Codeception\Test\Unit
foreach($templates as $file) foreach($templates as $file)
{ {
if(strpos($file,'_template.php') === false || in_array($file, $exclude)) if(strpos($file, '_template.php') === false || in_array($file, $exclude))
{ {
continue; continue;
} }
@@ -738,8 +759,8 @@ class e107Test extends \Codeception\Test\Unit
$result = $e107::getCoreTemplate($path); $result = $e107::getCoreTemplate($path);
$this->assertIsArray($result, $path." template was not an array"); $this->assertIsArray($result, $path . " template was not an array");
$this->assertNotEmpty($result, $path." template was empty"); $this->assertNotEmpty($result, $path . " template was empty");
} }
@@ -890,8 +911,9 @@ class e107Test extends \Codeception\Test\Unit
*/ */
private function generateRows($var, $plugin ) private function generateRows($var, $plugin)
{ {
preg_match_all('#\{([a-z_]*)\}#', $var['sef'], $matches); preg_match_all('#\{([a-z_]*)\}#', $var['sef'], $matches);
@@ -918,6 +940,7 @@ class e107Test extends \Codeception\Test\Unit
} }
} }
/*else /*else
{ {
echo "\n".$plugin.' had no matches for: '.varset($var['sef'])."\n"; echo "\n".$plugin.' had no matches for: '.varset($var['sef'])."\n";
@@ -929,17 +952,18 @@ class e107Test extends \Codeception\Test\Unit
private function generateExpected($string, $rows) private function generateExpected($string, $rows)
{ {
$search = array('&');; $search = array('&');;
$replace = array('&'); $replace = array('&');
foreach($rows as $k=>$v) foreach($rows as $k => $v)
{ {
$search[] = '{'.$k.'}'; $search[] = '{' . $k . '}';
$replace[] = $v; $replace[] = $v;
} }
return SITEURL.str_replace($search, $replace, $string); return SITEURL . str_replace($search, $replace, $string);
} }
@@ -962,9 +986,9 @@ class e107Test extends \Codeception\Test\Unit
$tests = array(); $tests = array();
$all = e107::getAddonConfig('e_url'); $all = e107::getAddonConfig('e_url');
foreach($all as $plugin=>$var) foreach($all as $plugin => $var)
{ {
foreach($var as $key=>$value) foreach($var as $key => $value)
{ {
$rows = $this->generateRows($value, $plugin); $rows = $this->generateRows($value, $plugin);
$tests[] = array( $tests[] = array(
@@ -991,7 +1015,7 @@ class e107Test extends \Codeception\Test\Unit
if(empty($var['_expected_'])) if(empty($var['_expected_']))
{ {
echo $result."\n"; echo $result . "\n";
continue; continue;
} }
$this->assertEquals($var['_expected_'], $result); $this->assertEquals($var['_expected_'], $result);
@@ -1002,25 +1026,25 @@ class e107Test extends \Codeception\Test\Unit
} }
/** /**
* /* * /*
* e107::getUrl()->create('page/book/index', $row,'allow=chapter_id,chapter_sef,book_sef') ; * e107::getUrl()->create('page/book/index', $row,'allow=chapter_id,chapter_sef,book_sef') ;
e107::getUrl()->create('user/profile/view', $this->news_item) * e107::getUrl()->create('user/profile/view', $this->news_item)
e107::getUrl()->create('user/profile/view', array('name' => $this->var['user_name'], 'id' => $this->var['user_id'])); * e107::getUrl()->create('user/profile/view', array('name' => $this->var['user_name'], 'id' => $this->var['user_id']));
e107::getUrl()->create('page/chapter/index', $row,'allow=chapter_id,chapter_sef,book_sef') ; * e107::getUrl()->create('page/chapter/index', $row,'allow=chapter_id,chapter_sef,book_sef') ;
e107::getUrl()->create('user/myprofile/edit'); * e107::getUrl()->create('user/myprofile/edit');
e107::getUrl()->create('gallery/index/list', $this->var); * e107::getUrl()->create('gallery/index/list', $this->var);
e107::getUrl()->create('news/view/item', $row, array('full' => 1)); * e107::getUrl()->create('news/view/item', $row, array('full' => 1));
e107::getUrl()->create('news/list/all'), * e107::getUrl()->create('news/list/all'),
e107::getUrl()->create('page/view/index',$row), * e107::getUrl()->create('page/view/index',$row),
e107::getUrl()->create('page/chapter/index', $sef), * e107::getUrl()->create('page/chapter/index', $sef),
($sef = $row; * ($sef = $row;
$sef['chapter_sef'] = $this->getSef($row['chapter_id']); * $sef['chapter_sef'] = $this->getSef($row['chapter_id']);
$sef['book_sef'] = $this->getSef($row['chapter_parent']);) * $sef['book_sef'] = $this->getSef($row['chapter_parent']);)
*
e107::getUrl()->create('news/list/tag', array('tag' => $word)); * e107::getUrl()->create('news/list/tag', array('tag' => $word));
$LINKTOFORUM = e107::getUrl()->create('forum/forum/view', array('id' => $row['thread_forum_id'])); //$e107->url->getUrl('forum', 'forum', "func=view&id={$row['thread_forum_id']}"); * $LINKTOFORUM = e107::getUrl()->create('forum/forum/view', array('id' => $row['thread_forum_id'])); //$e107->url->getUrl('forum', 'forum', "func=view&id={$row['thread_forum_id']}");
e107::getUrl()->create('search'); * e107::getUrl()->create('search');
*/ */
public function testUrlLegacy() public function testUrlLegacy()
{ {
@@ -1043,25 +1067,25 @@ e107::getUrl()->create('search');
0 => array( 0 => array(
'route' => 'news/view/item', 'route' => 'news/view/item',
'row' => array('news_id' => 1, 'news_sef'=>'my-news-item', 'category_sef'=>'my-category'), 'row' => array('news_id' => 1, 'news_sef' => 'my-news-item', 'category_sef' => 'my-category'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/news/my-category/my-news-item' '_expected_' => 'https://localhost/e107/news/my-category/my-news-item'
), ),
1 => array( 1 => array(
'route' => 'news/view/item', 'route' => 'news/view/item',
'row' => array('id' => 1, 'name'=>'my-news-item', 'category'=>'my-category'), 'row' => array('id' => 1, 'name' => 'my-news-item', 'category' => 'my-category'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/news/my-category/my-news-item' '_expected_' => 'https://localhost/e107/news/my-category/my-news-item'
), ),
2 => array( 2 => array(
'route' => 'news/list/short', 'route' => 'news/list/short',
'row' => array('id' => 1, 'name'=>'my-news-item', 'category'=>'my-category'), 'row' => array('id' => 1, 'name' => 'my-news-item', 'category' => 'my-category'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/news/short/my-news-item' '_expected_' => 'https://localhost/e107/news/short/my-news-item'
), ),
3 => array( 3 => array(
'route' => 'news/list/tag', 'route' => 'news/list/tag',
'row' => array('tag'=>'myword'), 'row' => array('tag' => 'myword'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/news/tag/myword' '_expected_' => 'https://localhost/e107/news/tag/myword'
), ),
@@ -1073,34 +1097,30 @@ e107::getUrl()->create('search');
), ),
5 => array( 5 => array(
'route' => 'user/profile/view', 'route' => 'user/profile/view',
'row' => array('user_id' => 3, 'user_name'=>'john'), 'row' => array('user_id' => 3, 'user_name' => 'john'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/user/john' '_expected_' => 'https://localhost/e107/user/john'
), ),
6 => array( 6 => array(
'route' => 'page/book/index', 'route' => 'page/book/index',
'row' => array('chapter_id'=>2,'chapter_sef'=>'my-book'), 'row' => array('chapter_id' => 2, 'chapter_sef' => 'my-book'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/page/my-book' '_expected_' => 'https://localhost/e107/page/my-book'
), ),
7 => array( 7 => array(
'route' => 'page/chapter/index', 'route' => 'page/chapter/index',
'row' => array('chapter_id'=>2,'chapter_sef'=>'my-chapter','book_sef'=>'my-book'), 'row' => array('chapter_id' => 2, 'chapter_sef' => 'my-chapter', 'book_sef' => 'my-book'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/page/my-book/my-chapter' '_expected_' => 'https://localhost/e107/page/my-book/my-chapter'
), ),
8 => array( 8 => array(
'route' => 'page/view', 'route' => 'page/view',
'row' => array('page_id'=>3, 'page_sef'=>'my-page','chapter_id'=>2,'chapter_sef'=>'my-chapter','book_sef'=>'my-book'), 'row' => array('page_id' => 3, 'page_sef' => 'my-page', 'chapter_id' => 2, 'chapter_sef' => 'my-chapter', 'book_sef' => 'my-book'),
'options' => 'full=1', 'options' => 'full=1',
'_expected_' => 'https://localhost/e107/page/my-book/my-chapter/my-page' '_expected_' => 'https://localhost/e107/page/my-book/my-chapter/my-page'
), ),
// todo add more. // todo add more.
); );
@@ -1118,40 +1138,31 @@ e107::getUrl()->create('search');
if(empty($var['_expected_'])) if(empty($var['_expected_']))
{ {
echo $result."\n"; echo $result . "\n";
echo $lresult."\n\n"; echo $lresult . "\n\n";
continue; continue;
} }
$this->assertEquals($result, $lresult, "Legacy Test #".$index." -- e107::getUrl()->create('".$var['route']."') didn't match e107::url('".$var['route']."')" ); $this->assertEquals($result, $lresult, "Legacy Test #" . $index . " -- e107::getUrl()->create('" . $var['route'] . "') didn't match e107::url('" . $var['route'] . "')");
$this->assertEquals($var['_expected_'], $result, 'Legacy URL index #'.$index.' failed'); $this->assertEquals($var['_expected_'], $result, 'Legacy URL index #' . $index . ' failed');
} }
$this->setUrlConfig($oldConfig); // return config to previous state. $this->setUrlConfig($oldConfig); // return config to previous state.
} }
/** /**
* Save the url_config preference * Save the url_config preference
* @param array $newConfig * @param array $newConfig
*/ */
private function setUrlConfig($newConfig=array()) private function setUrlConfig($newConfig = array())
{ {
if(empty($newConfig)) if(empty($newConfig))
{ {
return null; return null;