aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-18 15:16:51 -0700
committerFriendika <info@friendika.com>2011-04-18 15:16:51 -0700
commit1e967eddb75ebed6712e33735971d53b009442dd (patch)
tree1ee46b6938e4439e9ab8489d481c8374b488d41b
parent741a262f1b2d5c8f911896da32e80d543afb5cd1 (diff)
downloadvolse-hubzilla-1e967eddb75ebed6712e33735971d53b009442dd.tar.gz
volse-hubzilla-1e967eddb75ebed6712e33735971d53b009442dd.tar.bz2
volse-hubzilla-1e967eddb75ebed6712e33735971d53b009442dd.zip
multi-user, do not cache open mbox
-rw-r--r--boot.php2
-rw-r--r--include/poller.php44
2 files changed, 22 insertions, 24 deletions
diff --git a/boot.php b/boot.php
index 7a8f00fbe..b738125c8 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
set_time_limit(0);
-define ( 'FRIENDIKA_VERSION', '2.1.952' );
+define ( 'FRIENDIKA_VERSION', '2.1.953' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1053 );
diff --git a/include/poller.php b/include/poller.php
index 82ac89cf5..4373dc081 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -16,7 +16,6 @@ function poller_run($argv, $argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
- $mbox = null;
require_once('session.php');
require_once('datetime.php');
@@ -288,26 +287,25 @@ function poller_run($argv, $argc){
$xml = fetch_url($contact['poll']);
}
elseif($contact['network'] === NETWORK_MAIL) {
- if(! $mbox) {
- $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($importer_uid)
- );
- $mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
- intval($importer_uid)
- );
- if(count($x) && count($mailconf)) {
- $mailbox = construct_mailbox_name($mailconf[0]);
- $password = '';
- openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
- $mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
- unset($password);
- if($mbox) {
- q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
- dbesc(datetime_convert()),
- intval($mailconf[0]['id']),
- intval($importer_uid)
- );
- }
+ $mbox = null;
+ $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
+ intval($importer_uid)
+ );
+ $mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
+ intval($importer_uid)
+ );
+ if(count($x) && count($mailconf)) {
+ $mailbox = construct_mailbox_name($mailconf[0]);
+ $password = '';
+ openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
+ $mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
+ unset($password);
+ if($mbox) {
+ q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ dbesc(datetime_convert()),
+ intval($mailconf[0]['id']),
+ intval($importer_uid)
+ );
}
}
if($mbox) {
@@ -383,6 +381,8 @@ function poller_run($argv, $argc){
);
}
}
+
+ imap_close($mbox);
}
}
elseif($contact['network'] === NETWORK_FACEBOOK) {
@@ -435,8 +435,6 @@ function poller_run($argv, $argc){
}
}
- if($mbox && function_exists('imap_close'))
- imap_close($mbox);
return;
}