Refactor a bit

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

1 files changed, 2 insertions, 3 deletions

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);