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

Bugtracker #4437 - image admin setting now says what it means, and does what it says. Plus admin logging on images admin, a few new features on img bbcode

Browse Source
This commit is contained in:
e107steved
2008-12-05 22:01:25 +00:00
parent 134bf3a7b5
commit 87d221ea5d
4 changed files with 202 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
e107_files/bbcode/img.bb
View File

@@ -1,24 +1,41 @@
global $pref;
// General purpose image bbcode. As well as the obvious insertion of a picture:
// a) if filname begins with 'th_' or 'thumb_', creates link to main image opening in new window
// b) If filename contains '*', treats it as a wildcard, and displays a random image from all matching file names found
//
// Can use simple classes for float - e.g.:
// .floatleft {clear: right; float: left; margin: 0px 5px 5px 0px; padding:2px; border: 0px;}
// .floatright {clear: left; float: right; margin: 0px 0px 0px 5px; padding:2px; border: 0px;}
// Currently defaults class to 'floatnone' - overridden by bbcode
if (trim($code_text) == "") return ""; // Do nothing on empty file
if (preg_match("#\.php\?.*#",$code_text)){return "";}
global $IMAGES_DIRECTORY, $FILES_DIRECTORY, $e107;
$addlink = FALSE;
global $pref;
$search = array('"', '{E_IMAGE}', '{E_FILE}', '{e_IMAGE}', '{e_FILE}');
$replace = array(''', $e107->base_path.$IMAGES_DIRECTORY, $e107->base_path.$FILES_DIRECTORY, $e107->base_path.$IMAGES_DIRECTORY, $e107->base_path.$FILES_DIRECTORY);
$code_text = str_replace($search, $replace, $code_text);
$replace = array(''', e_IMAGE_ABS, e_FILE_ABS, e_IMAGE_ABS, e_FILE_ABS);
$replaceInt = array(''', e_IMAGE, e_FILE, e_IMAGE, e_FILE);
$intName = str_replace($search, $replaceInt, $code_text); // Server-relative file names
unset($imgParms);
$imgParms['class']="bbcode";
//$imgParms['class']="bbcode";
$imgParms['class']='floatnone'; // This will be overridden if a new class is specified
$imgParms['alt']='';
$code_text = str_replace($search, $replace, $code_text);
$code_text = $tp -> toAttribute($code_text);
$img_file = pathinfo($code_text); // 'External' file name. N.B. - might still contain a constant such as e_IMAGE
if($parm)
{
$parm = preg_replace('#onerror *=#i','',$parm);
$parm = str_replace("amp;", "&", $parm);
parse_str($parm,$tmp);
foreach($tmp as $p => $v)
{
$imgParms[$p]=$v;
}
$parm = preg_replace('#onerror *=#i','',$parm);
$parm = str_replace("amp;", "&", $parm);
parse_str($parm,$tmp);
foreach($tmp as $p => $v)
{
$imgParms[$p]=$v;
}
}
$parmStr="";
foreach($imgParms as $k => $v)
@@ -26,48 +43,76 @@ foreach($imgParms as $k => $v)
$parmStr .= $tp -> toAttribute($k)."='".$tp -> toAttribute($v)."' ";
}
// Only look for file if not a url - suspected bug in PHP 5.2.5 on XP
if((strpos($code_text,'../') === FALSE) && (strpos($code_text,'://') === FALSE) && file_exists(e_IMAGE."newspost_images/".$code_text))
// Select a random file if required
if (strpos($img_file['basename'],'*') !== FALSE)
{
$code_text = e_IMAGE."newspost_images/".$code_text;
$fileList = array();
$intFile = pathinfo($intName); // N.B. - might still contain a constant such as e_IMAGE
$matchString = '#'.str_replace('*','.*?',$intFile['basename']).'#';
$dirName = $tp->replaceConstants($intFile['dirname'].'/'); // we want server-relative directory
if (($h = opendir($dirName)) !== FALSE)
{
while (($f = readdir($h)) !== FALSE)
{
if (preg_match($matchString,$f))
{
$fileList[] = $f; // Just need to note file names
}
}
closedir($h);
}
else
{
echo "Error opening directory: {$dirName}<br />";
return '';
}
if (count($fileList))
{
$img_file['basename'] = $fileList[mt_rand(0,count($fileList)-1)]; // Just change name of displayed file - no change on directory
$code_text = $img_file['dirname']."/".$img_file['basename'];
}
else
{
echo 'No file: '.$code_text;
return '';
}
}
if (!$postID || $postID == 'admin')
// Check for whether we can display image down here - so we can show image name if appropriate
if (!varsettrue($pref['image_post']) || !check_class($pref['image_post_class']))
{
return "<img src='".$code_text."' {$parmStr} />";
switch ($pref['image_post_disabled_method'])
{
case '1' :
return CORE_LAN17;
case '2' :
return '';
}
return CORE_LAN18.$code_text;
}
// Check for link to main image if required
if (strpos($img_file['basename'],'th_') === 0)
{
$addlink = TRUE;
$main_name = $img_file['dirname']."/".substr($img_file['basename'],3); // delete the 'th' prefix from file name
}
elseif (strpos($img_file['basename'],'thumb_') === 0)
{
$addlink = TRUE;
$main_name = $img_file['dirname']."/".substr($img_file['basename'],6); // delete the 'thumb' prefix from file name
}
if ($addlink)
{
return "<a href='".$main_name."' rel='external'><img src='".$code_text."' {$parmStr} /></a>";
}
else
{
if ($pref['image_post'])
{
if(strstr($postID,'class:'))
{
$uc = substr($postID,6);
$can_show = check_class($pref['image_post_class'],$uc);
}
else
{
$uc = $postID;
$can_show = check_class($pref['image_post_class'],'',$uc);
}
if ($can_show)
{
return "<img src='".$code_text."' {$parmStr} />";
}
else
{
return ($pref['image_post_disabled_method'] ? CORE_LAN17 : CORE_LAN18.$code_text);
}
}
else
{
if ($pref['image_post_disabled_method'])
{
return CORE_LAN17;
}
else
{
return CORE_LAN18.$code_text;
}
}
return "<img src='".$code_text."' {$parmStr} />";
}