We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 25ed2d2c authored by Sarven Capadisli's avatar Sarven Capadisli

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

parents 5d88e643 d018ab7b
......@@ -335,7 +335,11 @@ class Notice extends Memcached_DataObject
$notice->saveTags();
$notice->addToInboxes();
$groups = $notice->saveGroups();
$recipients = $notice->saveReplies();
$notice->addToInboxes($groups, $recipients);
$notice->saveUrls();
......@@ -822,7 +826,7 @@ class Notice extends Memcached_DataObject
return $ids;
}
function whoGets()
function whoGets($groups=null, $recipients=null)
{
$c = self::memcache();
......@@ -833,6 +837,14 @@ class Notice extends Memcached_DataObject
}
}
if (is_null($groups)) {
$groups = $this->getGroups();
}
if (is_null($recipients)) {
$recipients = $this->getReplies();
}
$users = $this->getSubscribedUsers();
// FIXME: kind of ignoring 'transitional'...
......@@ -845,7 +857,6 @@ class Notice extends Memcached_DataObject
$ni[$id] = NOTICE_INBOX_SOURCE_SUB;
}
$groups = $this->saveGroups();
$profile = $this->getProfile();
foreach ($groups as $group) {
......@@ -860,8 +871,6 @@ class Notice extends Memcached_DataObject
}
}
$recipients = $this->saveReplies();
foreach ($recipients as $recipient) {
if (!array_key_exists($recipient, $ni)) {
......@@ -880,9 +889,9 @@ class Notice extends Memcached_DataObject
return $ni;
}
function addToInboxes()
function addToInboxes($groups, $recipients)
{
$ni = $this->whoGets();
$ni = $this->whoGets($groups, $recipients);
Inbox::bulkInsert($this->id, array_keys($ni));
......@@ -1086,6 +1095,52 @@ class Notice extends Memcached_DataObject
return $recipientIds;
}
function getReplies()
{
// XXX: cache me
$ids = array();
$reply = new Reply();
$reply->selectAdd();
$reply->selectAdd('profile_id');
$reply->notice_id = $this->id;
if ($reply->find()) {
while($reply->fetch()) {
$ids[] = $reply->profile_id;
}
}
$reply->free();
return $ids;
}
function getGroups()
{
// XXX: cache me
$ids = array();
$gi = new Group_inbox();
$gi->selectAdd();
$gi->selectAdd('group_id');
$gi->notice_id = $this->id;
if ($gi->find()) {
while ($gi->fetch()) {
$ids[] = $gi->group_id;
}
}
$gi->free();
return $ids;
}
function asAtomEntry($namespace=false, $source=false)
{
$profile = $this->getProfile();
......
......@@ -46,8 +46,6 @@ class ImapPlugin extends Plugin
public $user;
public $password;
public $poll_frequency = 60;
public static $instances = array();
public static $daemon_added = array();
function initialize(){
if(!isset($this->mailbox)){
......@@ -63,24 +61,34 @@ class ImapPlugin extends Plugin
throw new Exception("must specify a poll_frequency");
}
self::$instances[] = $this;
return true;
}
function cleanup(){
$index = array_search($this, self::$instances);
unset(self::$instances[$index]);
return true;
/**
* Load related modules when needed
*
* @param string $cls Name of the class to be loaded
*
* @return boolean hook value; true means continue processing, false means stop.
*/
function onAutoload($cls)
{
$dir = dirname(__FILE__);
switch ($cls)
{
case 'ImapManager':
case 'IMAPMailHandler':
include_once $dir . '/'.strtolower($cls).'.php';
return false;
default:
return true;
}
}
function onGetValidDaemons($daemons)
function onStartIoManagerClasses(&$classes)
{
if(! self::$daemon_added){
array_push($daemons, INSTALLDIR .
'/plugins/Imap/imapdaemon.php');
self::$daemon_added = true;
}
return true;
$classes[] = new ImapManager($this);
}
function onPluginVersion(&$versions)
......
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
class IMAPMailHandler extends MailHandler
{
function error($from, $msg)
{
$this->log(LOG_INFO, "Error: $from $msg");
$headers['To'] = $from;
$headers['Subject'] = _m('Error');
return mail_send(array($from), $headers, $msg);
}
}
#!/usr/bin/env php
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
/**
* StatusNet, the distributed open-source microblogging tool
*
* This program is free software: you can redistribute it and/or modify
* IMAP IO Manager
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
......@@ -16,63 +18,101 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @copyright 2009-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
$shortoptions = 'fi::';
$longoptions = array('id::', 'foreground');
$helptext = <<<END_OF_IMAP_HELP
Daemon script for receiving new notices from users via a mail box (IMAP, POP3, etc)
-i --id Identity (default none)
-f --foreground Stay in the foreground (default background)
class ImapManager extends IoManager
{
protected $conn = null;
END_OF_IMAP_HELP;
function __construct($plugin)
{
$this->plugin = $plugin;
}
require_once INSTALLDIR.'/scripts/commandline.inc';
/**
* Fetch the singleton manager for the current site.
* @return mixed ImapManager, or false if unneeded
*/
public static function get()
{
throw new Exception('ImapManager should be created using it\'s constructor, not the static get method');
}
require_once INSTALLDIR . '/lib/common.php';
require_once INSTALLDIR . '/lib/daemon.php';
require_once INSTALLDIR.'/lib/mailhandler.php';
/**
* Lists the IM connection socket to allow i/o master to wake
* when input comes in here as well as from the queue source.
*
* @return array of resources
*/
public function getSockets()
{
return array();
}
class IMAPDaemon extends Daemon
{
function __construct($resource=null, $daemonize=true, $attrs)
/**
* Tell the i/o master we need one instance for each supporting site
* being handled in this process.
*/
public static function multiSite()
{
parent::__construct($daemonize);
return IoManager::INSTANCE_PER_SITE;
}
foreach ($attrs as $attr=>$value)
/**
* Initialize connection to server.
* @return boolean true on success
*/
public function start($master)
{
if(parent::start($master))
{
$this->$attr = $value;
$this->conn = $this->connect();
return true;
}else{
return false;
}
$this->log(LOG_INFO, "INITIALIZE IMAPDaemon {" . $this->name() . "}");
}
function name()
public function handleInput($socket)
{
return strtolower('imapdaemon.'.$this->user.'.'.crc32($this->mailbox));
$this->check_mailbox();
return true;
}
function run()
public function poll()
{
$this->connect();
while(true)
{
if(imap_ping($this->conn) || $this->connect())
{
$this->check_mailbox();
}
sleep($this->poll_frequency);
return $this->check_mailbox() > 0;
}
function pollInterval()
{
return $this->plugin->poll_frequency;
}
protected function connect()
{
$this->conn = imap_open($this->plugin->mailbox, $this->plugin->user, $this->plugin->password);
if($this->conn){
common_log(LOG_INFO, "Connected");
return $this->conn;
}else{
common_log(LOG_INFO, "Failed to connect: " . imap_last_error());
return $this->conn;
}
}
function check_mailbox()
protected function check_mailbox()
{
imap_ping($this->conn);
$count = imap_num_msg($this->conn);
$this->log(LOG_INFO, "Found $count messages");
common_log(LOG_INFO, "Found $count messages");
if($count > 0){
$handler = new IMAPMailHandler();
for($i=1; $i <= $count; $i++)
......@@ -82,66 +122,8 @@ class IMAPDaemon extends Daemon
imap_delete($this->conn, $i);
}
imap_expunge($this->conn);
$this->log(LOG_INFO, "Finished processing messages");
common_log(LOG_INFO, "Finished processing messages");
}
return $count;
}
function log($level, $msg)
{
$text = $this->name() . ': '.$msg;
common_log($level, $text);
if (!$this->daemonize)
{
$line = common_log_line($level, $text);
echo $line;
echo "\n";
}
}
function connect()
{
$this->conn = imap_open($this->mailbox, $this->user, $this->password);
if($this->conn){
$this->log(LOG_INFO, "Connected");
return true;
}else{
$this->log(LOG_INFO, "Failed to connect: " . imap_last_error());
return false;
}
}
}
class IMAPMailHandler extends MailHandler
{
function error($from, $msg)
{
$this->log(LOG_INFO, "Error: $from $msg");
$headers['To'] = $from;
$headers['Subject'] = _m('Error');
return mail_send(array($from), $headers, $msg);
}
}
if (have_option('i', 'id')) {
$id = get_option_value('i', 'id');
} else if (count($args) > 0) {
$id = $args[0];
} else {
$id = null;
}
$foreground = have_option('f', 'foreground');
foreach(ImapPlugin::$instances as $pluginInstance){
$daemon = new IMAPDaemon($id, !$foreground, array(
'mailbox' => $pluginInstance->mailbox,
'user' => $pluginInstance->user,
'password' => $pluginInstance->password,
'poll_frequency' => $pluginInstance->poll_frequency
));
$daemon->runOnce();
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment