mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Fix for missing theme data and incorrect LAN labels.

Browse Source
This commit is contained in:
Cameron
2016-12-21 08:13:23 -08:00
parent fdfdbe44f4
commit db1aa937aa
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/theme.php
View File

@@ -76,7 +76,8 @@ if(!empty($_GET['action']))
case 'info': case 'info':
$string = base64_decode($_GET['src']); $string = base64_decode($_GET['src']);
parse_str($string,$p); parse_str($string,$p);
echo $themec->renderThemeInfo($p); $themeInfo = e107::getSession()->get('thememanager/online/'.intval($p['id']));
echo $themec->renderThemeInfo($themeInfo);
break; break;

11
e107_handlers/theme_handler.php
View File

@@ -822,10 +822,10 @@ class themeHandler
global $pref; global $pref;
$author = ($theme['email'] ? "<a href='mailto:".$theme['email']."' title='".$theme['email']."'>".$theme['author']."</a>" : $theme['author']); $author = ($theme['email'] ? "<a href='mailto:".$theme['email']."' title='".$theme['email']."'>".$theme['author']."</a>" : $theme['author']);
$website = ($theme['website'] ? "<a href='".$theme['website']."' rel='external'>".$theme['website']."</a>" : ""); $website = ($theme['website'] ? "<a href='".$theme['website']."' rel='external'>".$theme['website']."</a>" : "");
$preview = "<a href='".SITEURL."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>"; // $preview = "<a href='".SITEURL."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>";
$description = vartrue($theme['description'],''); $description = vartrue($theme['description'],'');
$compat = (intval($theme['compatibility']) == 2) ? "<span class='label label-warning'>".number_format($theme['compatibility'], 1, '.','')."</span><span class='text-warning'> ".TPVLAN_78."</span>": vartrue(number_format($theme['compatibility'], 1, '.',''),'1.0'); $compat = (intval($theme['compatibility']) == 2) ? "<span class='label label-warning'>".number_format($theme['compatibility'], 1, '.','')."</span><span class='text-warning'> ".TPVLAN_77."</span>": vartrue(number_format($theme['compatibility'], 1, '.',''),'1.0');
$price = (!empty($theme['price'])) ? "<span class='label label-primary'><i class='icon-shopping-cart icon-white'></i> ".$theme['price']."</span>" : "<span class='label label-success'>".TPVLAN_77."</span>"; $price = (!empty($theme['price'])) ? "<span class='label label-primary'><i class='icon-shopping-cart icon-white'></i> ".$theme['price']."</span>" : "<span class='label label-success'>".TPVLAN_76."</span>";
$text = "<table class='table table-striped'>"; $text = "<table class='table table-striped'>";
@@ -1066,7 +1066,7 @@ class themeHandler
$thumbPath = $theme['thumbnail']; $thumbPath = $theme['thumbnail'];
$previewPath = $theme['preview'][0]; $previewPath = $theme['preview'][0];
} }
elseif(vartrue($theme['preview'][0])) elseif(!empty($theme['preview'][0]))
{ {
$thumbPath = e_THEME.$theme['path'] ."/".$theme['preview'][0]; $thumbPath = e_THEME.$theme['path'] ."/".$theme['preview'][0];
$previewPath = e_THEME.$theme['path'] ."/".$theme['preview'][0]; $previewPath = e_THEME.$theme['path'] ."/".$theme['preview'][0];
@@ -1089,6 +1089,9 @@ class themeHandler
'price' => $theme['price'] 'price' => $theme['price']
); );
e107::getSession()->set('thememanager/online/'.$theme['id'], $theme);
$d = http_build_query($srcData,false,'&'); $d = http_build_query($srcData,false,'&');
$base64 = base64_encode($d); $base64 = base64_encode($d);
// e107::getDebug()->log($theme['name'].': '.strlen($base64)); // e107::getDebug()->log($theme['name'].': '.strlen($base64));