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

Rollback changes to JS on Fileinspector. Should fix issue #1454

Browse Source
This commit is contained in:
Cameron
2016-04-16 15:56:02 -07:00
parent 4aba2f6149
commit 308f5c9810
2 changed files with 101 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
e107_admin/fileinspector.php
View File

@@ -191,7 +191,7 @@ class file_inspector {
$this->setOptions($_GET); $this->setOptions($_GET);
} }
$lang_short = array();
foreach($langs as $k=>$val) foreach($langs as $k=>$val)
{ {
if($val == "English") // Core release language, so ignore it. if($val == "English") // Core release language, so ignore it.
@@ -853,7 +853,8 @@ class file_inspector {
$parent_expand = TRUE; $parent_expand = TRUE;
} }
if (!empty($this->opt('regex'))) $regexOpt = $this->opt('regex');
if (!empty($regexOpt))
{ {
$file_content = file($dir.'/'.$readdir); $file_content = file($dir.'/'.$readdir);
if ($this -> files[$dir_id][$aid]['lines'] = preg_grep("#".$_POST['regex']."#".$_POST['mod'], $file_content)) if ($this -> files[$dir_id][$aid]['lines'] = preg_grep("#".$_POST['regex']."#".$_POST['mod'], $file_content))
@@ -1398,7 +1399,7 @@ class file_inspector {
echo "<div class='{$disp}' style='display:block;position:absolute;top:20px;width:100%;'> echo "<div style='display:block;position:absolute;top:20px;width:100%;'>
<div style='width:700px;position:relative;margin-left:auto;margin-right:auto;text-align:center'>"; <div style='width:700px;position:relative;margin-left:auto;margin-right:auto;text-align:center'>";
$active = "active"; $active = "active";
@@ -1428,7 +1429,7 @@ class file_inspector {
<img src='".THEME."images/bar.jpg' style='width:".$inc."%;height:20px;vertical-align:top' /> <img src='".THEME."images/bar.jpg' style='width:".$inc."%;height:20px;vertical-align:top' />
</div>"; </div>";
*/ */
/*
echo "<div style='width:100%;background-color:#EEEEEE'>".$diz."</div>"; echo "<div style='width:100%;background-color:#EEEEEE'>".$diz."</div>";
@@ -1440,7 +1441,7 @@ class file_inspector {
echo "</div> echo "</div>
</div>"; </div>";
*/
} }
@@ -1585,7 +1586,7 @@ require_once(e_ADMIN.'footer.php');
function headerjs() function headerjs()
{ {
$c = e_IMAGE_ABS . 'fileinspector/contract.png'; /*$c = e_IMAGE_ABS . 'fileinspector/contract.png';
$e = e_IMAGE_ABS . 'fileinspector/expand.png'; $e = e_IMAGE_ABS . 'fileinspector/expand.png';
$text = '<script type="text/javascript"> $text = '<script type="text/javascript">
@@ -1602,7 +1603,88 @@ function ec(element) {
function sh(element) { function sh(element) {
$("#"+element).stop().animate({"height": "toggle"}, { duration: 500 }); $("#"+element).stop().animate({"height": "toggle"}, { duration: 500 });
} }
</script>';
</script>';*/
/*
* // Start of rework
e107::js('footer-inline', "
c = new Image();
c = '".SITEURLBASE.e_IMAGE_ABS."fileinspector/contract.png';
e = '".SITEURLBASE.e_IMAGE_ABS."fileinspector/expand.png';
function ec(ecid) {
icon = $('#e_' + ecid).src;
if (icon == e) {
$('#e_' + ecid).src = c;
} else {
$('#e_' + ecid).src = e;
}
div = $('#d_' + ecid).style;
if (div.display == 'none')
{
div.display = '';
}
else
{
div.display = 'none';
}
}
var hideid = 'initial';
function sh(showid)
{
if (hideid != showid)
{
show = $('#'+showid).style;
hide = $('#'+hideid).style;
show.display = '';
hide.display = 'none';
hideid = showid;
}
}
");*/
global $e107;
$text = "<script type='text/javascript'>
<!--
c = new Image(); c = '".SITEURLBASE.e_IMAGE_ABS."fileinspector/contract.png';
e = '".SITEURLBASE.e_IMAGE_ABS."fileinspector/expand.png';
function ec(ecid) {
icon = document.getElementById('e_' + ecid).src;
if (icon == e) {
document.getElementById('e_' + ecid).src = c;
} else {
document.getElementById('e_' + ecid).src = e;
}
div = document.getElementById('d_' + ecid).style;
if (div.display == 'none') {
div.display = '';
} else {
div.display = 'none';
}
}
var hideid = 'initial';
function sh(showid) {
if (hideid != showid) {
show = document.getElementById(showid).style;
hide = document.getElementById(hideid).style;
show.display = '';
hide.display = 'none';
hideid = showid;
}
}
//-->
</script>";
$text .= " $text .= "
<style type='text/css'> <style type='text/css'>

2
e107_plugins/pm/pm_class.php
View File

@@ -232,7 +232,7 @@ class private_message
{ {
$toclass .= $u['user_name'].', '; $toclass .= $u['user_name'].', ';
} }
if(check_class($this->pmPrefs['notify_class'], $u['user_class'])) if(check_class($this->pmPrefs['notify_class'], null, $u['user_id']))
{ {
$vars['to_info'] = $u; $vars['to_info'] = $u;
$this->pm_send_notify($u['user_id'], $vars, $pmid, count($a_list)); $this->pm_send_notify($u['user_id'], $vars, $pmid, count($a_list));