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

Fix for lancheck failing due to ../ in the URL on plugin/theme folders.

Browse Source
This commit is contained in:
Cameron
2020-12-30 10:11:04 -08:00
parent 710394273c
commit b5ff8c76f7
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
e107_admin/lancheck.php
View File

@ -401,7 +401,7 @@ class lancheck
$dir2 = dirname($fullpath_trans)."/"; $dir2 = dirname($fullpath_trans)."/";
} }
return $this->edit_lanfiles($dir1,$dir2,$f1,$f2,$lan); return $this->edit_lanfiles($dir1,$dir2,$f1,$f2,$lan, varset($_GET['type']));
// return true; // return true;
} }
@ -1200,7 +1200,8 @@ class lancheck
} }
else else
{ {
$caption = LAN_SAVED." <b>".$lan."/".$writeit."</b>"; // $caption = LAN_SAVED." <b>".$lan."/".$writeit."</b>";
$caption = LAN_SAVED." <b>".$writeit."</b>";
$status = e107::getMessage()->addSuccess($caption)->render(); $status = e107::getMessage()->addSuccess($caption)->render();
} }
fclose($fp); fclose($fp);
@ -1703,7 +1704,7 @@ class lancheck
$parms = $_GET; $parms = $_GET;
$parms['sub'] = 'edit'; $parms['sub'] = 'edit';
$parms['file'] = $comp_dir."/languages/".$lnk; $parms['file'] = $comp_name."/languages/".$lnk;
$parms['lan'] = $this->transLanguage; $parms['lan'] = $this->transLanguage;
$parms['iframe'] = 1; $parms['iframe'] = 1;
$parms['type'] = $mode; $parms['type'] = $mode;
@ -1748,13 +1749,25 @@ class lancheck
} }
function edit_lanfiles($dir1,$dir2,$f1,$f2,$lan) function edit_lanfiles($dir1, $dir2, $f1, $f2, $lan, $type=null)
{ {
if($lan == '') if($lan == '')
{ {
echo "Language selection was lost. "; echo "Language selection was lost. ";
return null; return null;
} }
if($type === 'P')
{
$dir1 = e_PLUGIN.$dir1;
$dir2 = e_PLUGIN.$dir2;
}
if($type === 'T')
{
$dir1 = e_THEME.$dir1;
$dir2 = e_THEME.$dir2;
}
// $ns = e107::getRender(); // $ns = e107::getRender();
$sql = e107::getDb(); $sql = e107::getDb();
@ -1788,6 +1801,12 @@ class lancheck
$writable = is_writable($dir2); $writable = is_writable($dir2);
$trans = $this->get_lan_file_phrases($dir1,$dir2,$f1,$f2); $trans = $this->get_lan_file_phrases($dir1,$dir2,$f1,$f2);
if(empty($trans))
{
//return array('caption'=>"Error", 'text'=>"Unable to open file", 'mode'=>'edit', 'file'=>$capFile);
}
$keys = array_keys($trans); $keys = array_keys($trans);
sort($keys); sort($keys);

1
e107_admin/language.php
View File

@ -180,6 +180,7 @@ if(!empty($_GET['iframe']))
{ {
$this->loadPackInfo(); $this->loadPackInfo();
$pref = e107::getPref(); $pref = e107::getPref();
/** @var lancheck $lck */
$lck = e107::getSingleton('lancheck', e_ADMIN."lancheck.php"); $lck = e107::getSingleton('lancheck', e_ADMIN."lancheck.php");
$lck->errorsOnly($pref['multilanguage_verify_errorsonly']); $lck->errorsOnly($pref['multilanguage_verify_errorsonly']);

2
e107_handlers/shortcode_handler.php
View File

@ -476,7 +476,7 @@ class e_parse_shortcode
} }
else else
{ {
e107::getDebug()->log("Couldn't Find Class '".$className."' OR 'plugin_".$className."'in <b>".$path."</b>"); e107::getDebug()->log("Found file: <b>".$path."</b> but couldn't Find Class <b>".$className."</b> OR <b>plugin_".$className."</b> inside.");
} }
} }
else else