Skip to content
Permalink
Browse files

Image Handler Update auf 5.1.6

  • Loading branch information
webchills committed Nov 1, 2019
1 parent b222184 commit 158e1b9f66beaa2cdc9a2994dd3d084657d7407f
@@ -7,7 +7,7 @@
* @copyright Copyright 2003-2019 Zen Cart Development Team
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: image_handler.php 2019-07-13 14:13:51Z webchills $
* @version $Id: image_handler.php 2019-11-01 08:13:51Z webchills $
*/
require 'includes/application_top.php';
@@ -92,11 +92,10 @@
}
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--doctype changed to stop quirks mode -->
<!doctype html>
<html <?php echo HTML_PARAMS; ?>>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
<meta charset="<?php echo CHARSET; ?>">
<title><?php echo TITLE . ' - '. ICON_IMAGE_HANDLER; ?></title>
<link rel="stylesheet" type="text/css" href="includes/stylesheet.css">
<link rel="stylesheet" type="text/css" href="includes/cssjsmenuhover.css" media="all" id="hoverJS">
@@ -120,7 +119,7 @@
h5 {font-size: 100%}
h1 a, h2 a, h3 a, h4 a, h5 a { font-weight: bold; letter-spacing: 0.1em; word-spacing: 0.2em;}
input[type="text"], input[type="submit"], input[type="file"], select {border: 1px solid #CCCCCC; background-color: #FFFFFF;}
input[type="text"], input[type="submit"], input[type="file"], select {border: 1px solid #CCCCCC;}
.managerbox .dataTableRow:hover { background-color: #dcdcdc; }
@@ -135,7 +134,6 @@
#ih-p-info td { padding: 5px; border: 1px solid #444; }
#ih-p-info td:first-child { font-weight: bold; }
#ih-new-button { margin: 0.5em; }
.ih-center { text-align: center; }
.ih-right { text-align: right; }
@@ -159,12 +157,12 @@
.preview-check {border: 1px solid #000000; background:url(images/checkpattern.gif);}
-->
</style>
<script type="text/javascript" src="includes/menu.js"></script>
<script type="text/javascript" src="includes/general.js"></script>
<script src="includes/menu.js"></script>
<script src="includes/general.js"></script>
<link rel="stylesheet" type="text/css" href="includes/javascript/spiffyCal/spiffyCal_v2_1.css">
<script type="text/javascript" src="includes/javascript/spiffyCal/spiffyCal_v2_1.js"></script>
<script src="includes/javascript/spiffyCal/spiffyCal_v2_1.js"></script>
<script type="text/javascript">
<script>
<!--
function init()
{
@@ -205,17 +203,14 @@ function popupWindow(url) {
<?php
if ($ih_page == 'manager') {
// SEARCH DIALOG BOX
echo '<div id="ih-search">' . zen_draw_form('search', FILENAME_CATEGORIES, '', 'get');
// show reset search
if (isset($_GET['search']) && zen_not_null($_GET['search'])) {
echo '<a href="' . zen_href_link(FILENAME_CATEGORIES) . '">' . zen_image_button('button_reset.gif', IMAGE_RESET) . '</a>&nbsp;&nbsp;';
}
//-----
// The category/product listing page changed in zc156, detect the current Zen Cart
// version to determine the page to which the search results are destined.
//
$zen_cart_version = PROJECT_VERSION_MAJOR . '.' . PROJECT_VERSION_MINOR;
$search_target_page = ($zen_cart_version > '1.5.6') ? FILENAME_CATEGORY_PRODUCT_LISTING : FILENAME_CATEGORIES;
echo '<div id="ih-search">' . zen_draw_form('search', $search_target_page, '', 'get');
echo HEADING_TITLE_SEARCH_DETAIL . ' ' . zen_draw_input_field('search');
if (isset($_GET['search']) && zen_not_null($_GET['search'])) {
$keywords = zen_db_input(zen_db_prepare_input($_GET['search']));
echo '<br/ >' . TEXT_INFO_SEARCH_DETAIL_FILTER . $keywords;
}
echo '</form></div>';
}
?>
@@ -310,13 +305,13 @@ function popupWindow(url) {
<td class="ih-center"><?php echo zen_draw_products_pull_down('products_filter', 'size="5"', '', true, $products_filter, true, true); ?></td>
<td id="ih-p-buttons" class="ih-center ih-vtop">
<?php
echo zen_image_submit('button_display.gif', IMAGE_DISPLAY) . '<br />';
echo '<input type="submit" class="btn btn-primary" value="'. IMAGE_DISPLAY .'" />&nbsp;';
$edit_product_link = zen_href_link(FILENAME_PRODUCT, "action=new_product&amp;cPath=$current_category_id&amp;pID=$products_filter&amp;product_type=" . zen_get_products_type($products_filter));
echo '<a href="' . $edit_product_link . '">' . zen_image_button('button_edit_product.gif', IMAGE_EDIT_PRODUCT) . '</a><br />';
echo '<a href="' . $edit_product_link . '" class="btn btn-info">' . IMAGE_EDIT_PRODUCT . '</a>&nbsp;';
$attribute_controller_link = zen_href_link(FILENAME_ATTRIBUTES_CONTROLLER, "products_filter=$products_filter&amp;current_category_id=$current_category_id");
echo '<a href="' . $attribute_controller_link . '">' . zen_image_button('button_edit_attribs.gif', IMAGE_EDIT_ATTRIBUTES) . '</a>'
echo '<a href="' . $attribute_controller_link . '" class="btn btn-warning">' . IMAGE_EDIT_ATTRIBUTES . '</a>'
?>
</td>
<?php
@@ -502,7 +497,7 @@ function popupWindow(url) {
$the_image = zen_image(DIR_WS_CATALOG . $preview_image, addslashes($pInfo->products_name), $width, $height);
$delete_link = '';
if (is_file($image_file_medium_full)) {
$delete_link = '<br /><a href="' . $ih_admin->imageHandlerHrefLink($image_file_medium, $products_filter, 'quick_delete') . '">' . zen_image_button('button_delete.gif', IMAGE_DELETE) . '</a>';
$delete_link = '<br /><a href="' . $ih_admin->imageHandlerHrefLink($image_file_medium, $products_filter, 'quick_delete') . '" class="btn btn-danger">' . IMAGE_DELETE . '</a>';
}
?>
<td class="dataTableContent ih-center ih-vtop"><?php echo $the_image . '<br />' . $text_medium_size . $delete_link; ?></td>
@@ -519,7 +514,7 @@ function popupWindow(url) {
$delete_link = '<br />';
$delete_link .= zen_draw_form("quick_del_$i", FILENAME_IMAGE_HANDLER, zen_get_all_get_params(array('action')) . '&amp;action=quick_delete');
$delete_link .= zen_draw_hidden_field('qdFile', $image_file_large);
$delete_link .= zen_image_submit('button_delete.gif', IMAGE_DELETE);
$delete_link .= '<input type="submit" class="btn btn-danger" value ="' . IMAGE_DELETE . '" />';
$delete_link .= '</form>';
}
?>
@@ -538,10 +533,9 @@ function popupWindow(url) {
} // for each photo loop
$new_link = $ih_admin->imageHandlerHrefLink('', $products_filter, 'layout_new');
$new_button = zen_image_button('button_new_file.gif', IH_IMAGE_NEW_FILE, 'id="ih-new-button"');
?>
<tr class="dataTableRow">
<td colspan="7" class="ih-right"><a href="<?php echo $new_link; ?>"><?php echo $new_button; ?></a></td>
<td colspan="7" class="ih-right"><a href="<?php echo $new_link; ?>" class="btn btn-info"><?php echo IH_IMAGE_NEW_FILE; ?></a></td>
</tr>
</table></td>
<!-- END Photo list table -->
@@ -593,13 +587,12 @@ function popupWindow(url) {
// 3) Current image is an image with a **different** extension as the main, show Delete only
//
$edit_button = '';
$new_button = '';
$delete_link = $ih_admin->imageHandlerHrefLink($selected_image_name, $products_filter, 'layout_delete', $selected_parms);
$delete_button = '<a href="' . $delete_link . '">' . zen_image_button('button_delete.gif', IMAGE_DELETE) . '</a> &nbsp;';
$delete_button = '<a href="' . $delete_link . '" class="btn btn-danger">' . IMAGE_DELETE . '</a> &nbsp;';
if ($products_image_extension == $selected_image_extension) {
$edit_link = $ih_admin->imageHandlerHrefLink($selected_image_name, $products_filter, 'layout_edit', $selected_parms);
$edit_button = '<a href="' . $edit_link . '">' . zen_image_button('button_edit.gif', IH_IMAGE_EDIT) . '</a> &nbsp; ';
$edit_button = '<a href="' . $edit_link . '" class="btn btn-warning">' . IH_IMAGE_EDIT . '</a> &nbsp; ';
}
$contents[] = array(
'align' => 'center',
@@ -619,7 +612,7 @@ function popupWindow(url) {
);
case 'layout_new':
if (!isset($editing)) {
if (empty($editing)) {
$editing = false;
$hidden_vars = zen_draw_hidden_field('saveType', ($no_images) ? 'new_main' : 'new_addl');
$heading[] = array(
@@ -730,10 +723,10 @@ function popupWindow(url) {
} else {
$cancel_button_link = $ih_admin->imageHandlerHrefLink($selected_image_name, $products_filter, 'layout_info');
}
$cancel_button = '<a href="' . $cancel_button_link . '">' . zen_image_button('button_cancel.gif', IMAGE_CANCEL) . '</a>';
$cancel_button = '<a href="' . $cancel_button_link . '" class="btn btn-warning">' . IMAGE_CANCEL . '</a>';
$contents[] = array(
'align' => 'center',
'text' => '<br />' . $cancel_button . '&nbsp;' . zen_image_submit('button_save.gif', IMAGE_SAVE) . $hidden_vars
'text' => '<br />' . $cancel_button . '&nbsp;' . '<input type="submit" class="btn btn-primary" value="' . IMAGE_SAVE . '" />' . $hidden_vars
);
break;
@@ -768,10 +761,10 @@ function popupWindow(url) {
}
$cancel_button_link = $ih_admin->imageHandlerHrefLink($selected_image_name, $products_filter, 'layout_info');
$cancel_button = '<a href="' . $cancel_button_link . '">' . zen_image_button('button_cancel.gif', IMAGE_CANCEL) . '</a>';
$cancel_button = '<a href="' . $cancel_button_link . '" class="btn btn-warning">' . IMAGE_CANCEL . '</a>';
$contents[] = array(
'align' => 'center',
'text' => '<br />' . $cancel_button . '&nbsp;' . zen_image_submit('button_delete.gif', IMAGE_DELETE)
'text' => '<br />' . $cancel_button . '&nbsp;' . '<input type="submit" class="btn btn-danger" value ="' . IMAGE_DELETE . '" />'
);
break;
@@ -6,7 +6,7 @@
* @copyright Copyright 2003-2019 Zen Cart Development Team
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: image_handler_view_config.php 2018-06-15 16:13:51Z webchills $
* @version $Id: image_handler_view_config.php 2019-11-01 08:13:51Z webchills $
*/
require 'includes/application_top.php';
@@ -38,9 +38,9 @@
tr span { font-size: smaller; }
-->
</style>
<script type="text/javascript" src="includes/menu.js"></script>
<script type="text/javascript" src="includes/general.js"></script>
<script type="text/javascript">
<script src="includes/menu.js"></script>
<script src="includes/general.js"></script>
<script>
<!--
function init()
{
@@ -1,6 +1,6 @@
<div class="aboutbox">
<h2>Image Handler<sup>5</sup> für Zen Cart 1.5.5f deutsch</h2>
<h2>Image Handler<sup>5</sup> für Zen Cart 1.5.6 deutsch</h2>
<p></p>
<p>Um sich mit der Funktionsweise vertraut zu machen und Ihre Bilder optimal zu gestalten, lesen Sie bitte die Hinweise zum Bildmanagement in der Onlinedokumentation der deutschen Zen Cart Version:</p>
<p><a href="https://www.zen-cart-pro.at/docs/155-deutsch-doku/" target="_blank"><b>www.zen-cart-pro.at/docs/155-deutsch-doku</b></a></p>
<p><a href="https://www.zen-cart-pro.at/documentation.html#section-7" target="_blank"><b>www.zen-cart-pro.at/documentation.html#section-7</b></a></p>
</div>
@@ -1,6 +1,6 @@
<div class="aboutbox">
<h2>Image Handler<sup>5</sup> für Zen Cart 1.5.5f deutsch</h2>
<h2>Image Handler<sup>5</sup> für Zen Cart 1.5.6 deutsch</h2>
<p></p>
<p>Um sich mit der Funktionsweise vertraut zu machen und Ihre Bilder optimal zu gestalten, lesen Sie bitte die Hinweise zum Bildmanagement in der Onlinedokumentation der deutschen Zen Cart Version:</p>
<p><a href="https://www.zen-cart-pro.at/docs/155-deutsch-doku/" target="_blank"><b>www.zen-cart-pro.at/docs/155-deutsch-doku</b></a></p>
<p><a href="https://www.zen-cart-pro.at/documentation.html#section-7" target="_blank"><b>www.zen-cart-pro.at/documentation.html#section-7</b></a></p>
</div>
@@ -6,7 +6,7 @@
* @copyright Copyright 2003-2019 Zen Cart Development Team
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: bmz_image_handler.class.php 2019-07-13 14:13:51Z webchills $
* @version $Id: bmz_image_handler.class.php 2019-11-01 08:13:51Z webchills $
*/
if (!defined('IH_DEBUG_ADMIN')) {
@@ -44,7 +44,7 @@ class ih_image
* ih_image class constructor
* @author Tim Kroeger (tim@breakmyzencart.com)
* @author Cindy Merkin (lat9)
* @version 5.1.4
* @version 5.1.5
* @param string $src Image source (e.g. - images/productimage.jpg)
* @param string $width The image's width
* @param string $height The image's height
@@ -931,13 +931,16 @@ public function get_additional_parameters($alt, $width, $height, $parameters)
// additional zoom functionality
$pathinfo = pathinfo($src);
$base_image_directory = $ihConf['dir']['images'];
if (in_array(substr($base_image_directory, -1), array('/', '\\'))) {
$base_image_directory = substr($base_image_directory, 0, -1);
}
$base_imagedir_len = strlen($base_image_directory);
$products_image_directory = (strpos($pathinfo['dirname'], $base_image_directory) === 0) ? substr($pathinfo['dirname'], $base_imagedir_len) : $pathinfo['dirname'];
$products_image_directory .= DIRECTORY_SEPARATOR;
$products_image_filename = $pathinfo['filename'];
$this->ihLog("get_additional_parameters($alt, $width, $height, $parameters), base_dir = '$base_image_directory', zoom_sizetype = '$zoom_sizetype', product_dir = '$products_image_directory'" . var_export($pathinfo, true));
$products_image_zoom = $base_image_directory . $zoom_sizetype . '/' . $products_image_directory . $products_image_filename . $ihConf[$zoom_sizetype]['suffix'] . $this->extension;
$products_image_zoom = $ihConf['dir']['images'] . $zoom_sizetype . '/' . $products_image_directory . $products_image_filename . $ihConf[$zoom_sizetype]['suffix'] . $this->extension;
$ih_zoom_image = new ih_image($products_image_zoom, $ihConf[$zoom_sizetype]['width'], $ihConf[$zoom_sizetype]['height']);
$products_image_zoom = $ih_zoom_image->get_local();
@@ -9,7 +9,7 @@
* @copyright Copyright 2003-2019 Zen Cart Development Team
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: additional_images.php 2018-06-12 09:38:06Z webchills $
* @version $Id: additional_images.php 2019-11-01 09:38:06Z webchills $
*/
if (!defined('IS_ADMIN_FLAG')) {
die('Illegal Access');
@@ -153,6 +153,7 @@
'products_name' => $products_name,
'products_image_large' => $products_image_large,
'thumb_slashes' => $thumb_slashes,
'large_link' => $large_link,
'index' => $i
),
$script_link,
@@ -10,13 +10,13 @@
* @package general
* @copyright Copyright 2003-2019 Zen Cart Development Team
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: version.php 849 2019-07-20 09:10:58Z webchills $
* @version $Id: version.php 850 2019-11-01 09:10:58Z webchills $
* @private
*/
define('PROJECT_VERSION_NAME', 'Zen Cart');
define('PROJECT_VERSION_MAJOR', '1');
define('PROJECT_VERSION_MINOR', '5.6c');
define('PROJECT_VERSION_MINOR', '5.6d');
define('PROJECT_VERSION_PATCH1', '');
define('PROJECT_VERSION_PATCH2', '');
define('PROJECT_VERSION_PATCH1_SOURCE', '');
@@ -1,10 +1,10 @@
Willkommen bei der deutschen Zen-Cart Version
Version 1.5.6c vom 01.09.2019
Version 1.5.6d vom 01.11.2019

Installationsanleitung in der umfangreichen Onlinedokumentation auf:
https://www.zen-cart-pro.at/documentation.html

Um Zen Cart 1.5.6c deutsch zu installieren nur die Ordner/Dateien im Ordner UPLOAD hochladen!
Um Zen Cart 1.5.6d deutsch zu installieren nur die Ordner/Dateien im Ordner UPLOAD hochladen!

Systemvoraussetzungen:
* Linux Server mit Apache 2.4 oder 2.2
@@ -15,4 +15,4 @@ Empfohlene Konfiguration:
* Apache 2.4
* PHP 7.3.x
* MySQL 5.7
* Datenbank mit Character Set: utf8mb4 und Kollation: utf8mb4_unicode_ci
* Datenbank mit Character Set: utf8mb4 und Kollation: utf8mb4_general_ci
@@ -10,13 +10,13 @@
* @package general
* @copyright Copyright 2003-2019 Zen Cart Development Team
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: version.php 851 2019-07-20 09:33:58Z webchills $
* @version $Id: version.php 852 2019-11-01 08:33:58Z webchills $
* @private
*/
define('PROJECT_VERSION_NAME', 'Zen Cart');
define('PROJECT_VERSION_MAJOR', '1');
define('PROJECT_VERSION_MINOR', '5.6c');
define('PROJECT_VERSION_MINOR', '5.6d');
define('PROJECT_VERSION_PATCH1', '');
define('PROJECT_VERSION_PATCH2', '');
define('PROJECT_VERSION_PATCH1_SOURCE', '');

0 comments on commit 158e1b9

Please sign in to comment.
You can’t perform that action at this time.