gordonbanderson / ss3gallery

code/ExifTask.php

Indentation +5 added lines, -5 removed lines

@@ -8,10 +8,10 @@
     protected $enabled = true;
  
     function run($request) {
-		$imagesToProcess = GalleryImage::get()->filter('ExifRead', false);
-		foreach ($imagesToProcess->getIterator() as $image) {
-			echo 'Processing image '.$image->Title.'<br/>';
-			$image->processExifData();
-		}
+    $imagesToProcess = GalleryImage::get()->filter('ExifRead', false);
+    foreach ($imagesToProcess->getIterator() as $image) {
+      echo 'Processing image '.$image->Title.'<br/>';
+      $image->processExifData();
+    }
     }
 }

code/ImageMetaDataExtension.php

Indentation +47 added lines, -47 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 class ImageMetaDataExtension extends DataExtension implements Mappable {
- static $db = array(
+  static $db = array(
     'Lat' => 'Decimal(18,15)',
     'Lon' => 'Decimal(18,15)',
     'ZoomLevel' => 'Int',
@@ -19,21 +19,21 @@ 
 
 
   public function processExifData() {
-  	error_log('Processing exif data for '.$this->owner->ID);
-  	$filename = BASE_PATH.'/'.$this->owner->Image()->Filename;
-  	error_log('Checking '.$filename);
-
-  	// when the image is first saved, the file will still be a temp file
-  	if (file_exists($filename)) {
-  		try {
-     		$exif = exif_read_data($filename,0,true);
+    error_log('Processing exif data for '.$this->owner->ID);
+    $filename = BASE_PATH.'/'.$this->owner->Image()->Filename;
+    error_log('Checking '.$filename);
+
+    // when the image is first saved, the file will still be a temp file
+    if (file_exists($filename)) {
+      try {
+          $exif = exif_read_data($filename,0,true);
       
-		  	$aperture = $exif['COMPUTED']['ApertureFNumber'];
+        $aperture = $exif['COMPUTED']['ApertureFNumber'];
 
-		  	$aperture = str_replace('f/', '', $aperture);
-		  	error_log('APERTURE:'.$aperture);
+        $aperture = str_replace('f/', '', $aperture);
+        error_log('APERTURE:'.$aperture);
 
-		  	$this->owner->Aperture = $aperture;
+        $this->owner->Aperture = $aperture;
 
         $shutterspeed = '';
         if (isset($exif['ExposureTime'])) {
@@ -42,8 +42,8 @@ 
           $shutterspeed = $exif['EXIF']['ExposureTime'];
         }
 		  	
-		  	error_log('EXPOSURE:'.$shutterspeed);
-		  	$this->owner->ShutterSpeed = $shutterspeed;
+        error_log('EXPOSURE:'.$shutterspeed);
+        $this->owner->ShutterSpeed = $shutterspeed;
         if (isset($exif['DateTimeOriginal'])) {
           $this->owner->TakenAt = $exif['DateTimeOriginal'];  
         } else {
@@ -61,10 +61,10 @@ 
         error_log('ISO:'.$iso);
 		  	
 
-		  	// coors
-		  	if (isset($exif['GPS'])) {
+        // coors
+        if (isset($exif['GPS'])) {
           $gps = $exif['GPS'];
-		  		$latarray = $gps['GPSLatitude'];
+          $latarray = $gps['GPSLatitude'];
           $degrees = $latarray[0];
           $parts = explode('/', $degrees);
           $degrees = $parts[0] / $parts[1];
@@ -76,12 +76,12 @@ 
           $seconds = $parts[0] / $parts[1];
 
           error_log('LATITUDE: DMS='.$degrees.','.$minutes.','.$seconds);
-		  		$latitude = $degrees+$minutes/60+$seconds/3600;
+          $latitude = $degrees+$minutes/60+$seconds/3600;
           error_log('LAT:'.$latitude);
 
           error_log('LATITUDE:'.$latitude);
 
-		  		$lonarray = $gps['GPSLongitude'];
+          $lonarray = $gps['GPSLongitude'];
           $degrees = $lonarray[0];
           $parts = explode('/', $degrees);
           $degrees = $parts[0] / $parts[1];
@@ -92,10 +92,10 @@ 
           $parts = explode('/', $seconds);
           $seconds = $parts[0] / $parts[1];
 
-		  		$longitude =  $degrees+$minutes/60+$seconds/3600;
-		  		$this->owner->Lat = $latitude;
-		  		$this->owner->Lon = $longitude;
-		  	} else {
+          $longitude =  $degrees+$minutes/60+$seconds/3600;
+          $this->owner->Lat = $latitude;
+          $this->owner->Lon = $longitude;
+        } else {
           error_log('*** NO GPS DATA ***');
         }
         $image = $this->owner->Image();
@@ -104,46 +104,46 @@ 
         }
 		  	
         $this->owner->ExifRead = true;
-		  	$this->owner->write();	
-  		}
-  		catch (Exception $e) {
-  			error_log($e);
-  		}
+        $this->owner->write();	
+      }
+      catch (Exception $e) {
+        error_log($e);
+      }
   		
-  	}
+    }
 
   	
-  	//print_r($exif);
+    //print_r($exif);
   }
 
 
 
   public function onAfterWriteNOT() {
-  	error_log('GI: On after write');
-  	parent::onAfterWrite();
+    error_log('GI: On after write');
+    parent::onAfterWrite();
    	
-  	if (!($this->owner->ExifRead)) {
-  		error_log('processing exif data');
-  		$this->processExifData();
-  	}
+    if (!($this->owner->ExifRead)) {
+      error_log('processing exif data');
+      $this->processExifData();
+    }
 
-  	error_log('/GI: On after write');
+    error_log('/GI: On after write');
 
   	
   }
 
-  	public function requireDefaultRecordsNOT() {
-		parent::requireDefaultRecords();
-		error_log('**** REQUIRE DEFAULT RECORDS FOR IMAGES ****');
-		$imagesToProcess = GalleryImage::get()->filter('ExifRead', false);
-		foreach ($imagesToProcess->getIterator() as $image) {
-			$image->processExifData();
-		}
-	}
+    public function requireDefaultRecordsNOT() {
+    parent::requireDefaultRecords();
+    error_log('**** REQUIRE DEFAULT RECORDS FOR IMAGES ****');
+    $imagesToProcess = GalleryImage::get()->filter('ExifRead', false);
+    foreach ($imagesToProcess->getIterator() as $image) {
+      $image->processExifData();
+    }
+  }
 
 
 
-	public function getMappableLatitude() {
+  public function getMappableLatitude() {
     return $this->owner->Lat;
   }
 

code/GalleryFolder.php

Indentation +13 added lines, -13 removed lines

@@ -2,21 +2,21 @@
 
 class GalleryFolder extends PageWithImage {
 
-	private static $allowed_children = array(
-		'GalleryFolder',
-		'GalleryPage'
-	);
+  private static $allowed_children = array(
+    'GalleryFolder',
+    'GalleryPage'
+  );
 
-	public function getCMSFields() {
-		$fields = parent::getCMSFields();
-		$fields->renameField('Content','Brief Summary');
-		return $fields;
-	}
+  public function getCMSFields() {
+    $fields = parent::getCMSFields();
+    $fields->renameField('Content','Brief Summary');
+    return $fields;
+  }
 
-	/* Summary is a remapping of the content */
-	public function Summary() {
-		return $this->Content;
-	}
+  /* Summary is a remapping of the content */
+  public function Summary() {
+    return $this->Content;
+  }
 }
 
 class GalleryFolder_Controller extends PageWithImage_Controller {

code/GalleryPage.php

Indentation +25 added lines, -25 removed lines

@@ -2,40 +2,40 @@ 
 

 class GalleryPage extends PageWithImage {

 	

-	public static $has_many = array(

-    	'GalleryImages' => 'GalleryImage'

-  	);

+  public static $has_many = array(

+      'GalleryImages' => 'GalleryImage'

+    );

 

   private static $db = array(

     'GalleryDate' => 'Date'

   );

 

-   private static $icon = 'ss3gallery/icons/photo.png'; 

+    private static $icon = 'ss3gallery/icons/photo.png'; 

 

   

-   public function getCMSFields() {

-   		$fields = parent::getCMSFields();

-  		$gridFieldConfig = GridFieldConfig_RecordEditor::create(); 

-  		//$gridFieldConfig->addComponent(new GridFieldBulkEditingTools());

-  		$gridFieldConfig->addComponent($gbu = new GridFieldBulkUpload());  

-  		$gridFieldConfig->addComponent($gbm = new GridFieldBulkManager()); 

-  		$gridFieldConfig->addComponent(new GridFieldSortableRows('SortOrder'));    

-  		$galleryimagesi18n = _t('GalleryImage.PLURALNAME', "Gallery Images");

-  		//$gbu->setConfig('fileRelationName','Image');

-  		$gbu->setConfig('folderName', 'galleries/'.$this->ID);

-  		//$gbm->setConfig('editableFields', array('Title'));

-  		$gbm->setConfig('fieldsNameBlacklist', array('Lat','Lon','ZoomLevel'));

-  		$gridfield = new GridField("GalleryImages", $galleryimagesi18n, $this->GalleryImages()->sort("SortOrder"), $gridFieldConfig);

-  		$fields->addFieldToTab('Root.'.$galleryimagesi18n, $gridfield);

+    public function getCMSFields() {

+        $fields = parent::getCMSFields();

+      $gridFieldConfig = GridFieldConfig_RecordEditor::create(); 

+      //$gridFieldConfig->addComponent(new GridFieldBulkEditingTools());

+      $gridFieldConfig->addComponent($gbu = new GridFieldBulkUpload());  

+      $gridFieldConfig->addComponent($gbm = new GridFieldBulkManager()); 

+      $gridFieldConfig->addComponent(new GridFieldSortableRows('SortOrder'));    

+      $galleryimagesi18n = _t('GalleryImage.PLURALNAME', "Gallery Images");

+      //$gbu->setConfig('fileRelationName','Image');

+      $gbu->setConfig('folderName', 'galleries/'.$this->ID);

+      //$gbm->setConfig('editableFields', array('Title'));

+      $gbm->setConfig('fieldsNameBlacklist', array('Lat','Lon','ZoomLevel'));

+      $gridfield = new GridField("GalleryImages", $galleryimagesi18n, $this->GalleryImages()->sort("SortOrder"), $gridFieldConfig);

+      $fields->addFieldToTab('Root.'.$galleryimagesi18n, $gridfield);

 

       $fields->addFieldToTab('Root.Date', new DateField('GalleryDate'));

-  		return $fields;

+      return $fields;

   }

 

 

 

   public function Map() {

-  	$photosWithLocation = $this->GalleryImages()->where('Lat != 0 AND Lon !=0');

+    $photosWithLocation = $this->GalleryImages()->where('Lat != 0 AND Lon !=0');

     if ($photosWithLocation->count() == 0) {

       return 'No locations found'; // don't render a map

     }

@@ -60,10 +60,10 @@ 
 }

 class GalleryPage_Controller extends Page_Controller {

 	

-	public static $allowed_actions = array (

-	);

+  public static $allowed_actions = array (

+  );

 	

-	public function GetGalleryImages() {

-		return $this->GalleryImages()->sort("SortOrder");

-	}

+  public function GetGalleryImages() {

+    return $this->GalleryImages()->sort("SortOrder");

+  }

 }
\ No newline at end of file

code/GalleryImageShortCodeHandler.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $customise['Aperture'] = $galleryImage->Aperture;
         $customise['ShutterSpeed'] = $galleryImage->ShutterSpeed;
     
-         //set the caption
+          //set the caption
         $customise['Title'] = $galleryImage->Title;
    
         //overide the defaults with the arguments supplied

code/GalleryImage.php

Indentation +13 added lines, -13 removed lines

@@ -4,8 +4,8 @@ 
  

   

   public static $db = array(	

-	  'SortOrder' => 'Int',

-	  'Title' => 'Varchar'

+    'SortOrder' => 'Int',

+    'Title' => 'Varchar'

   );

  

   // One-to-one relationship with gallery page

@@ -14,28 +14,28 @@ 
     'GalleryPage' => 'GalleryPage'	

   );

  

- // tidy up the CMS by not showing these fields

+  // tidy up the CMS by not showing these fields

   public function getCMSFields() {

- 		$fields = parent::getCMSFields();

-		$fields->removeFieldFromTab("Root.Main","GalleryPageID");

+      $fields = parent::getCMSFields();

+    $fields->removeFieldFromTab("Root.Main","GalleryPageID");

     $fields->removeFieldFromTab("Root.Main","SortOrder");

     $fields->renameField('Title', _t('GalleryImage.TITLE', 'Title'));

     $fields->renameField('Image', _t('GalleryImage.IMAGE', 'Image'));

 

 

-		return $fields;		

+    return $fields;		

   }

   

   // Tell the datagrid what fields to show in the table

-   public static $summary_fields = array( 

-       'ID' => 'ID',

-	   'Title' => 'Title',

-	   'Thumbnail' => 'Thumbnail'     

-   );

+    public static $summary_fields = array( 

+        'ID' => 'ID',

+      'Title' => 'Title',

+      'Thumbnail' => 'Thumbnail'     

+    );

   

   // this function creates the thumnail for the summary fields to use

-   public function getThumbnail() { 

-     return $this->Image()->CMSThumbnail();

+    public function getThumbnail() { 

+      return $this->Image()->CMSThumbnail();

   }