mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

PHP7 Fix.

Browse Source
This commit is contained in:
Cameron
2016-11-28 16:27:17 -08:00
parent 6516f3cff3
commit fd1a026f88
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_admin/language.php
View File

@@ -235,6 +235,11 @@ if(!empty($_GET['iframe']))
$message = ''; $message = '';
if(!empty($_POST['language']))
{
$_POST['language'] = e107::getParser()->filter($_POST['language']);
}
// ----------------- delete tables --------------------------------------------- // ----------------- delete tables ---------------------------------------------
if (isset($_POST['del_existing']) && $_POST['lang_choices'] && getperms('0')) if (isset($_POST['del_existing']) && $_POST['lang_choices'] && getperms('0'))
{ {
@@ -246,7 +251,7 @@ if(!empty($_GET['iframe']))
{ {
// echo $del_table." exists<br />"; // echo $del_table." exists<br />";
$qry = "DROP TABLE ".MPREFIX."lan_".$lang."_".$del_table; $qry = "DROP TABLE ".MPREFIX."lan_".$lang."_".$del_table;
if (mysql_query($qry)) if ($sql->gen($qry))
{ {
$msg = $tp->lanVars(LANG_LAN_100, $_POST['lang_choices'].' '.$del_table); $msg = $tp->lanVars(LANG_LAN_100, $_POST['lang_choices'].' '.$del_table);
$message .= $msg.'[!br!]'; $message .= $msg.'[!br!]';
@@ -304,7 +309,7 @@ if(!empty($_GET['iframe']))
if ($_POST['remove']) if ($_POST['remove'])
{ {
// Remove table. // Remove table.
if (mysql_query("DROP TABLE ".MPREFIX."lan_".$lang."_".$value)) if ($sql->gen("DROP TABLE ".MPREFIX."lan_".$lang."_".$value))
{ {
$message .= $_POST['language'].' '.$value.' '.LAN_DELETED.'[!br!]'; // can be removed? $message .= $_POST['language'].' '.$value.' '.LAN_DELETED.'[!br!]'; // can be removed?
$mes->addSuccess($_POST['language'].' '.$value.' '.LAN_DELETED); $mes->addSuccess($_POST['language'].' '.$value.' '.LAN_DELETED);

12
e107_handlers/theme_handler.php
View File

@@ -26,6 +26,7 @@ class themeHandler
var $fl; var $fl;
var $themeConfigObj = null; var $themeConfigObj = null;
var $noLog = FALSE; var $noLog = FALSE;
private $curTheme = null;
private $approvedAdminThemes = array('bootstrap','bootstrap3'); private $approvedAdminThemes = array('bootstrap','bootstrap3');
@@ -79,6 +80,11 @@ class themeHandler
{ {
$unzippedTheme = $this->themeUpload(); $unzippedTheme = $this->themeUpload();
} }
if(!empty($_POST['curTheme']))
{
$this->curTheme = e107::getParser()->filter($_POST['curTheme']);
}
if(!empty($_POST['setUploadTheme']) && !empty($unzippedTheme)) if(!empty($_POST['setUploadTheme']) && !empty($unzippedTheme))
{ {
@@ -139,7 +145,7 @@ class themeHandler
if(isset($_POST['submit_adminstyle'])) if(isset($_POST['submit_adminstyle']))
{ {
$this->id = $_POST['curTheme']; $this->id = $this->curTheme;
if($this->setAdminStyle()) if($this->setAdminStyle())
{ {
eMessage::getInstance()->add(TPVLAN_43, E_MESSAGE_SUCCESS); eMessage::getInstance()->add(TPVLAN_43, E_MESSAGE_SUCCESS);
@@ -149,7 +155,7 @@ class themeHandler
if(isset($_POST['submit_style'])) if(isset($_POST['submit_style']))
{ {
$this->id = $_POST['curTheme']; $this->id = $this->curTheme;
$this->setLayouts(); // Update the layouts in case they have been manually changed. $this->setLayouts(); // Update the layouts in case they have been manually changed.
$this->SetCustomPages($_POST['custompages']); $this->SetCustomPages($_POST['custompages']);
@@ -161,7 +167,7 @@ class themeHandler
if(!empty($_POST['git_pull'])) if(!empty($_POST['git_pull']))
{ {
$return = e107::getFile()->gitPull($_POST['curTheme'], 'theme'); $return = e107::getFile()->gitPull($this->curTheme, 'theme');
$mes->addSuccess($return); $mes->addSuccess($return);
} }