Added delete and removed Kohana

resources/views/layouts/app.blade.php

@@ -47,6 +47,7 @@
             <div class="collapse navbar-collapse" id="app-navbar-collapse">
                 <!-- Left Side Of Navbar -->
                 <ul class="nav navbar-nav">
+                    <li><a href="{{ url('/deletes') }}">Deletes</a></li>
                     <li><a href="{{ url('/duplicates') }}">Duplicates</a></li>
                 </ul>
 

resources/views/photo/deletereview.blade.php

@@ -0,0 +1,74 @@
+@extends('layouts.app')
+
+@section('content')
+<?php $data = [
+	'ID'=>'id',
+	'Thumbnail'=>'thumbnail',
+	'Signature'=>'signature',
+	'Date Taken'=>'datetaken',
+	'File Created'=>'created',
+	'File Modified'=>'modified',
+	'Filename'=>'filepath',
+	'Filesize'=>'filesize',
+	'Width'=>'width',
+	'Height'=>'height',
+	'Orientation'=>'orientation',
+	'Make'=>'make',
+	'Model'=>'model',
+	'Duplicates'=>'duplicates',
+	'Is Duplicate'=>'duplicate',
+	'Flagged'=>'flag',
+	'Delete'=>'remove',
+];?>
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-11 col-md-offset-1">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					Permanently Delete Photos
+				</div>
+
+				<div class="text-center">{{ $photos->links() }}</div>
+				<div class="panel-body">
+					<form action="{{ url('/deletes') }}" method="POST">
+					<table class="table table-striped table-condensed table-hover">
+					@foreach ($data as $k=>$v)
+						<tr>
+						<th>{{ $k }}</th>
+@foreach ($photos as $o)
+<?php
+switch ($v) :
+case 'id': $x=$o->id; $y=sprintf('<input type="hidden" name="photo[]" value="%s"><a href="%s">%s</a>',$o->id,url('/info/'.$o->id),$o->id); break;
+case 'thumbnail': $x=md5($o->thumbnail); $y=sprintf('<a href="%s"><img src="%s" width="200px"></a>',url('/view/'.$o->id),url('/thumbnail/'.$o->id)); break;
+case 'signature': $x=$y=$o->signature(TRUE); break;
+case 'datetaken': $x=$y=$o->date_taken(); break;
+case 'created': $x=$y=$o->file_date('c',TRUE); break;
+case 'modified': $x=$y=$o->file_date('m',TRUE); break;
+case 'filepath': $x=$y=$o->file_path(TRUE); break;
+case 'filesize': $x=$y=$o->file_size(); break;
+case 'width':
+case 'height':
+case 'orientation':
+case 'make':
+case 'model': $y=$o->{$v}; break;
+case 'duplicates': $x=$y='';foreach($o->list_duplicate() as $id) $y.=($y ? '|' : '').sprintf('<a href="%s">%s</a>',url('/info/'.$id),$id); break;
+case 'flag':
+case 'remove':
+case 'duplicate': $y=sprintf('<input type="checkbox" name="%s[%s]" value="1"%s>',$v,$o->id,$o->{$v} ? ' checked="checked"' : ''); break;
+endswitch ?>
+							<td><?php echo $y; ?></td>
+						@endforeach {{-- photo --}}
+						</tr>
+					@endforeach {{-- data --}}
+					</table>
+					<input type="hidden" name="pagenext" value="{{ $photos->hasMorePages() ? $photos->currentPage()+1 : NULL }}">
+					<button class="btn btn-default">Confirm Delete</button>
+					{{ csrf_field() }}
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+@endsection

resources/views/photo/duplicates.blade.php

@@ -17,13 +17,13 @@
 	'Model'=>'model',
 	'Exif Diff'=>'exif',
 ];
+
 $form = [
 'duplicate',
 'flag',
 'remove',
 ];
 
-
 function changed($k,$v,$l=0)
 {
 	static $changed = [];
@@ -31,7 +31,7 @@ function changed($k,$v,$l=0)
 	if (! isset($changed[$l][$k]))
 		$changed[$l][$k] = $v;
 
-	return $changed[$l][$k] == $v;
+	return $changed[$l][$k] === $v;
 } ?>
 
 @foreach ($photos as $photo)
@@ -62,13 +62,13 @@ case 'datetaken': $x=$y=$o->date_taken(); break;
 case 'created': $x=$y=$o->file_date('c',TRUE); break;
 case 'modified': $x=$y=$o->file_date('m',TRUE); break;
 case 'filepath': $x=$y=$o->file_path(TRUE); break;
-case 'filesize': $x=$y=$o->size(); break;
+case 'filesize': $x=$y=$o->file_size(); break;
 case 'width': $x=$y=$o->width; break;
 case 'height': $x=$y=$o->height; break;
 case 'orientation': $x=$y=$o->orientation; break;
 case 'make': $x=$y=$o->make; break;
 case 'model': $x=$y=$o->model; break;
-case 'exif': $y='<table class="table table-striped table-condensed">'; foreach ($o->info() as $a => $b) $y.=sprintf('<tr class="%s"><th>%s<><td>%s<td></tr>',(changed($a,$b,1) ? '' : 'warning'),$a,$b); $y.='</table>';$x=md5($y); break;
+case 'exif': $y='<table class="table table-striped table-condensed">'; foreach ($o->properties() as $a => $b) $y.=sprintf('<tr class="%s"><th>%s<><td>%s<td></tr>',(changed($a,$b,1) ? '' : 'warning'),$a,$b); $y.='</table>';$x=md5($y); break;
 endswitch ?>
 							<td class="{{ changed($v,$x) ? '' : 'danger' }}"><?php echo $y; ?></td>
 						@endforeach {{-- photo --}}

resources/views/photo/view.blade.php

@@ -27,7 +27,7 @@
 							<?php if ($photo->shouldMove()) : ?>
 								<dt>NEW Filename</dt><dd>{{ $photo->file_path(TRUE,TRUE) }}<dd>
 							<?php endif ?>
-							<dt>Size</dt><dd>{{ $photo->size() }}<dd>
+							<dt>Size</dt><dd>{{ $photo->file_size() }}<dd>
 							<dt>Dimensions</dt><dd>{{ $photo->width }} x {{ $photo->height }} @ {{ $photo->orientation }}<dd>
 							<br/>
 							<dt>Date Taken</dt><dd>{{ $photo->date_taken() }}<dd>
@@ -57,7 +57,7 @@
 							<br/>
 							<dt>Exif Data</dt><dd>
 								<table>
-								<?php foreach ($photo->info() as $k => $v) : ?>
+								<?php foreach ($photo->properties() as $k => $v) : ?>
 								<tr><th>{{ $k }}<><td>{{ $v }}<td></tr>
 								<?php endforeach ?>
 								</table>