Event Calendar v3

[LaCamus]

I agree with your reasoning behind the image code and IMHO something like this SHOULD be incorporated into this module.. The whole purpose of the module Image Handler is to automate the re-sizing and optimization of the product and category images. This helps shopowners do something automatically they may not remember to do on their own.

IMHO, something similar SHOULD be a part of this module for ALL the reasons you stated.. Even with instructions in the readme, novice DIY shopowners are not always going to follow these instructions and the module should include some controls to help shopowners engage in best practices with regards to image management. Adding some "Image Handler" like image size/management features including admin controls to set the max image height and width AND using the Zen Cart option to re-size the images proportionally would do the trick.. This would enforce better image management practices, and give shopowners some measure of control over the image sizes..

Just from a quick scan it looks like this could work with minimal changes...just for the one overall max image file width (and height) setting. It appears that all zen cart admin file uploads are using the "upload" class (in admin/includes/classes/upload.php). When the "save" function is called it could all be handled there. The only code outside this script would be to add a global variable(s) for max image width (height).

I see that the save function also has an overwrite option, that makes some of my code in admin/events_manager.php redundant...don't want to add to the confusion so that's something we can tackle together in a later revision.

Thanks,
Rus

[LaCamus]

I recall seeing one instance of -1, but was not aware there were three places to look. Will have to revisit.

The -1 is in 1 place, but there are 2 places (soon to be 3) that have added javascript to blank out the manufacturer selection when choosing a category or product.

ps. To make code changes easier to spot in the forum, may I suggest changing the color of relevent section of code to say red/blue = old/new.

I agree, should have thought of that, I'm thinking like I'm stuck in a coding editor...

Here's what I'll do:

gray = code that stayed the same, shown so you can reference/search
green = new code (including coded remarks)
red = code that was removed
blue = code that replaced removed code
purple = an additional file/script that is required
black bold italic = instructions, line references (not coded remarks)

For this message only I bolded in dark green those changes made yesterday.

I went back and compared your files to my latest, so line # references are actually from your ec_4_alpha.zip release.

Here's all the changes I have made (up to this moment) to admin/event_manager.php since downloading your alpha version:

(Additional Note: When testing the "upcoming products" javascript mod I came across a preexisting problem with the links not being created correctly. I traced it to line 355. There is an integer variable ($sep) that I could not find a reference to anywhere (that includes all files under the Zen Carts admin directory). I changed the code (in bold dark blue) so it works now.)

--BEGIN Changes starting at line 11
require('includes/application_top.php');

//** rus: start
//** rus: library/class to manipulate images (by Phil Brown: https://gist.github.com/philBrown/880506
  require('includes/classes/image_manipulator.php');
  define(EVENT_FILE_MAX_WIDTH, '600');        //** rus: for max image width in px, check on file uploads
  $file_to_delete = '';                       //** rus: no easy way to get rid of invalid file, so I delete this file (if set) at the end.
  define(FILENAME_DEFAULT_CATALOG, 'index');  //** rus: corrected 3/23/2013
//** rus: stop
//** rus: removed: define(FILENAME_DEFAULT_CATALOG, 'index.php');

  define(FILENAME_PRODUCT_INFO, 'product_info.php');
--END Changes starting at line 11

--BEGIN Changes starting at line 76
//** rus: start: check to see if file is an image and if too wide
            $wf_parse = $working_file->parse();
//**rus: changed            if($working_file->parse() != false)
//**rus: changed {
            if($wf_parse != false) {
              //** valid image extensions 
              $validext = array('.jpg', '.jpeg', '.gif', '.png');
              $fileext = strtolower(strrchr($working_file->filename, "."));
              if (!in_array($fileext, $validext)) {
                $messageStack->add('Uploaded file ' . $working_file->filename . ' is not a jpg, jpeg, png, or gif.', 'error');
                $event_error = true;
                $success = false;
                $file_to_delete = $working_file->destination . $working_file->filename;
                $_POST['no_image'] = 'on';
              } else {
                $eman = new ImageManipulator($working_file->tmp_filename);
                $ewid = $eman->getWidth();
                $ehei = $eman->getHeight();
                $nwid = 0;
                if ($ewid > EVENT_FILE_MAX_WIDTH) {
                  $nwid = EVENT_FILE_MAX_WIDTH;
                  $nhei = intval($ehei * ($nwid / $ewid));
                  $enew = $eman->resample($nwid, $nhei);
                }

                    $eufile = $working_file->destination . $working_file->filename;
//** rus: stop
                    // rename here if required
                    $working_file->set_filename($working_file->filename);

//** rus: start
//**            in a situation where a file was uploaded and resized then possibly uploaded again...
//**            code was overwriting resized file with newly uploaded (original) bigger image
//**            instead of chasing down why, I took the easy way out and just delete the image/file if it exists
//**            this worked in my scenario (12 to 20 events a year), user just uploads new image...
//**            if any old events used the same image filename then they would all now show the new image
                    if (file_exists($eufile)) {
                      unlink($eufile);
                    }
//** rus: stop
                    if ( !$working_file->save(false) == false)
                    { 
                        $upload_success = true;
//** rus: removed (redundant):                        $messageStack->add('File Uploaded', 'success');

//** rus: start: if we resized then delete original (that was just saved) and save new resized image
//**             more time consuming I know, but upload() function was generating $messageStack...
//**             errors when image changed before $working_file save.
                        if ($nwid > 0) {
                          unlink($eufile);
                          $messageStack->add('Image was resized from ' . $ewid . ' by ' . $ehei . ' to ' . $nwid . ' by ' . $nhei . '.', 'success');
                          $eman->save($eufile);
                          $working_file->file = $eman->file;
                        }                        
//** rus: stop

                    }else{
                        $messageStack->add('There was a problem saving your file -  perhaps you need to rename it', 'error');
                    }

                $uploaded_image = $working_file->filename;

              }  //** rus: end if from above

            }
            else
            {
                if($_POST['no_image'] == 'on' )
                {
                    // remove image
                    $uploaded_image = '';
                }
                else
                {
//** rus: start
                    $event_error = true;
                    $success = false;
                    if ($_FILES['event_image']['error']!=UPLOAD_ERR_NO_FILE) $messageStack->add('There was an error uploading your image file (may be too large)', 'error');
//** rus: stop

                    // set it to the previous image 
                    $uploaded_image = $_POST['event_previous_image'];
                }
            }

            //==============================
            // eof deal with upload - Niccol
            //==============================
--END Changes starting at line 76

--BEGIN Changes starting at line 335
           <?php
					// } // removed, see line 291
             if($_POST['manufacturers_id']!= ''){
//** rus: start
              if ($_POST['manufacturers_id']== '-1'){
               $ZC_link = '';
               $ZC_links = '';
              } else {
//** rus: stop
               $manufacturers = $db->Execute("select manufacturers_name from ". TABLE_MANUFACTURERS ." where manufacturers_id = '" . $_POST['manufacturers_id'] . "'");
               if ($manufacturers) {
                 $manufacturers_name = $manufacturers->fields['manufacturers_name'];
                 }
                 $ZC_link = zen_catalog_href_link(FILENAME_DEFAULT_CATALOG , 'manufacturers_id='. $_POST['manufacturers_id'] );
                 $ZC_links = '<a href='. $ZC_link .' target=_blank>'. $manufacturers_name .'</a>';
              }      //** rus: end if   *******************
             } elseif ($_POST['cPath']!= 0){
                $ZC_link = zen_catalog_href_link(FILENAME_DEFAULT_CATALOG , 'cPath='. $_POST['cPath'] );
                $ZC_links = '<a href='. $ZC_link .' target=_blank>'. zen_get_category_name($_POST['cPath'], $_SESSION['languages_id']) .'</a>';

             } elseif ($_POST['products_id'] != ''){
                $ZC_link = zen_catalog_href_link(FILENAME_PRODUCT_INFO , 'products_id='. $_POST['products_id'] );
//** rus: changed:                $ZC_links = '<a href='. $ZC_link .'>'. zen_get_products_name($_POST['products_id']) .'</a>';
                $ZC_links = '<a href='. $ZC_link .' target=_blank>'. zen_get_products_name($_POST['products_id']) .'</a>';

             } elseif ($_POST['upcoming'] != ''){
//** rus: changed:                $ZC_link = zen_catalog_href_link(FILENAME_PRODUCT_INFO , 'products_id='. substr($_POST['upcoming'],0,$sep) );
                $ZC_link = zen_catalog_href_link(FILENAME_PRODUCT_INFO , 'products_id='. $_POST['upcoming']);
//** rus: changed:                $ZC_links = '<a href='. $ZC_link .'>'. zen_get_products_name($_POST['upcoming']) .'</a>';
                $ZC_links = '<a href='. $ZC_link .' target=_blank>'. zen_get_products_name($_POST['upcoming']) .'</a>';

             } else {
                $ZC_links = (($_POST['ZC_link']) ? $_POST['ZC_link'] : $events->fields['ZC_link']);
             }
           ?>

--END Changes starting at line 335

--BEGIN Changes starting at end of file(line 667)
</body>
</html>
<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
<?php 
//** rus: start
//**            used this workaround to get rid of files that were not valid images since the...
//**            original code writes files even when error variables are set
  if ($file_to_delete != '') {
    unlink($file_to_delete);
  }
//** rus: stop
?>
--END Changes at end of file

Here's all the changes I have made (up to this moment) to admin/includes/events_manager_drop_dns.php since downloading your alpha version (including the new javascript changes for upcoming products):

--BEGIN Changes starting at line 18
<!-- bof manufacturers -->
<?php
$heading = array();
$heading[] = array('align' => 'left', 'text'  => TEXT_CHOOSE_MANUFACTURER);
$manufacturers_values = $db->Execute("select manufacturers_id, manufacturers_name from " . TABLE_MANUFACTURERS . " order by manufacturers_name");
//**rus: changed   $select_box = '<select name="manufacturers_id" onChange="submit();">';
   $select_box = '<select name="manufacturers_id" id="manufacturers_id_sel" onChange="submit();">';

//** rus: removed: if (MAX_MANUFACTURERS_LIST < 2) {
//** rus: removed:     $select_box .= '<option value="">Select</option>';
//** rus: removed: }

//** rus: start
  $select_box .= '<option value="-1">No Manufacturer</option>';
  $dum_pos = strpos($ZC_links,'manufacturers_id=');
  $manz_id = '';
  if ($dum_pos)  {
    $manz_id = substr($ZC_links,$dum_pos+17);
    $manz_id = current(explode(" ", $manz_id));
  }
  if (isset($_POST['manufacturers_id']) && $_POST['manufacturers_id']>0) {
    $man_cur = $_POST['manufacturers_id'];
  } else {
    if ($manufacturers) {
      $man_cur = $manufacturers->fields['manufacturers_id'];
    } else {
      $man_cur = '';
    }
  }
  if ($man_cur=='') $man_cur=$manz_id;
//** rus: stop

    while (!$manufacturers_values->EOF) {
//** rus: removed:      $select_box .= '<option value="' . $manufacturers_values->fields['manufacturers_id'] . '"';
// if ($_POST['manufacturers_id'] == $manufacturers_values['manufacturers_id']) $select_box .= ' SELECTED';
//** rus: start: try this another way
      if ($manufacturers_values->fields['manufacturers_id'] == $man_cur) {
        $select_box .= '<option selected value="' . $manufacturers_values->fields['manufacturers_id'] . '"';
      } else {
        $select_box .= '<option value="' . $manufacturers_values->fields['manufacturers_id'] . '"';
      }
//** rus: stop
      $select_box .= '>' . substr($manufacturers_values->fields['manufacturers_name'], 0, MAX_DISPLAY_MANUFACTURER_NAME_LEN) . '</option>';
      $manufacturers_values->MoveNext();
}

$select_box .= "</select>";
--END Changes starting at line 18

--BEGIN Changes starting at line 46
!-- bof categories -->
<?php
    $heading = array();
    $heading[] = array('align' => 'left', 'text'  => TEXT_CHOOSE_CATEGORY);
    $info_box_contents = array();
//** rus: start
    $dum_oc = "document.getElementById('manufacturers_id_sel').value = ''; submit();";
    $info_box_contents[] = array('form'  => '', 'align' => 'left', 'text'  => zen_draw_pull_down_menu('cPath', zen_get_category_tree(), '', 'onChange="' . $dum_oc . '"'));
//** rus: replaced:    $info_box_contents[] = array('form'  => '', 'align' => 'left', 'text'  => zen_draw_pull_down_menu('cPath', zen_get_category_tree(), '', 'onChange="submit();"'));
//** rus: stop
    $box = new box;
echo $box->menuBox($heading, $info_box_contents);
?>
<!-- eof categories -->
--END Changes starting at line 46

--BEGIN Changes starting at line 78
  $listing_products->MoveNext();
  }

//** rus: start
  $info_box_contents[] = array('form' => '', 'align' => 'left', 'text' => zen_draw_pull_down_menu('products_id', $products_array, '','onChange="' . $dum_oc . '"'));
//** rus: replaced:  $info_box_contents[] = array('form' => '', 'align' => 'left', 'text' => zen_draw_pull_down_menu('products_id', $products_array, '','onChange="submit();"'));
//** rus: stop
  $box = new box;
  echo $box->menuBox($heading, $info_box_contents);
} else {
--END Changes starting at line 78


--This is the change you will need to make for "upcoming products".
--BEGIN Changes starting at line 109
  //while ($upcoming_products = zen_db_fetch_array($upcoming_query))
  	while (!$upcoming_products->EOF) {
  $upcoming_array[] = array('id' => $upcoming_products->fields['products_id'], 'text' => $upcoming_products->fields['products_name'] .' |   expected: '. substr($upcoming_products->fields['products_date_available'],0,10));
  $upcoming_products->MoveNext();
  }
//** rus: start
    $info_box_contents[] = array('form' => '', 'align' => 'left', 'text' => (zen_draw_pull_down_menu('upcoming', $upcoming_array, ' ','onChange="' . $dum_oc . '"')));  
//** rus: replaced:    $info_box_contents[] = array('form' => '', 'align' => 'left', 'text' => (zen_draw_pull_down_menu('upcoming', $upcoming_array, ' ','onChange="submit();"')));
//** rus: stop
    $box = new box;
    echo $box->menuBox($heading, $info_box_contents);

} else {
--END Changes starting at line 109

Here's all the changes I have made (up to this moment) to includes/templates/your_template/templates/tpl_events_calendar_default.php since downloading your alpha version:

--BEGIN Changes starting at line 172
<!-- bof event image - scales and fits images to outer div -->
<?php 
//** rus: added php block to stop trying to show image when there isn't one in db
  if ($event_array['image']!="") {
?>
  <div class="event_image_outer">
    <div class="event_image_inner">
	  <!-- Note: closing ' />' for <img> is located in function zen_image -->
	  <img class="c1" <?php echo zen_image(DIR_WS_IMAGES .'events_images/' . $event_array['image'], '', '', 'hspace="0" vspace="0"');?>
	</div>
    <div class="clearLeft"> </div>
  </div>
<?php 
//** rus: added php block
  }
?>
<!-- eof event image -->
--END Changes starting at line 172

--BEGIN Changes starting at line 250
        else if($_GET['view'] == 'all_events')
        {   //Show all Events from current date.
//** rus: start
//** rus: changed          $events_query_raw = "select *, DAYOFMONTH(start_date) AS event from ".TABLE_EVENTS_CALENDAR."
//** rus: changed            where (start_date >= '" . date('Y-m-d H:i:s') . "' or end_date >= '" . date('Y-m-d H:i:s') . "')"
//** rus: changed            . " and language_id = '" . $_SESSION['languages_id'] . "' order by start_date";
          $events_query_raw = "select *, DAYOFMONTH(start_date) AS event from ".TABLE_EVENTS_CALENDAR."
            where (start_date >= '" . date('Y-m-d') . "' or end_date >= '" . date('Y-m-d') . "')"
            . " and language_id = '" . $_SESSION['languages_id'] . "' order by start_date";
//** rus: stop
          $listingTitle = TEXT_FORTHCOMING_EVENTS;
          $displayPagingSuffix = NULL; // NULL or $listingTitle
          require(DIR_WS_MODULES . 'events_calendar_listing.php');
        }
--END Changes starting at line 250

So, just to reiterate, these are all of the changes I have made to the events calendar I have running (and working) on my box. Anything that was changed yesterday or this morning (since I uploaded the ...rus_alpha zip) is in either bold dark green or bold dark blue.

Let me know if you need anything else on this.

Thanks again for your efforts,
Rus

[DivaVocals]

This is very cool watching you two whip this thing into shape..

[dw08gm]

Re: Image Handler. I found this mod kills the animation of animated gifs, which I use on occassion in event calendar and as category icons, but I have not tested IH with other animation file types (eg .swf or css3). I also find IH code way too complicated for my liking, and would not only make Events Calendar more complicated but considerably larger. However, if others want code similar to IH incorporated into mod, I feel it best treated as an option, as that type of code is not something I could support.

Color has gone from one extreme to another - now looks like a xmas tree LOL - but then much easier to read.

Cheers

[DivaVocals]

Re: Image Handler. I found this mod kills the animation of animated gifs, which I use on occassion in event calendar and as category icons, but I have not tested IH with other animation file types (eg .swf or css3). I also find IH code way too complicated for my liking, and would not only make Events Calendar more complicated but considerably larger. However, if others want code similar to IH incorporated into mod, I feel it best treated as an option, as that type of code is not something I could support.

Color has gone from one extreme to another - now looks like a xmas tree LOL - but then much easier to read.

Cheers

Re-read my post.. I really wasn't talking about integrating IH4 at all.. in fact I made the statement: "IMHO, something similar SHOULD be a part of this module for ALL the reasons you stated..".. I used IH4 as an example of what image management features brings to the table because of it's image resizing features.. Wasn't suggesting porting it over to this module at all..

(OFF TOPIC ASIDE: As you know there IS a solution for animated GIFs with IH4.. It's NOT part of IH4 core because with the exception of you and maybe ONE other person asking after this, no one has really asked for this feature. The reason being is that "in general" animated GIFs are not recommended for product images. With regards to swf or other animation filetypes, that is NOT something in scope for a module who's stated purpose is "image management and optimization")


My point was that a set of user instructions on how to resize images is not enough for novice shopowners with regards to image sizing and management. Additionally if the concern is shopowner control, admin controls can be implemented so that shop owners can set their image sizing parameters. If the concern is for animated GIFs, then goodness build your code to cover that too. My point is that I think that Rus was on the right track in attempting to include some image management controls/features to this module. The reason I bring up IH4 is because it's resizing features actually resizes the images rather than using the browser height and width to resize images. Zen Cart already has a built in control for resizing images proportionally (which IH4 also uses in it's resizing code). Allowing shopowners to upload ridiculously large images without ANY controls is not a good idea and is NOT following best practices IMHO.. As I stated in my previous post "Even with instructions in the readme, novice DIY shopowners are not always going to follow these instructions and the module should include some controls to help shopowners engage in best practices with regards to image management."

[LaCamus]

One important thing to remember is that the image is not touched at all if the width is equal to or less than the defined max setting. But I'm guessing that people who create their own animated images would be savvy enough to just size them correctly before upload.

Also in the next revision we can put in code to check to see if the max width is 0 or not defined...then don't resize.

[LaCamus]

One important thing to remember is that the image is not touched at all if the width is equal to or less than the defined max setting. But I'm guessing that people who create their own animated images would be savvy enough to just size them correctly before upload.

Also in the next revision we can put in code to check to see if the max width is 0 or not defined...then don't resize.

Heck, just thinking here after writing that message....but we can just put a checkbox and width field in the event creation form. The width field would default to our defined max width and the checkbox could be unchecked (default would be on) to not resize at all...graceful solution. I could probably pump this out pretty quick, just let me know.

[LaCamus]

Color has gone from one extreme to another - now looks like a xmas tree LOL - but then much easier to read.

Cheers

I can use whatever colors you want, just let me know. I was trying to setup an easy way to track the changes and for you to match them up with your existing code (I know you said the fixes to the link creation weren't working for you). I could have saved a lot of time just using 2 colors. I went step by step through yours and my code to find the differences and to make sure that I didn't miss remarking one of my changes. That 1 post took almost as long to write as the initial code.

Thanks,
Rus

[DivaVocals]

Heck, just thinking here after writing that message....but we can just put a checkbox and width field in the event creation form. The width field would default to our defined max width and the checkbox could be unchecked (default would be on) to not resize at all...graceful solution. I could probably pump this out pretty quick, just let me know.

Sounds like a great idea!

One important thing to remember is that the image is not touched at all if the width is equal to or less than the defined max setting. But I'm guessing that people who create their own animated images would be savvy enough to just size them correctly before upload.

Also in the next revision we can put in code to check to see if the max width is 0 or not defined...then don't resize.

Exactly..

[dw08gm]

One important thing to remember is that the image is not touched at all if the width is equal to or less than the defined max setting. But I'm guessing that people who create their own animated images would be savvy enough to just size them correctly before upload.

Also in the next revision we can put in code to check to see if the max width is 0 or not defined...then don't resize.

My website was setup three years ago to be fluid and flexible, so that it caters to a diversity of screen sizes, as per the code for the display of images in tpl_events_calendar_default.php and stylesheet_events_calendar.css. As such my website does not need the dimensions of any images to be specified exactly, even though I usually set maximums for large images to 800x600px at 96 dpi or around 400kb. While I recognise that others may not have setup their websites in this way, the writing has been on the wall since mobile phones and tablets could access the internet. While it remains to be seen whether the next release of zencart will revamp the standard template to be fluid and flexible, I am convinced fluid and flexible design is an inevitability for future releases.

I believe the problem of image size will be largely limited to those who blindly adopt other's images without a thought to tailoring same for their website. In this day and age, store owners/developers should know better.

Re-read my post.. I really wasn't talking about integrating IH4 at all.

Diva, I accept this, however, my only intention was to bring Rus up to speed regarding IH.

Cheers