output queue (merges the old deliverq and queue and adds some zotness)

3 files changed, 20 insertions, 2 deletions

diff --git a/database.sql b/database.sql
index fc162833a..c096c0f12 100644
--- a/database.sql
+++ b/database.sql
@@ -660,6 +660,24 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
   KEY `receiver-uid` (`receiver-uid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `outq` (
+  `outq_hash` char(255) NOT NULL,
+  `outq_account` int(10) unsigned NOT NULL DEFAULT '0',
+  `outq_channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `outq_xchan` char(255) NOT NULL DEFAULT '',
+  `outq_hub` char(255) NOT NULL DEFAULT '',
+  `outq_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `outq_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `outq_msg` mediumtext NOT NULL,
+  PRIMARY KEY (`outq_hash`),
+  KEY `outq_account` (`outq_account`),
+  KEY `outq_channel` (`outq_channel`),
+  KEY `outq_xchan` (`outq_xchan`),
+  KEY `outq_hub` (`outq_hub`),
+  KEY `outq_created` (`outq_created`),
+  KEY `outq_updated` (`outq_updated`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 CREATE TABLE IF NOT EXISTS `pconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL DEFAULT '0',
diff --git a/include/Photo.php b/include/Photo.php
index d5cbb8d24..819f86059 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -622,7 +622,7 @@ function guess_image_type($filename, $fromcurl=false) {
     }
     if (is_null($type)){
         // Guessing from extension? Isn't that... dangerous?
-        if(class_exists('Imagick')) {
+        if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
             /**
              * Well, this not much better,
              * but at least it comes from the data inside the image,
diff --git a/version.inc b/version.inc
index b84f9e5e1..990bcc9a2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-10-16.109
+2012-10-17.110