Refactor a bit

* move a lot of stuff out of MessageManager
* move models from lib to models

3 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/InformationPlugin.class.php b/src/plugins/InformationPlugin.class.php
index 6a37370..0267ccf 100644
--- a/src/plugins/InformationPlugin.class.php
+++ b/src/plugins/InformationPlugin.class.php
@@ -22,4 +22,6 @@ class InformationPlugin extends Plugin {
 		                       'Why you want to be on the team',
 		                       'textarea');
 	}
+	public function sendPrivate($to, $id, $subject, $body) {}
+	public function sendBroadcast($id, $subject, $body) {}
 }
diff --git a/src/plugins/SenderGVSMS.class.php b/src/plugins/SenderGVSMS.class.php
index 90f9e69..7919007 100644
--- a/src/plugins/SenderGVSMS.class.php
+++ b/src/plugins/SenderGVSMS.class.php
@@ -1,9 +1,8 @@
 <?php
 
-require_once('SenderPrivate.class.php');
 require_once('GoogleVoice.class.php');
 
-class SenderGVSMS extends SenderPrivate {
+class SenderGVSMS extends Plugin {
 	protected $config = array('username'=>'',
 	                          'password'=>'',
 	                          'length'=>160);
@@ -23,7 +22,7 @@ class SenderGVSMS extends SenderPrivate {
 		                             $this->config['password']);
 	}
 	
-	public function send($phoneNum, $id, $subject, $body) {
+	public function sendPrivate($phoneNum, $id, $subject, $body) {
 		global $shorturl, $messenger;
 		$url = $shorturl->get($messenger->id2url($id));
 		$maxlen = $this->config['length']-(strlen($url)+1);
diff --git a/src/plugins/SenderIdentica.class.php b/src/plugins/SenderIdentica.class.php
index ac62dc3..1e778f6 100644
--- a/src/plugins/SenderIdentica.class.php
+++ b/src/plugins/SenderIdentica.class.php
@@ -1,9 +1,8 @@
 <?php
 
-require_once('SenderBroadcast.class.php');
 require_once('Identica.class.php');
 
-class SenderIdentica extends SenderBroadcast {
+class SenderIdentica extends Plugin {
 	protected $config = array('username'=>'',
 	                          'password'=>'',
 	                          'length'=>140);
@@ -24,7 +23,7 @@ class SenderIdentica extends SenderBroadcast {
 		                          $this->config['password']);
 	}
 	
-	public function send($id, $subject, $body) {
+	public function sendBroadcast($id, $subject, $body) {
 		global $shorturl, $messenger;
 		$url = $shorturl->get($messenger->id2url($id));
 		$maxlen = $this->config['length']-(strlen($url)+1);