File structure style fixes

12 files changed, 24 insertions, 24 deletions

diff --git a/core/helpers/movie.php b/core/helpers/movie.php
index 5d64aa1f..9941fcee 100644
--- a/core/helpers/movie.php
+++ b/core/helpers/movie.php
@@ -108,7 +108,7 @@ class movie_Core {
     return array($width, $height);
   }
 
-  function extract_frame($input_file, $output_file) {
+  static function extract_frame($input_file, $output_file) {
     if (!$ffmpeg = exec("which ffmpeg")) {
       throw new Exception("@todo MISSING_FFMPEG");
     }
diff --git a/core/views/simple_uploader.html.php b/core/views/simple_uploader.html.php
index ed4fad08..fd06a72c 100644
--- a/core/views/simple_uploader.html.php
+++ b/core/views/simple_uploader.html.php
@@ -6,10 +6,10 @@
   </fieldset>
 
   <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	  id="SimpleUploader"
+          id="SimpleUploader"
           width="470px"
           height="400px"
-	  codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+          codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
     <param name="movie" value="<?= url::file("core/SimpleUploader.swf") ?>" />
     <param name="flashVars" value="<?= $flash_vars ?>" />
     <param name="quality" value="high" />
@@ -18,15 +18,15 @@
     <embed src="<?= url::file("core/SimpleUploader.swf") ?>"
            quality="high"
            bgcolor="#ffffff"
-	   flashVars="<?= $flash_vars ?>"
-	   width="470" height="400" name="<?= url::file("core/SimpleUploader.swf") ?>"
+           flashVars="<?= $flash_vars ?>"
+           width="470" height="400" name="<?= url::file("core/SimpleUploader.swf") ?>"
            align="middle"
-	   play="true"
-	   loop="false"
-	   quality="high"
-	   allowScriptAccess="sameDomain"
-	   type="application/x-shockwave-flash"
-	   pluginspage="http://www.adobe.com/go/getflashplayer">
+           play="true"
+           loop="false"
+           quality="high"
+           allowScriptAccess="sameDomain"
+           type="application/x-shockwave-flash"
+           pluginspage="http://www.adobe.com/go/getflashplayer">
     </embed>
   </object>
 
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index 55877140..50a772b5 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -25,7 +25,7 @@ class exif_Core {
 
   protected static $exif_keys;
 
-  public static function extract($item) {
+  static function extract($item) {
     ORM::factory("exif_key")->where("item_id", $item->id)->delete_all();
 
     // Only try to extract EXIF from photos
@@ -68,7 +68,7 @@ class exif_Core {
     $record->save();
   }
 
-  public static function get($item, $summary=true) {
+  static function get($item, $summary=true) {
     $exif = array();
     $exif_key = ORM::factory("exif_key")
       ->where("item_id", $item->id);
diff --git a/modules/local_import/helpers/local_import.php b/modules/local_import/helpers/local_import.php
index ca7d01e4..d40b6016 100644
--- a/modules/local_import/helpers/local_import.php
+++ b/modules/local_import/helpers/local_import.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class local_import {
-  public static function get_admin_page() {
+  static function get_admin_page() {
     $template = new View("local_import_admin.html");
 
     $paths = unserialize(module::get_var("local_import", "authorized_paths", "a:0:{}"));
@@ -30,7 +30,7 @@ class local_import {
     return $template;
   }
 
-  public static function get_admin_form() {
+  static function get_admin_form() {
     $form  = new Forge("admin/local_import/add_path", "", "post", array("id" => "gLocalImportAdminForm"));
     $add_path = $form->group("add_path");
     $add_path->input("path")->label(t("Path"))->rules("required")
diff --git a/modules/local_import/helpers/local_import_block.php b/modules/local_import/helpers/local_import_block.php
index c337af41..b412f338 100644
--- a/modules/local_import/helpers/local_import_block.php
+++ b/modules/local_import/helpers/local_import_block.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class local_import_block_Core {
-  public static function head($theme) {
+  static function head($theme) {
     $head[] = html::script("modules/local_import/js/local_import.js");
 
     $url = url::file("modules/local_import/css/local_import.css");
diff --git a/modules/local_import/helpers/local_import_installer.php b/modules/local_import/helpers/local_import_installer.php
index 0af35669..ea9b5d93 100644
--- a/modules/local_import/helpers/local_import_installer.php
+++ b/modules/local_import/helpers/local_import_installer.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class local_import_installer {
-  public static function install() {
+  static function install() {
     $db = Database::instance();
     $version = module::get_version("local_import");
     if ($version == 0) {
@@ -31,7 +31,7 @@ class local_import_installer {
     }
   }
 
-  public static function uninstall() {
+  static function uninstall() {
     access::delete_permission("local_import");
     $module = module::get("local_import");
 
diff --git a/modules/local_import/views/local_import_admin.html.php b/modules/local_import/views/local_import_admin.html.php
index d53c5db8..f26f57ad 100644
--- a/modules/local_import/views/local_import_admin.html.php
+++ b/modules/local_import/views/local_import_admin.html.php
@@ -1,4 +1,4 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
+<?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gLocalImportAdmin">
   <h2>
     <?= t("Local Import Admininstration") ?>
diff --git a/modules/local_import/views/local_import_dir_list.html.php b/modules/local_import/views/local_import_dir_list.html.php
index 08beba82..d2a8fb57 100644
--- a/modules/local_import/views/local_import_dir_list.html.php
+++ b/modules/local_import/views/local_import_dir_list.html.php
@@ -1,4 +1,4 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
+<?php defined("SYSPATH") or die("No direct script access.") ?>
 <span><?= t("Authorized Paths") ?></span>
 <ul id="gPathList">
 <? foreach ($paths as $id => $path): ?>
diff --git a/modules/local_import/views/local_import_tree.html.php b/modules/local_import/views/local_import_tree.html.php
index 21d0095a..e515852a 100644
--- a/modules/local_import/views/local_import_tree.html.php
+++ b/modules/local_import/views/local_import_tree.html.php
@@ -1,4 +1,4 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
+<?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
 $("#<?= $uid ?>").ready(function() {
   $("#<?= $uid ?> span.ui-icon").click(function(event) {
diff --git a/modules/local_import/views/local_import_tree_dialog.html.php b/modules/local_import/views/local_import_tree_dialog.html.php
index 4639545a..e553b54b 100644
--- a/modules/local_import/views/local_import_tree_dialog.html.php
+++ b/modules/local_import/views/local_import_tree_dialog.html.php
@@ -1,4 +1,4 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
+<?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
 $("#gLocalImport").ready(function() {
   $("#gLocalImport :submit").click(function(event) {
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index b65f79fa..a4517d49 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -57,7 +57,7 @@
             <ul>
           <? elseif ($last_letter != $current_letter): /* new letter */ ?>
             <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
-            	</td>
+               </td>
               <td>
               <? $column_tag_count = 0 ?>
             <? endif ?>
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 85a9cacf..f15bf152 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -16,7 +16,7 @@
         media="screen,projection" />
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
         media="screen,projection" />
-		<!--[if IE]>
+   <!--[if IE]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->