DataObjects/Core_domain.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 341b7ab..13ba397 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -107,7 +107,7 @@ class Pman_Core_Images extends Pman
             if (empty($_REQUEST['anytype'])) {
                 $img->whereAdd("mimetype like 'image/%'");
             }
-            
+            $img->orderBy('title ASC'); /// spurious ordering... (curretnly used by shipping project)
             if (isset($onbits[2])) {
                 $img->imgtype = $onbits[2];
             }
@@ -160,8 +160,6 @@ class Pman_Core_Images extends Pman
                 urlencode("access to this image/file has been denied."));
         }
         
-        print_R($img);exit;
-        
         $this->serve($img);
         exit;
     }
@@ -273,7 +271,7 @@ class Pman_Core_Images extends Pman
     }
     function validateSize()
     {
-        if (($this->authUser && $this->authUser->company_id && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
+        if (($this->authUser && !empty($this->authUser->company_id) && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
             return true;
         }