1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-15 19:14:09 +02:00

Tweaked and tested single shortcodes. Added batch shortcode files fpw_shortcodes and search_shortcodes. {SEARCH} shortcode template was updated to v2 standards.

This commit is contained in:
Cameron
2021-01-12 14:46:10 -08:00
parent 182164a4a0
commit 42fbd379d4
43 changed files with 539 additions and 418 deletions

View File

@@ -353,7 +353,7 @@
'user_extended_struct_default' => 'F',
'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0',
'user_extended_struct_required' => '0',
'user_extended_struct_required' => '1',
'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '2',
@@ -774,7 +774,7 @@
'user_extended_struct_default' => 'F',
'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0',
'user_extended_struct_required' => '0',
'user_extended_struct_required' => '1',
'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '2',
@@ -791,7 +791,7 @@
'user_extended_struct_default' => '',
'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0',
'user_extended_struct_required' => '0',
'user_extended_struct_required' => '1',
'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '5',
@@ -808,7 +808,7 @@
'user_extended_struct_default' => '',
'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0',
'user_extended_struct_required' => '0',
'user_extended_struct_required' => '1',
'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '9',
@@ -939,7 +939,7 @@
'user_extended_struct_default' => 'F',
'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0',
'user_extended_struct_required' => '0',
'user_extended_struct_required' => '1',
'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '2',
@@ -956,7 +956,7 @@
'user_extended_struct_default' => '',
'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0',
'user_extended_struct_required' => '0',
'user_extended_struct_required' => '1',
'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '5',
@@ -973,7 +973,7 @@
'user_extended_struct_default' => '',
'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0',
'user_extended_struct_required' => '0',
'user_extended_struct_required' => '1',
'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '9',

View File

@@ -164,7 +164,7 @@ class e_formTest extends \Codeception\Test\Unit
e107::includeLan(e_PLUGIN.'forum/languages/English/English_front.php');
include_once(e_CORE."templates/admin_icons_template.php");
include_once(e_PLUGIN.'forum/forum_class.php');
include_once(e_PLUGIN.'forum/templates/forum_icons_template.php');
require_once(e_PLUGIN.'forum/templates/forum_icons_template.php');
$legacyDir = APP_PATH."/e107_files/downloadimages/";
$legacyFile = APP_PATH."/e107_files/downloadimages/butterfly.jpg";

View File

@@ -541,6 +541,8 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
$this->fail($e->getMessage());
}
$sc->__construct();
$exclude = array('sc_signup_coppa_text'); // uses random email obfiscation.
$this->processShortcodeMethods($sc, $exclude);
@@ -858,7 +860,20 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
public function testFpwShortcodes() // todo move fpw shortcodes out of fpw.php to its own file.
{
require_once(e_CORE."shortcodes/batch/fpw_shortcodes.php");
try
{
$sc = $this->make('fpw_shortcodes');
}
catch (Exception $e)
{
$this->fail($e->getMessage());
}
$sc->__construct();
$this->processShortcodeMethods($sc);
}
@@ -1417,6 +1432,57 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
}
/**
* Execute all single shortcodes to check for PHP errors.
*/
public function testSingleShortcodes()
{
$list = scandir(e_CORE."shortcodes/single");
$tp = e107::getParser();
$parms = array(
'email' => 'myemail@somewhere.com-link',
'emailto' => '2',
'email_item' => 'Some Message^plugin:forum.45',
'glyph' => 'fa-anchor',
'url' => 'news/view/item|news_id=1&news_sef=sef-string&category_id=1&category_sef=category-sef&options[full]=1',
'user_extended' => 'name.text.1',
'lan' => 'LAN_EDIT',
'search' => 'all'
);
foreach($list as $sc)
{
$ext = pathinfo($sc);
$name = $ext['filename'];
if($ext['extension'] !== 'sc' && $ext['extension'] !== 'php')
{
continue;
}
$shortcode = '{';
$shortcode .= strtoupper($name);
$shortcode .= isset($parms[$name]) ? '='.$parms[$name] : '';
$shortcode .= '}';
// echo "\n".$shortcode."\n";
$result = $tp->parseTemplate($shortcode,true);
if($name === 'search')
{
echo $result."\n\n";
}
if(isset($parms[$name]) && $name !== 'user_extended')
{
$this->assertNotEmpty($result, $shortcode." returned nothing!");
}
}
}