mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Minor tweaks and extended File zip test.

Browse Source
This commit is contained in:
camer0n
2024-05-10 11:42:52 -07:00
parent bdbda018d2
commit 6fd5c5dc10
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_tests/tests/unit/e_fileTest.php
View File

@@ -303,13 +303,19 @@ class e_fileTest extends \Codeception\Test\Unit
$contents = self::readZipFile($destinationPath); $contents = self::readZipFile($destinationPath);
self::assertSame($expected, $contents); self::assertSame($expected, $contents);
// Test directory path.
$destinationPath = e_TEMP."testZip2.zip";
$data = array();
$data[] = e_TEMP;
$result = $this->fl->zip($data , $destinationPath, ['remove_path'=>e_IMAGE]);
$contents = self::readZipFile($destinationPath);
self::assertNotEmpty($contents);
} }
/* /*
public function testZip()
{
}
public function testSetDefaults() public function testSetDefaults()
{ {

20
e107_themes/bootstrap5/theme.php
View File

@@ -57,10 +57,10 @@ if(!defined('e107_INIT'))
} }
function tablestyle($caption, $text, $mode='', $options = array()) function tablestyle($caption, $text, $mode='', $data = array())
{ {
$style = varset($options['setStyle'], 'default'); $style = varset($data['setStyle'], 'default');
// Override style based on mode. // Override style based on mode.
switch($mode) switch($mode)
@@ -82,15 +82,15 @@ if(!defined('e107_INIT'))
break; break;
} }
echo "\n<!-- tablestyle initial: style=" . $style . " mode=" . $mode . " UniqueId=" . varset($options['uniqueId']) . " -->\n\n"; echo "\n<!-- tablestyle initial: style=" . $style . " mode=" . $mode . " UniqueId=" . varset($data['uniqueId']) . " -->\n\n";
if($style === 'listgroup' && empty($options['list'])) if($style === 'listgroup' && empty($data['list']))
{ {
$style = 'cardmenu'; $style = 'cardmenu';
} }
if($style === 'cardmenu' && !empty($options['list'])) if($style === 'cardmenu' && !empty($data['list']))
{ {
$style = 'listgroup'; $style = 'listgroup';
} }
@@ -106,7 +106,7 @@ if(!defined('e107_INIT'))
if(deftrue('e_DEBUG')) if(deftrue('e_DEBUG'))
{ {
echo "\n<!-- \n"; echo "\n<!-- \n";
echo json_encode($options, JSON_PRETTY_PRINT); echo json_encode($data, JSON_PRETTY_PRINT);
echo "\n-->\n\n"; echo "\n-->\n\n";
} }
@@ -167,10 +167,10 @@ if(!defined('e107_INIT'))
} }
echo $text; echo $text;
if(!empty($options['footer'])) // XXX @see news-months menu. if(!empty($data['footer'])) // XXX @see news-months menu.
{ {
echo '<div class="card-footer"> echo '<div class="card-footer">
'.$options['footer'].' '.$data['footer'].'
</div>'; </div>';
} }
@@ -190,10 +190,10 @@ if(!defined('e107_INIT'))
echo $text; echo $text;
if(!empty($options['footer'])) // XXX @see news-months menu. if(!empty($data['footer'])) // XXX @see news-months menu.
{ {
echo '<div class="card-footer"> echo '<div class="card-footer">
'.$options['footer'].' '.$data['footer'].'
</div>'; </div>';
} }