Merge commit 'upstream/master'

modules/itemchecksum/controllers/itemchecksum.php

@@ -0,0 +1,77 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class itemchecksum_Controller extends Controller {
+  public function albumcount($album_id) {
+    $item = ORM::factory("item")
+      ->viewable()
+      ->where("parent_id", $album_id)
+      ->where("type !=", "album")
+      ->find_all();
+
+    print count($item);
+  }
+
+  public function md5($album_id, $file_name) {
+    $item = ORM::factory("item")
+      ->where("parent_id", $album_id)
+      ->where("name", $file_name)
+      ->find_all();
+
+    if (count($item) > 0) {
+      access::required("view_full", $item[0]);
+      if (module::is_active("keeporiginal")) {
+        $original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item[0]->file_path());
+        if ($item[0]->is_photo() && file_exists($original_image)) {        
+          print md5_file($original_image);
+        } else {
+          print md5_file($item[0]->file_path());
+        }
+      } else {
+        print md5_file($item[0]->file_path());
+      }
+    } else {
+      print "0";
+    }
+  }
+
+  public function sha1($album_id, $file_name) {
+
+    $item = ORM::factory("item")
+      ->where("parent_id", $album_id)
+      ->where("name", $file_name)
+      ->find_all();
+
+    if (count($item) > 0) {
+      access::required("view_full", $item[0]);
+      if (module::is_active("keeporiginal")) {
+        $original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item[0]->file_path());
+        if ($item[0]->is_photo() && file_exists($original_image)) {        
+          print sha1_file($original_image);
+        } else {
+          print sha1_file($item[0]->file_path());
+        }
+      } else {
+        print sha1_file($item[0]->file_path());
+      }
+    } else {
+      print "0";
+    }
+  }
+}

modules/itemchecksum/helpers/itemchecksum_installer.php

@@ -0,0 +1,27 @@
+<?php defined("SYSPATH") or die("No direct script access.");/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class itemchecksum_installer {
+  static function install() {
+    module::set_version("itemchecksum", 1);
+  }
+
+  static function uninstall() {
+    module::delete("itemchecksum");
+  }
+}

modules/itemchecksum/module.info

@@ -0,0 +1,3 @@
+name = ItemChecksum
+description = Display's a photo or video's MD5 and SHA-1 checksum.
+version = 1

modules/keeporiginal/helpers/keeporiginal_event.php

@@ -107,7 +107,7 @@ class keeporiginal_event_Core {
         $menu->get("options_menu")
              ->append(Menu::factory("link")
              ->id("restore")
-             ->label("Restore original")
+             ->label(t("Restore original"))
              ->css_id("gKeepOriginalLink")
              ->url(url::site("keeporiginal/restore/" . $item->id)));
       }

modules/metadescription/helpers/metadescription_theme.php

@@ -19,20 +19,29 @@
  */
 class metadescription_theme_Core {
   static function head($theme) {
-    // Make sure the current page belongs to an item.
-    if (!$theme->item()) {
+    if ($theme->tag()) {
+      // If the current page belongs to a tag, look up
+      //   the information for that tag.
+      $tagsItem = ORM::factory("tag")
+      ->where("id", $theme->tag())
+      ->find_all();
+
+    }elseif ($theme->item()) {
+      // If the current page belongs to an item (album, photo, etc.),
+      //   look up any tags that have been applied to that item.
+      $tagsItem = ORM::factory("tag")
+        ->join("items_tags", "tags.id", "items_tags.tag_id")
+        ->where("items_tags.item_id", $theme->item->id)
+        ->find_all();
+
+    } else {
+      // If the current page is neighter an item nor tag, do nothing.
       return;
     }
 
-    // Create an array of all the tags for the current item.
-    $tagsItem = ORM::factory("tag")
-      ->join("items_tags", "tags.id", "items_tags.tag_id")
-      ->where("items_tags.item_id", $theme->item->id)
-      ->find_all();
-    
+    // Load the meta tags into the top of the page.
     $metaView = new View("metadescription_block.html");
     $metaView->tags = $tagsItem;
     return $metaView; 
   }
-
 }

modules/metadescription/views/metadescription_block.html.php

@@ -23,6 +23,17 @@
   if ($metaDescription == "") {
     $metaDescription = p::clean($item->title);
   }
+  // If this page belongs to a tag, use the description of the first item instead.
+  if ($theme->tag()) {
+    if (count($children) > 0) {
+      $metaDescription = trim(nl2br(p::purify($children[0]->description)));
+    }
+  }
+  // If it's still empty, use $metaTags.
+  if ($metaDescription == "") {
+    $metaDescription = $metaTags;
+  }
+
   // Strip HTML
   $metaDescription = strip_tags($metaDescription);
   // Strip Line Breaks

modules/tagfaces/controllers/tagfaces.php

@@ -0,0 +1,230 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class tagfaces_Controller extends Controller {
+  public function drawfaces($id) {
+    // Generate the page that allows the user to draw boxes over a photo.
+      
+    // Make sure user has access to view and edit the photo.
+    $item = ORM::factory("item", $id);
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    // Make sure the item actually has tags on it.
+    $all_tags = ORM::factory("tag")
+      ->join("items_tags", "tags.id", "items_tags.tag_id")
+      ->where("items_tags.item_id", $id)
+      ->find_all();
+      
+    // If it doesn't, display an error and direct back to the photo.
+    if (count($all_tags) == 0) {
+      message::error(t("Please add some tags first."));
+      url::redirect(url::abs_site("{$item->type}s/{$item->id}"));
+    
+    }
+    
+    // Create the page.
+    $template = new Theme_View("page.html", "drawfaces");
+    $template->set_global("item_id", $id);
+    $template->set_global("page_title", t("Draw Faces"));
+    $template->set_global("page_type", "photoface");
+    $template->content = new View("drawfaces.html");
+    $template->content->title = t("Tag Faces");
+    $template->content->form = $this->_get_faces_form($id);
+    $template->content->delete_form = $this->_get_delfaces_form($id);
+
+    // Display the page.
+    print $template;
+  }
+
+  public function delface() {
+    // Delete the specified face data from the photo.
+
+    // Prevent Cross Site Request Forgery
+    access::verify_csrf();
+    
+    // Convert submitted data to local variables.
+    $tag_data = Input::instance()->post("facesList");
+    $item_data = Input::instance()->post("item_id");
+    
+    // If the user didn't select a tag, display and error and abort.
+    if (count($tag_data) == 0) {
+      message::error(t("Please select a tag."));
+      url::redirect("tagfaces/drawfaces/$item_data");
+      return;
+    }
+
+    // Delete the face(s) from the database.
+    foreach ($tag_data as $one_tag) {
+      ORM::factory("items_face")
+        ->where("id", $one_tag)
+        ->delete_all();
+    }
+    
+    // Display a success message.
+    if (count($tag_data) == 1) {
+      message::success(t("One face deleted."));
+    } else {
+      message::success(count($tag_data) . t(" faces deleted."));
+    }    
+    url::redirect("tagfaces/drawfaces/$item_data");
+  }
+  
+  public function saveface() {
+    // Save the face coordinates to the specified tag.
+    
+    // Prevent Cross Site Request Forgery
+    access::verify_csrf();
+
+    // Convert submitted data to local variables.
+    $tag_data = Input::instance()->post("tagsList");
+    $item_data = Input::instance()->post("item_id");
+    $str_x1 = Input::instance()->post("x");
+    $str_y1 = Input::instance()->post("y");
+    $str_x2 = Input::instance()->post("x2");
+    $str_y2 = Input::instance()->post("y2");
+
+    // If the user didn't select a tag, display and error and abort.
+    if (count($tag_data) == 0) {
+      message::error(t("Please select a tag."));
+      url::redirect("tagfaces/drawfaces/$item_data");
+      return;
+    }
+
+    // If the user didn't select a face, display an error and abort.
+    if (($str_x1 == "") || ($str_x2 == "") || ($str_y1 == "") || ($str_y2 == "")) {
+      message::error(t("Please select a face."));
+      url::redirect("tagfaces/drawfaces/$item_data");
+      return;
+    }
+
+    // Check to see if the tag already has a face associated with it.
+    $existingFace = ORM::factory("items_face")
+      ->where("tag_id", $tag_data[0])
+      ->where("item_id", $item_data)
+      ->find_all();
+
+    if (count($existingFace) == 0) {
+      // Save the new face to the database.
+      $newface = ORM::factory("items_face");
+      $newface->tag_id = $tag_data[0];
+      $newface->item_id = $item_data;
+      $newface->x1 = $str_x1;
+      $newface->y1 = $str_y1;
+      $newface->x2 = $str_x2;
+      $newface->y2 = $str_y2;
+      $newface->save();
+    } else {
+      // Update the coordinates of an existing face.
+      $updatedFace = ORM::factory("items_face", $existingFace[0]->id);
+      $updatedFace->x1 = $str_x1;
+      $updatedFace->y1 = $str_y1;
+      $updatedFace->x2 = $str_x2;
+      $updatedFace->y2 = $str_y2;
+      $updatedFace->save();
+    }
+
+    // Redirect back to the main screen and display a "success" message.
+    message::success(t("Face saved."));
+    url::redirect("tagfaces/drawfaces/$item_data");
+  }
+
+  private function _get_faces_form($id) {
+    // Generate the form that allows the user to select a tag to
+    //   save the face too.  Also displays the coordinates of the face
+    //   and the "Save face" button.
+    
+    // Make a new Form.
+    $form = new Forge("tagfaces/saveface", "", "post",
+                      array("id" => "gTagFacesForm"));
+
+    // Create an array of all the tags for the current item.
+    $all_tags = ORM::factory("tag")
+      ->join("items_tags", "tags.id", "items_tags.tag_id")
+      ->where("items_tags.item_id", $id)
+      ->find_all();
+
+    // Generate an array of tags to use as checkboxes.
+    $array_tags = "";
+    foreach ($all_tags as $oneTag) {
+      $array_tags[$oneTag->id] = array($oneTag->name, false);
+    }
+
+    // Make a checklist of tags on the form.
+    $tags_group = $form->group("FaceTag")->label(t("Select a tag:"));
+    $tags_group->checklist("tagsList")
+               ->options($array_tags)
+               ->label(t("Select one of the tags below to associate with the face:"));
+    
+    // Generate input boxes to hold the coordinates of the face.
+    $coordinates_group = $form->group("FaceCoordinates")
+                              ->label(t("Coordinates:"));
+    $coordinates_group->input("x")
+                      ->label(t("X1"));
+    $coordinates_group->input("y")
+                      ->label(t("Y1"));
+    $coordinates_group->input("x2")
+                      ->label(t("X2"));
+    $coordinates_group->input("y2")
+                      ->label(t("Y2"));
+
+    // Add the id# of the photo and a save button to the form.
+    $form->hidden("item_id")->value($id);
+    $form->submit("SaveFace")->value(t("Save face"));
+
+    // Return the newly generated form.
+    return $form;
+  }
+
+  private function _get_delfaces_form($id) {
+    // Generate a form to allow the user to remove face data
+    //   from a photo.
+    
+    // Make a new Form.
+    $form = new Forge("tagfaces/delface", "", "post",
+                      array("id" => "gTagDelFacesForm"));
+
+    // Create an array of all the tags that already have faces.
+    $existing_faces = ORM::factory("items_face")
+      ->where("item_id", $id)
+      ->find_all();
+
+    // turn the $existing_faces array into an array that can be used
+    //   for a checklist.
+    $array_faces = "";
+    foreach ($existing_faces as $oneFace) {
+      $array_faces[$oneFace->id] = array(ORM::factory("tag", 
+                                     $oneFace->tag_id)->name, false);
+    }
+
+    // Add a checklist to the form.
+    $tags_group = $form->group("ExistingFaces")
+                       ->label(t("Tags with faces:"));
+    $tags_group->checklist("facesList")
+               ->options($array_faces)
+               ->label(t("Select the tag(s) that correspond(s) to the face(s) you wish to delete:"));
+    
+    // Add the id# of the photo and a delete button to the form.
+    $form->hidden("item_id")->value($id);
+    $form->submit("DeleteFace")->value(t("Delete face(s)"));
+
+    // Return the newly generated form.
+    return $form;
+  }
+}

modules/tagfaces/helpers/tagfaces_event.php

@@ -0,0 +1,54 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class tagfaces_event_Core {
+  static function module_change($changes) {
+    // See if the Tags module is installed,
+    //   tell the user to install it if it isn't.
+    if (!module::is_active("tag") || in_array("tag", $changes->deactivate)) {
+      site_status::warning(
+        t("The TagFaces module requires the Tags module.  " .
+          "<a href=\"%url\">Activate the Tags module now</a>",
+          array("url" => url::site("admin/modules"))),
+        "tagfaces_needs_tag");
+    } else {
+      site_status::clear("tagfaces_needs_tag");
+    }
+  }
+
+  static function site_menu($menu, $theme) {  
+    // Create a menu option for adding face data.
+    if (!$theme->item()) {
+      return;
+    }
+  
+    $item = $theme->item();
+
+    if ($item->is_photo()) {        
+      if ((access::can("view", $item)) && (access::can("edit", $item))) {
+        $menu->get("options_menu")
+             ->append(Menu::factory("link")
+             ->id("tagfaces")
+             ->label(t("Tag faces"))
+             ->css_id("gTagFacesLink")
+             ->url(url::site("tagfaces/drawfaces/" . $item->id)));
+      }
+    }
+  }
+}

modules/tagfaces/helpers/tagfaces_installer.php

@@ -0,0 +1,50 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class tagfaces_installer {
+  static function install() {
+    // Create a table to store face coordinates in.
+    $db = Database::instance();
+    $db->query("CREATE TABLE IF NOT EXISTS {items_faces} (
+               `id` int(9) NOT NULL auto_increment,
+               `tag_id` int(9) NOT NULL,
+               `item_id` int(9) NOT NULL,
+               `x1` int(9) NOT NULL,
+               `y1` int(9) NOT NULL,
+               `x2` int(9) NOT NULL,
+               `y2` int(9) NOT NULL,
+               PRIMARY KEY (`id`))
+               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+
+    // Set the module's version number.
+    module::set_version("tagfaces", 1);
+  }
+
+  static function deactivate() {
+  // Clear the require tags message when tagfaces is deactivated.
+    site_status::clear("tagfaces_needs_tag");
+  }
+
+  static function uninstall() {
+    // Delete the face table before uninstalling.
+    $db = Database::instance();
+    $db->query("DROP TABLE IF EXISTS {items_faces};");
+    module::delete("tagfaces");
+  }
+}

modules/tagfaces/helpers/tagfaces_theme.php

@@ -0,0 +1,34 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class tagfaces_theme_Core {
+  static function photo_bottom($theme) {
+    // Check and see if the current photo has any tagged faces
+    //   associated with it.
+    $item = $theme->item;
+    $existingFaces = ORM::factory("items_face")
+      ->where("item_id", $item->id)
+      ->find_all();
+      
+    // If it does, add an image map to the page to display them.
+    if (count($existingFaces) > 0) {
+      return new View("drawfaces_highlight_block.html");
+    }
+  }
+}

modules/tagfaces/js/jquery.Jcrop.min.js

@@ -0,0 +1,163 @@
+/**
+ * Jcrop v.0.9.8 (minimized)
+ * (c) 2008 Kelly Hallman and DeepLiquid.com
+ * More information: http://deepliquid.com/content/Jcrop.html
+ * Released under MIT License - this header must remain with code
+ */
+
+
+(function($){$.Jcrop=function(obj,opt)
+{var obj=obj,opt=opt;if(typeof(obj)!=='object')obj=$(obj)[0];if(typeof(opt)!=='object')opt={};if(!('trackDocument'in opt))
+{opt.trackDocument=$.browser.msie?false:true;if($.browser.msie&&$.browser.version.split('.')[0]=='8')
+opt.trackDocument=true;}
+if(!('keySupport'in opt))
+opt.keySupport=$.browser.msie?false:true;var defaults={trackDocument:false,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:.6,borderOpacity:.4,handleOpacity:.5,handlePad:5,handleSize:9,handleOffset:5,edgeMargin:14,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,boxWidth:0,boxHeight:0,boundary:8,animationDelay:20,swingSpeed:3,allowSelect:true,allowMove:true,allowResize:true,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){}};var options=defaults;setOptions(opt);var $origimg=$(obj);var $img=$origimg.clone().removeAttr('id').css({position:'absolute'});$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);;if(options.addClass)$div.addClass(options.addClass);var $img2=$('<img />').attr('src',$img.attr('src')).css('position','absolute').width(boundx).height(boundy);var $img_holder=$('<div />').width(pct(100)).height(pct(100)).css({zIndex:310,position:'absolute',overflow:'hidden'}).append($img2);var $hdl_holder=$('<div />').width(pct(100)).height(pct(100)).css('zIndex',320);var $sel=$('<div />').css({position:'absolute',zIndex:300}).insertBefore($img).append($img_holder,$hdl_holder);var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var xlimit,ylimit,xmin,ymin;var xscale,yscale,enabled=true;var docOffset=getPos($img),btndown,lastcurs,dimmed,animating,shift_down;var Coords=function()
+{var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
+{var pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];};function setCurrent(pos)
+{var pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];};function getOffset()
+{return[ox,oy];};function moveOffset(offset)
+{var ox=offset[0],oy=offset[1];if(0>x1+ox)ox-=ox+x1;if(0>y1+oy)oy-=oy+y1;if(boundy<y2+oy)oy+=boundy-(y2+oy);if(boundx<x2+ox)ox+=boundx-(x2+ox);x1+=ox;x2+=ox;y1+=oy;y2+=oy;};function getCorner(ord)
+{var c=getFixed();switch(ord)
+{case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}};function getFixed()
+{if(!options.aspectRatio)return getRect();var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,min_y=options.minSize[1]/yscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy;if(max_x==0){max_x=boundx*10}
+if(max_y==0){max_y=boundy*10}
+if(real_ratio<aspect)
+{yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0)
+{xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}
+else if(xx>boundx)
+{xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}
+else
+{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0)
+{yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}
+else if(yy>boundy)
+{yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
+if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
+if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x}else if(x1-xx>max_x){xx=x1-max_x;}
+if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
+if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
+if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
+return last=makeObj(flipCoords(x1,y1,xx,yy));};function rebound(p)
+{if(p[0]<0)p[0]=0;if(p[1]<0)p[1]=0;if(p[0]>boundx)p[0]=boundx;if(p[1]>boundy)p[1]=boundy;return[p[0],p[1]];};function flipCoords(x1,y1,x2,y2)
+{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1)
+{xa=x2;xb=x1;}
+if(y2<y1)
+{ya=y2;yb=y1;}
+return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];};function getRect()
+{var xsize=x2-x1;var ysize=y2-y1;if(xlimit&&(Math.abs(xsize)>xlimit))
+x2=(xsize>0)?(x1+xlimit):(x1-xlimit);if(ylimit&&(Math.abs(ysize)>ylimit))
+y2=(ysize>0)?(y1+ylimit):(y1-ylimit);if(ymin&&(Math.abs(ysize)<ymin))
+y2=(ysize>0)?(y1+ymin):(y1-ymin);if(xmin&&(Math.abs(xsize)<xmin))
+x2=(xsize>0)?(x1+xmin):(x1-xmin);if(x1<0){x2-=x1;x1-=x1;}
+if(y1<0){y2-=y1;y1-=y1;}
+if(x2<0){x1-=x2;x2-=x2;}
+if(y2<0){y1-=y2;y2-=y2;}
+if(x2>boundx){var delta=x2-boundx;x1-=delta;x2-=delta;}
+if(y2>boundy){var delta=y2-boundy;y1-=delta;y2-=delta;}
+if(x1>boundx){var delta=x1-boundy;y2-=delta;y1-=delta;}
+if(y1>boundy){var delta=y1-boundy;y2-=delta;y1-=delta;}
+return makeObj(flipCoords(x1,y1,x2,y2));};function makeObj(a)
+{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};};return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}();var Selection=function()
+{var start,end,dragmode,awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;if(options.drawBorders){borders={top:insertBorder('hline').css('top',$.browser.msie?px(-1):px(0)),bottom:insertBorder('hline'),left:insertBorder('vline'),right:insertBorder('vline')};}
+if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
+options.sideHandles&&createHandles(['n','s','e','w']);options.cornerHandles&&createHandles(['sw','nw','ne','se']);function insertBorder(type)
+{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;};function dragDiv(ord,zi)
+{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi});$hdl_holder.append(jq);return jq;};function insertHandle(ord)
+{return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).addClass(cssClass('handle'));};function insertDragbar(ord)
+{var s=options.handleSize,o=hhs,h=s,w=s,t=o,l=o;switch(ord)
+{case'n':case's':w=pct(100);break;case'e':case'w':h=pct(100);break;}
+return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});};function createHandles(li)
+{for(i in li)handle[li[i]]=insertHandle(li[i]);};function moveHandles(c)
+{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;'e'in handle&&handle.e.css({top:px(midvert),left:px(east)})&&handle.w.css({top:px(midvert)})&&handle.s.css({top:px(south),left:px(midhoriz)})&&handle.n.css({left:px(midhoriz)});'ne'in handle&&handle.ne.css({left:px(east)})&&handle.se.css({top:px(south),left:px(east)})&&handle.sw.css({top:px(south)});'b'in handle&&handle.b.css({top:px(south)})&&handle.r.css({left:px(east)});};function moveto(x,y)
+{$img2.css({top:px(-y),left:px(-x)});$sel.css({top:px(y),left:px(x)});};function resize(w,h)
+{$sel.width(w).height(h);};function refresh()
+{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();};function updateVisible()
+{if(awake)return update();};function update()
+{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);options.drawBorders&&borders['right'].css({left:px(c.w-1)})&&borders['bottom'].css({top:px(c.h-1)});seehandles&&moveHandles(c);awake||show();options.onChange(unscale(c));};function show()
+{$sel.show();$img.css('opacity',options.bgOpacity);awake=true;};function release()
+{disableHandles();$sel.hide();$img.css('opacity',1);awake=false;};function showHandles()
+{if(seehandles)
+{moveHandles(Coords.getFixed());$hdl_holder.show();}};function enableHandles()
+{seehandles=true;if(options.allowResize)
+{moveHandles(Coords.getFixed());$hdl_holder.show();return true;}};function disableHandles()
+{seehandles=false;$hdl_holder.hide();};function animMode(v)
+{(animating=v)?disableHandles():enableHandles();};function done()
+{animMode(false);refresh();};var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360})
+$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,done:done};}();var Tracker=function()
+{var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;if(!trackDoc)
+{$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
+function toFront()
+{$trk.css({zIndex:450});if(trackDoc)
+{$(document).mousemove(trackMove).mouseup(trackUp);}}
+function toBack()
+{$trk.css({zIndex:290});if(trackDoc)
+{$(document).unbind('mousemove',trackMove).unbind('mouseup',trackUp);}}
+function trackMove(e)
+{onMove(mouseAbs(e));};function trackUp(e)
+{e.preventDefault();e.stopPropagation();if(btndown)
+{btndown=false;onDone(mouseAbs(e));options.onSelect(unscale(Coords.getFixed()));toBack();onMove=function(){};onDone=function(){};}
+return false;};function activateHandlers(move,done)
+{btndown=true;onMove=move;onDone=done;toFront();return false;};function setCursor(t){$trk.css('cursor',t);};$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}();var KeyManager=function()
+{var $keymgr=$('<input type="radio" />').css({position:'absolute',left:'-30px'}).keypress(parseKey).blur(onBlur),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
+{if(options.keySupport)
+{$keymgr.show();$keymgr.focus();}};function onBlur(e)
+{$keymgr.hide();};function doNudge(e,x,y)
+{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible();};e.preventDefault();e.stopPropagation();};function parseKey(e)
+{if(e.ctrlKey)return true;shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode)
+{case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:Selection.release();break;case 9:return true;}
+return nothing(e);};if(options.keySupport)$keywrap.insertBefore($img);return{watchKeys:watchKeys};}();function px(n){return''+parseInt(n)+'px';};function pct(n){return''+parseInt(n)+'%';};function cssClass(cl){return options.baseClass+'-'+cl;};function getPos(obj)
+{var pos=$(obj).offset();return[pos.left,pos.top];};function mouseAbs(e)
+{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];};function myCursor(type)
+{if(type!=lastcurs)
+{Tracker.setCursor(type);lastcurs=type;}};function startDragMode(mode,pos)
+{docOffset=getPos($img);Tracker.setCursor(mode=='move'?mode:mode+'-resize');if(mode=='move')
+return Tracker.activateHandlers(createMover(pos),doneSelect);var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);};function dragmodeHandler(mode,f)
+{return function(pos){if(!options.aspectRatio)switch(mode)
+{case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}
+else switch(mode)
+{case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}
+Coords.setCurrent(pos);Selection.update();};};function createMover(pos)
+{var lloc=pos;KeyManager.watchKeys();return function(pos)
+{Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};};function oppLockCorner(ord)
+{switch(ord)
+{case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';};};function createDragger(ord)
+{return function(e){if(options.disabled)return false;if((ord=='move')&&!options.allowMove)return false;btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};};function presize($obj,w,h)
+{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0)
+{nw=w;nh=(w/$obj.width())*$obj.height();}
+if((nh>h)&&h>0)
+{nh=h;nw=(h/$obj.height())*$obj.width();}
+xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);};function unscale(c)
+{return{x:parseInt(c.x*xscale),y:parseInt(c.y*yscale),x2:parseInt(c.x2*xscale),y2:parseInt(c.y2*yscale),w:parseInt(c.w*xscale),h:parseInt(c.h*yscale)};};function doneSelect(pos)
+{var c=Coords.getFixed();if(c.w>options.minSelect[0]&&c.h>options.minSelect[1])
+{Selection.enableHandles();Selection.done();}
+else
+{Selection.release();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');};function newSelection(e)
+{if(options.disabled)return false;if(!options.allowSelect)return false;btndown=true;docOffset=getPos($img);Selection.disableHandles();myCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();Selection.update();e.stopPropagation();e.preventDefault();return false;};function selectDrag(pos)
+{Coords.setCurrent(pos);Selection.update();};function newTracker()
+{var trk=$('<div></div>').addClass(cssClass('tracker'));$.browser.msie&&trk.css({opacity:0,backgroundColor:'white'});return trk;};function animateTo(a)
+{var x1=a[0]/xscale,y1=a[1]/yscale,x2=a[2]/xscale,y2=a[3]/yscale;if(animating)return;var animto=Coords.flipCoords(x1,y1,x2,y2);var c=Coords.getFixed();var animat=initcr=[c.x,c.y,c.x2,c.y2];var interv=options.animationDelay;var x=animat[0];var y=animat[1];var x2=animat[2];var y2=animat[3];var ix1=animto[0]-initcr[0];var iy1=animto[1]-initcr[1];var ix2=animto[2]-initcr[2];var iy2=animto[3]-initcr[3];var pcent=0;var velocity=options.swingSpeed;Selection.animMode(true);var animator=function()
+{return function()
+{pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent<100)animateStart();else Selection.done();if(pcent>=99.8)pcent=100;setSelectRaw(animat);};}();function animateStart()
+{window.setTimeout(animator,interv);};animateStart();};function setSelect(rect)
+{setSelectRaw([rect[0]/xscale,rect[1]/yscale,rect[2]/xscale,rect[3]/yscale]);};function setSelectRaw(l)
+{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();};function setOptions(opt)
+{if(typeof(opt)!='object')opt={};options=$.extend(options,opt);if(typeof(options.onChange)!=='function')
+options.onChange=function(){};if(typeof(options.onSelect)!=='function')
+options.onSelect=function(){};};function tellSelect()
+{return unscale(Coords.getFixed());};function tellScaled()
+{return Coords.getFixed();};function setOptionsNew(opt)
+{setOptions(opt);interfaceUpdate();};function disableCrop()
+{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');};function enableCrop()
+{options.disabled=false;interfaceUpdate();};function cancelCrop()
+{Selection.done();Tracker.activateHandlers(null,null);};function destroy()
+{$div.remove();$origimg.show();};function interfaceUpdate(alt)
+{options.allowResize?alt?Selection.enableOnly():Selection.enableHandles():Selection.disableHandles();Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');$div.css('backgroundColor',options.bgColor);if('setSelect'in options){setSelect(opt.setSelect);Selection.done();delete(options.setSelect);}
+if('trueSize'in options){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
+xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if('outerImage'in options)
+{$img.attr('src',options.outerImage);delete(options.outerImage);}
+Selection.refresh();};$hdl_holder.hide();interfaceUpdate(true);var api={animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},release:Selection.release,destroy:destroy};$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options)
+{function attachWhenDone(from)
+{var loadsrc=options.useImg||from.src;var img=new Image();img.onload=function(){$.Jcrop(from,options);};img.src=loadsrc;};if(typeof(options)!=='object')options={};this.each(function()
+{if($(this).data('Jcrop'))
+{if(options=='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
+else attachWhenDone(this);});return this;};})(jQuery);

modules/tagfaces/models/items_face.php

@@ -0,0 +1,21 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Items_Face_Model extends ORM {
+}

modules/tagfaces/module.info

@@ -0,0 +1,3 @@
+name = TagFaces
+description = Assign faces in photos to tags.
+version = 1

modules/tagfaces/views/drawfaces.html.php

@@ -0,0 +1,116 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? $item = ORM::factory("item", $item_id); ?>
+
+<style>
+.jcrop-holder { text-align: left; }
+
+.jcrop-vline, .jcrop-hline
+{
+	font-size: 0;
+	position: absolute;
+	background: white url('<?= url::file("modules/tagfaces/images/Jcrop.gif") ?>') top left repeat;
+}
+.jcrop-vline { height: 100%; width: 1px !important; }
+.jcrop-hline { width: 100%; height: 1px !important; }
+.jcrop-handle {
+	font-size: 1px;
+	width: 7px !important;
+	height: 7px !important;
+	border: 1px #eee solid;
+	background-color: #333;
+	*width: 9px;
+	*height: 9px;
+}
+
+.jcrop-tracker { width: 100%; height: 100%; }
+
+.custom .jcrop-vline,
+.custom .jcrop-hline
+{
+	background: yellow;
+}
+.custom .jcrop-handle
+{
+	border-color: black;
+	background-color: #C7BB00;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+</style>
+
+<?= html::script("modules/tagfaces/js/jquery.Jcrop.js") ?>
+
+<script language="Javascript">
+  // Remember to invoke within jQuery(window).load(...)
+  // If you don't, Jcrop may not initialize properly
+  jQuery(document).ready(function(){
+    jQuery('#gPhotoId-<?=$item->id ?>').Jcrop({
+      onChange: showCoords,
+      onSelect: showCoords
+    });
+  });
+
+  // Our simple event handler, called from onChange and onSelect
+  // event handlers, as per the Jcrop invocation above
+  function showCoords(c) {
+    jQuery('#x').val(c.x);
+    jQuery('#y').val(c.y);
+    jQuery('#x2').val(c.x2);
+    jQuery('#y2').val(c.y2);
+  };
+</script>
+
+<div id="gAlbumHeader">
+  <div id="gAlbumHeaderButtons">
+    <?= $theme->dynamic_top() ?>
+  </div>
+  <h1><?= p::clean($title) ?></h1>
+</div>
+  <p><?=t("Use the mouse to select a face on the image below."); ?></p>
+
+<fieldset> 
+  <div id="gItem">
+    <div id="gInfo">
+      <h2><?= p::purify($item->title) ?></h2>
+    </div>
+    <div id="gPhoto">
+      <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
+    </div>
+  </div>
+</fieldset> 
+
+<style>
+input[type="text"] {
+  width: 40px;
+}
+
+li {
+  display: inline;
+  list-style-type: none;
+  float:left;
+}
+</style>
+
+<div id="gCoordinates">
+  <?= $form ?>
+</div>
+
+<br/><br/><br/>
+
+<fieldset>
+<div id="gDeleteFaces">
+  <h2><?= t("Delete Faces") ?></h2>
+  <p><?=t("The following tags already have faces associated with them."); ?></p>
+  <?= $delete_form ?>
+</div>
+</fieldset>
+
+<br/>
+
+<div id="gExitFaces">
+<p><a href="<?= url::abs_site("{$item->type}s/{$item->id}") ?>"><?= t("Return to photo") ?></a></p>
+</div>
+
+<?= $theme->dynamic_bottom() ?>
+
+

modules/tagfaces/views/drawfaces_highlight_block.html.php

@@ -0,0 +1,55 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+  // Check and see if the current photo has any faces associated with it.
+  $existingFaces = ORM::factory("items_face")
+                        ->where("item_id", $item->id)
+                        ->find_all();
+
+  // If it does, then insert some javascript and display an image map
+  //   to show where the faces are at.
+  if (count($existingFaces) > 0) {
+?>
+
+<div class="square" title="Test" id="divfacebox" style="display:none;left:5;top:5;width:50;height:50;"></div>
+
+<script type="text/JavaScript">
+  function setfacemap() {
+	// Insert the usemap element into the resize photo's image tag.
+    var photoimg = document.getElementById('gPhotoId-<?=$item->id ?>');
+    photoimg.useMap = '#faces';
+  }
+
+function highlightbox(x1, y1, x2, y2, str_title) {
+	// Put a div over a face when the mouse moves over it.
+	// Doesn't actually work :(
+    var photoimg = document.getElementById('gPhotoId-<?=$item->id ?>');
+    var facediv = document.getElementById('divfacebox');
+    facediv.title = str_title;
+    facediv.style.display = 'block';
+    facediv.style.left = photoimg.offsetLeft + x1;
+    facediv.style.top = photoimg.offsetTop + y1;
+    facediv.style.width=x2-x1;
+    facediv.style.height=y2-y1;
+}
+
+function hidebox() {
+  // Hide the div when the mouse moves off of the face.
+  document.getElementById('divfacebox').style.display = 'none';
+}
+
+  // Call setfacemap when the page loads.
+  window.onload = setfacemap();
+</script>
+
+<map name="faces">
+<?
+    // For each face, add a rectangle area to the page.
+    foreach ($existingFaces as $oneFace) {
+      $oneTag = ORM::factory("tag", $oneFace->tag_id)
+?>
+  <area shape="rect" coords="<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>" href="<?=url::site("tags/$oneFace->tag_id") ?>" title="<?=p::clean($oneTag->name); ?>" alt="<?=$oneTag->name; ?>" onMouseOver="highlightbox(<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>,'<?=p::clean($oneTag->name); ?>')" onMouseOut="hidebox()" />
+<? } ?>
+</map>
+<?
+  }
+?>

modules/tagsmap/views/tagsmap_googlemap.html.php

@@ -15,31 +15,20 @@
   function initialize() {
     if (GBrowserIsCompatible()) {
       var map = new GMap2(document.getElementById("map_canvas"));
-      map.setCenter(new GLatLng(<?=$google_map_latitude ?>, 
-                                <?=$google_map_longitude ?>));
-      map.setZoom(<?=$google_map_zoom ?>);
-      map.setUIToDefault();
 
       // Make Google Earth an Option.
       map.addMapType(G_SATELLITE_3D_MAP);
       var mapControl = new GMapTypeControl();
       map.addControl(mapControl);
-            
+
+      // Set map defaults.
+      map.setCenter(new GLatLng(<?=$google_map_latitude ?>, 
+                                <?=$google_map_longitude ?>));
+      map.setZoom(<?=$google_map_zoom ?>);
+      map.setUIToDefault();      
       map.setMapType(<?=$google_map_type ?>);
-      
-      <? foreach ($tags_gps as $oneGPS): ?>
-      {
-          
-        var myGeographicCoordinates = new GLatLng(<?= $oneGPS->latitude ?>, 
-                                                  <?= $oneGPS->longitude ?>);
-        map.addOverlay(createMarker(myGeographicCoordinates, 
-                                      "<?= $oneGPS->description ?>", 
-                                      "<?= url::site("tags/$oneGPS->tag_id")?>", 
-                                      "<?= ORM::factory("tag", $oneGPS->tag_id)->name ?>"
-                                    ));
-      }
-      <? endforeach ?>
-      
+
+      // Function for making the clickable markers.
       function createMarker(point, description, tagURL, tagName) {
         var marker = new GMarker(point);
     	GEvent.addListener(marker, "click", function() {
@@ -47,12 +36,24 @@
                        "Tag: <a href=\"" + tagURL + "\">" + tagName + "</a>";
     	  map.openInfoWindowHtml(point, myHtml);
         });
-  
         return marker;
       }
+
+      // Create markers for each tag with GPS coordinates.
+      <? $counter = 0; ?>
+      <? foreach ($tags_gps as $oneGPS): ?>
+        var myGeographicCoordinates<?=$counter; ?> = new GLatLng(<?= $oneGPS->latitude ?>, 
+                                                  <?= $oneGPS->longitude ?>);
+        map.addOverlay(createMarker(myGeographicCoordinates<?=$counter; ?>, 
+                                      "<?= $oneGPS->description ?>", 
+                                      "<?= url::site("tags/$oneGPS->tag_id")?>", 
+                                      "<?= ORM::factory("tag", $oneGPS->tag_id)->name ?>"
+                                    ));
+        <? $counter++; ?>
+      <? endforeach ?>
     }
   }
-  
+
   google.setOnLoadCallback(initialize);
 </script>
 

modules/videodimensions/helpers/videodimensions_event.php

@@ -0,0 +1,37 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class videodimensions_event_Core {
+  static function item_edit_form($item, $form) {
+    // Retrieve the existing height and width and display it on the form.
+    if ($item->is_movie()) {
+      $form->edit_item->input("vidheight")->label(t("Video Height"))
+           ->value($item->height);
+      $form->edit_item->input("vidwidth")->label(t("Video Width"))
+           ->value($item->width);
+    }
+  }
+
+  static function item_edit_form_completed($item, $form) {
+    // Save the new height and width to the database.
+    $item->height = $form->edit_item->vidheight->value;
+    $item->width = $form->edit_item->vidwidth->value;
+    $item->save();
+  }
+}

modules/videodimensions/helpers/videodimensions_installer.php

@@ -0,0 +1,27 @@
+<?php defined("SYSPATH") or die("No direct script access.");/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class videodimensions_installer {
+  static function install() {
+    module::set_version("videodimensions", 1);
+  }
+
+  static function uninstall() {
+    module::delete("videodimensions");
+  }
+}

modules/videodimensions/module.info

@@ -0,0 +1,3 @@
+name = "VideoDimensions"
+description = "Manually edit the dimensions of a video."
+version = 1