[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.83,1.84
dhaun at geeklog.net
dhaun at geeklog.net
Thu Mar 27 15:20:02 EST 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv7566/public_html/admin
Modified Files:
story.php
Log Message:
You can now keep the original, unscaled image when uploading images for stories. The smaller, scaled version will then be used as a thumbnail and link to the original image (based on code provided by Alexander Schmacks).
Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** story.php 24 Mar 2003 17:42:17 -0000 1.83
--- story.php 27 Mar 2003 20:20:00 -0000 1.84
***************
*** 536,542 ****
$sizeattributes = '';
}
! $norm = '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">';
! $left = '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">';
! $right = '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">';
$fulltext = $intro . ' ' . $body;
$count = substr_count($fulltext, $norm) + substr_count($fulltext, $left) + substr_count($fulltext, $right);
--- 536,559 ----
$sizeattributes = '';
}
!
! $lLinkPrefix = '';
! $lLinkSuffix = '';
! if ($_CONF['keep_unscaled_image'] == 1) {
! $lFilename_large = substr_replace ($A['ai_filename'], '_original.',
! strrpos ($A['ai_filename'], '.'), 1);
! $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
! . $lFilename_large;
! $lFilename_large_URL = $_CONF['site_url'] . '/images/articles/'
! . $lFilename_large;
! if (file_exists ($lFilename_large_complete)) {
! $lLinkPrefix = '<a href="' . $lFilename_large_URL
! . '" title="' . $LANG24[57] . '">';
! $lLinkSuffix = '</a>';
! }
! }
!
! $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix;
! $left = $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix;
! $right = $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix;
$fulltext = $intro . ' ' . $body;
$count = substr_count($fulltext, $norm) + substr_count($fulltext, $left) + substr_count($fulltext, $right);
***************
*** 577,580 ****
--- 594,614 ----
$sizeattributes = '';
}
+
+ $lLinkPrefix = '';
+ $lLinkSuffix = '';
+ if ($_CONF['keep_unscaled_image'] == 1) {
+ $lFilename_large = substr_replace ($A['ai_filename'], '_original.',
+ strrpos ($A['ai_filename'], '.'), 1);
+ $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
+ . $lFilename_large;
+ $lFilename_large_URL = $_CONF['site_url'] . '/images/articles/'
+ . $lFilename_large;
+ if (file_exists ($lFilename_large_complete)) {
+ $lLinkPrefix = '<a href="' . $lFilename_large_URL
+ . '" title="' . $LANG24[57] . '">';
+ $lLinkSuffix = '</a>';
+ }
+ }
+
$norm = '[' . $LANG24[48] . $i . ']';
$left = '[' . $LANG24[48] . $i . '_' . $LANG24[50] . ']';
***************
*** 588,601 ****
// Only parse if we haven't encountered any error to this point
if (count($errors) == 0) {
! $intro = str_replace($norm, '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $intro);
! $body = str_replace($norm, '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $body);
! $intro = str_replace($left, '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $intro);
! $body = str_replace($left, '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $body);
! $intro = str_replace($right, '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $intro);
! $body = str_replace($right, '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">', $body);
}
}
}
!
return array($errors, $intro, $body);
}
--- 622,635 ----
// Only parse if we haven't encountered any error to this point
if (count($errors) == 0) {
! $intro = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $intro);
! $body = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $body);
! $intro = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $intro);
! $body = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $body);
! $intro = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $intro);
! $body = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'] . '" alt="">' . $lLinkSuffix, $body);
}
}
}
!
return array($errors, $intro, $body);
}
***************
*** 720,728 ****
// Delete any images if needed
for ($i = 1; $i <= count($delete); $i++) {
! $curfile = $_CONF['path_html'] . 'images/articles/' . DB_getItem($_TABLES['article_images'],'ai_filename',"ai_sid = '$sid' AND ai_img_num = " . key($delete));
if (!unlink($curfile)) {
echo COM_errorLog("Unable to delete image $curfile. Please check file permissions");
exit;
}
DB_query("DELETE FROM {$_TABLES['article_images']} WHERE ai_sid = '$sid' AND ai_img_num = " . key($delete));
next($delete);
--- 754,776 ----
// Delete any images if needed
for ($i = 1; $i <= count($delete); $i++) {
! $ai_filename = DB_getItem ($_TABLES['article_images'],'ai_filename', "ai_sid = '$sid' AND ai_img_num = " . key ($delete));
! $curfile = $_CONF['path_html'] . 'images/articles/' . $ai_filename;
if (!unlink($curfile)) {
echo COM_errorLog("Unable to delete image $curfile. Please check file permissions");
exit;
}
+
+ // remove unscaled image, if it exists
+ $lFilename_large = substr_replace ($ai_filename, '_original.',
+ strrpos ($ai_filename, '.'), 1);
+ $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
+ . $lFilename_large;
+ if (file_exists ($lFilename_large_complete)) {
+ if (!unlink ($lFilename_large_complete)) {
+ echo COM_errorLog ('Unable to remove the following image from the article: ' . $lFilename_large_complete);
+ exit;
+ }
+ }
+
DB_query("DELETE FROM {$_TABLES['article_images']} WHERE ai_sid = '$sid' AND ai_img_num = " . key($delete));
next($delete);
***************
*** 751,754 ****
--- 799,807 ----
}
$upload->setAutomaticResize(true);
+ if ($_CONF['keep_unscaled_image'] == 1) {
+ $upload->keepOriginalImage (true);
+ } else {
+ $upload->keepOriginalImage (false);
+ }
}
$upload->setAllowedMimeTypes(array('image/gif','image/jpeg','image/pjpeg','image/x-png','image/png'));
***************
*** 849,852 ****
--- 902,917 ----
echo COM_errorLog('Unable to remove the following image from the article: ' . $filename);
exit;
+ }
+
+ // remove unscaled image, if it exists
+ $lFilename_large = substr_replace ($A['ai_filename'], '_original.',
+ strrpos ($A['ai_filename'], '.'), 1);
+ $lFilename_large_complete = $_CONF['path_html'] . 'images/articles/'
+ . $lFilename_large;
+ if (file_exists ($lFilename_large_complete)) {
+ if (!unlink ($lFilename_large_complete)) {
+ echo COM_errorLog ('Unable to remove the following image from the article: ' . $lFilename_large_complete);
+ exit;
+ }
}
}
More information about the geeklog-cvs
mailing list