- (Bug Fix) Fixed more stability issues

objectivehtml · objectivehtml · commit 74c23fef69c7 · 2014-12-10T22:21:33.000-05:00
diff --git a/PostmasterPlugin.php b/PostmasterPlugin.php
@@ -54,17 +54,6 @@ public function init()
 
         require_once 'bootstrap.php';
 
-        /*
-        $plugin = $this;
-
-        craft()->on('postmaster.test', function(Event $event)
-        {
-            exit('asd');
-        });
-
-        $this->raiseEvent('onTest', new Event());
-        */
-
         craft()->on('plugins.loadPlugins', function(Event $event)
         {
             craft()->postmaster->onInit(new Event());
@@ -73,7 +62,7 @@ public function init()
             {
                 $parcel->init();
             }
-            
+
         });
 
     }
diff --git a/core/components/BaseParcelType.php b/core/components/BaseParcelType.php
@@ -14,11 +14,6 @@ abstract class BaseParcelType extends BasePlugin implements ParcelTypeInterface
 
 	protected $parcel;
 
-	public function init()
-	{
-
-	}
-
 	public function getInputHtml(Array $data = array())
 	{
 		return '';
@@ -29,23 +24,6 @@ public function getSettingsInputHtml(Array $data = array())
 		return '';
 	}
 
-	/*
-	public function send()
-	{
-
-	}
-
-	public function setService(BaseService $service)
-	{
-		$this->service = $service;
-	}
-
-	public function getService()
-	{
-		return $this->service;
-	}
-	*/
-
 	public function setParcelModel(Postmaster_ParcelModel $parcel)
 	{
 		$this->parcel = $parcel;
diff --git a/core/components/BasePlugin.php b/core/components/BasePlugin.php
@@ -8,6 +8,11 @@ abstract class BasePlugin extends Settings implements PluginInterface, SettingsI
 
 	protected $settings;
 
+	public function init()
+	{
+		
+	}
+
 	public function registerCpRoutes()
 	{
 		return array();
diff --git a/core/interfaces/PluginInterface.php b/core/interfaces/PluginInterface.php
@@ -3,6 +3,8 @@
 
 interface PluginInterface {
 	
+	public function init();
+
 	public function registerCpRoutes();
 
 }
diff --git a/core/parcel_types/DefaultParcelType.php b/core/parcel_types/DefaultParcelType.php
@@ -13,8 +13,6 @@ class DefaultParcelType extends BaseParcelType {
 
 	public function init()
 	{
-        return;
-        
 		foreach($this->settings->events as $event)
         {
             $parcelType = $this;
diff --git a/models/Postmaster_ParcelModel.php b/models/Postmaster_ParcelModel.php
@@ -11,21 +11,19 @@ public function __construct($attributes = null)
     {
         parent::__construct($attributes);
 
-        if(is_string($this->settings))
+        if(is_array($this->settings))
         {
-            $this->settings = json_decode($this->settings);
-        }
-
-        if(!$this->settings instanceof Postmaster_ParcelSettingsModel)
-        {
-            $this->settings = new Postmaster_ParcelSettingsModel((array) $this->settings);
+            $this->setAttribute('settings', new Postmaster_ParcelSettingsModel($this->settings));
         }
     }
 
     public function init()
     {
         $parcelType = $this->getParcelType();
+        $service = $this->getService();
+
         $parcelType->init();
+        $service->init();
     }
 
 	public function getTableName()
@@ -48,33 +46,45 @@ public function getSetting($key)
         return;
     }
 
-    public function getParcelTypeSettings($id)
+    public function getParcelTypeSettingsById($id)
     {
-        $this->settings->getParcelTypeSettings($id);
+        return $this->settings->getParcelTypeSettingsById($id);
     }
 
     public function setParcelTypeSettings($id, Array $settings = array())
     {     
-        $this->settings->setParcelTypeSettings($id, $settings);
+        return $this->settings->setParcelTypeSettings($id, $settings);
     }
 
-    public function getServiceSettings($id)
+    public function getServiceSettingsByid($id)
     {
-        $this->settings->setServiceSettings($id);
+        return $this->settings->getServiceSettingsById($id);
     }
 
     public function setServiceSettings($id, Array $settings = array())
     {        
-        $this->settings->setServiceSettings($id, $settings);
+        return $this->settings->setServiceSettings($id, $settings);
     }
 
-    public function getService()
+    public function getService($class = false)
     {
         if(is_null($this->_service))
         {
-            $class = $this->settings->service;
+            if(!$class)
+            {
+                $class = $this->settings->service;
+            }
+
             $class = new $class();
-            $class->setSettings($class->createSettingsModel($this->getServiceSettings($class->id)));
+
+            $settings = $this->getServiceSettingsById($class->id);
+
+            if(is_array($settings))
+            {
+                $settings = $class->createSettingsModel($settings);
+            }
+
+            $class->setSettings($settings);
 
             $this->_service = $class;
         }
@@ -92,8 +102,15 @@ public function getParcelType($class = false)
             }
 
             $class = new $class();
-            $class->setSettings($class->createSettingsModel($this->getParcelTypeSettings($class->id)));
-            // $class->setService($this->getService());
+
+            $settings = $this->getParcelTypeSettingsById($class->id);
+
+            if(is_array($settings))
+            {
+                $settings = $class->createSettingsModel($settings);
+            }
+
+            $class->setSettings($settings);
             $class->setParcelModel($this);
 
             $this->_parcelType = $class;
@@ -112,6 +129,7 @@ protected function defineAttributes()
     {
         return array(
             'title'     => array(AttributeType::String, 'column' => ColumnType::Text),
+            'parcelType'     => array(AttributeType::String, 'column' => ColumnType::Text, 'default' => 'default'),
             'settings'  => array(AttributeType::Mixed, 'column' => ColumnType::LongText, 'default' => array()),
             'enabled'  => array(AttributeType::Bool, 'column' => ColumnType::Int, 'default' => 1),
             'id'     => array(AttributeType::String, 'column' => ColumnType::Text),
diff --git a/models/Postmaster_ParcelSettingsModel.php b/models/Postmaster_ParcelSettingsModel.php
@@ -6,53 +6,16 @@ class Postmaster_ParcelSettingsModel extends BaseModel
     public function __construct($attributes = null)
     {
         parent::__construct($attributes);
+    }
 
-        $parcelTypeSettings = $this->parcelTypeSettings;
-
-        foreach(craft()->postmaster->getRegisteredParcelTypes() as $parcelType)
-        {
-            if(!isset($parcelTypeSettings[$parcelType->id]))
-            {
-                $parcelTypeSettings[$parcelType->id] = array();
-            }
-        }
-
-        $this->parcelTypeSettings = $parcelTypeSettings;
-
-        foreach($this->parcelTypeSettings as $id => $parcelTypeSettings)
-        {
-            $class = craft()->postmaster->getRegisteredParcelType($id);
-
-            $settings = $class->createSettingsModel($parcelTypeSettings);
-
-            $this->setParcelTypeSettings($id, $settings->getAttributes());
-        }
-
-
-        $serviceSettings = $this->serviceSettings;
-
-        foreach(craft()->postmaster->getRegisteredServices() as $service)
-        {
-            if(!isset($serviceSettings[$service->id]))
-            {
-                $serviceSettings[$service->id] = array();
-            }
-        }
-
-        $this->serviceSettings = $serviceSettings;
-
-        foreach($this->serviceSettings as $id => $serviceSettings)
-        {
-            $class = craft()->postmaster->getRegisteredService($id);
-
-            $settings = $class->createSettingsModel($serviceSettings);
-
-            $this->setServiceSettings($id, $settings->getAttributes());
-        }
+    public function setAttributes($attributes = null)
+    {
+        parent::setAttributes($attributes);
 
+        $this->_sanitizeSettings();
     }
 
-    public function getServiceSettings($id)
+    public function getServiceSettingsById($id)
     {
         $settings = array();
 
@@ -64,7 +27,7 @@ public function getServiceSettings($id)
         return $settings;
     }
     
-    public function setServiceSettings($id, Array $settings = array())
+    public function setServiceSettings($id, $settings = array())
     {        
         if(isset($this->serviceSettings[$id]))
         {
@@ -75,7 +38,7 @@ public function setServiceSettings($id, Array $settings = array())
         }
     }
 
-    public function getParcelTypeSettings($id)
+    public function getParcelTypeSettingsById($id)
     {
         $settings = array();
 
@@ -87,7 +50,7 @@ public function getParcelTypeSettings($id)
         return $settings;
     }
 
-    public function setParcelTypeSettings($id, Array $settings = array())
+    public function setParcelTypeSettings($id, $settings = array())
     {        
         if(isset($this->parcelTypeSettings[$id]))
         {
@@ -107,4 +70,49 @@ protected function defineAttributes()
             'serviceSettings' => array(AttributeType::Mixed, 'default' => array())
         );
     }
+
+    private function _sanitizeSettings()
+    {
+        $parcelTypeSettings = $this->parcelTypeSettings;
+
+        foreach(craft()->postmaster->getRegisteredParcelTypes() as $parcelType)
+        {
+            if(!isset($parcelTypeSettings[$parcelType->id]))
+            {
+                $parcelTypeSettings[$parcelType->id] = array();
+            }
+        }
+
+        $this->parcelTypeSettings = $parcelTypeSettings;
+
+        foreach($this->parcelTypeSettings as $id => $parcelTypeSettings)
+        {
+            $class = craft()->postmaster->getRegisteredParcelType($id);
+
+            $settings = $class->createSettingsModel($parcelTypeSettings);
+
+            $this->setParcelTypeSettings($id, $settings);
+        }
+
+        $serviceSettings = $this->serviceSettings;
+
+        foreach(craft()->postmaster->getRegisteredServices() as $service)
+        {
+            if(!isset($serviceSettings[$service->id]))
+            {
+                $serviceSettings[$service->id] = array();
+            }
+        }
+
+        $this->serviceSettings = $serviceSettings;
+
+        foreach($this->serviceSettings as $id => $serviceSettings)
+        {
+            $class = craft()->postmaster->getRegisteredService($id);
+
+            $settings = $class->createSettingsModel($serviceSettings);
+
+            $this->setServiceSettings($id, $settings);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,17 +54,6 @@ public function init()`
`54`	`54`
`55`	`55`	`require_once 'bootstrap.php';`
`56`	`56`
`57`		`- /*`
`58`		`- $plugin = $this;`
`59`		`-`
`60`		`- craft()->on('postmaster.test', function(Event $event)`
`61`		`- {`
`62`		`- exit('asd');`
`63`		`- });`
`64`		`-`
`65`		`- $this->raiseEvent('onTest', new Event());`
`66`		`- */`
`67`		`-`
`68`	`57`	`craft()->on('plugins.loadPlugins', function(Event $event)`
`69`	`58`	`{`
`70`	`59`	`craft()->postmaster->onInit(new Event());`
`@@ -73,7 +62,7 @@ public function init()`
`73`	`62`	`{`
`74`	`63`	`$parcel->init();`
`75`	`64`	`}`
`76`		`-`
	`65`	`+`
`77`	`66`	`});`
`78`	`67`
`79`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`
`4`	`4`	`interface PluginInterface {`
`5`	`5`
	`6`	`+ public function init();`
	`7`	`+`
`6`	`8`	`public function registerCpRoutes();`
`7`	`9`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ class DefaultParcelType extends BaseParcelType {`
`13`	`13`
`14`	`14`	`public function init()`
`15`	`15`	`{`
`16`		`- return;`
`17`		`-`
`18`	`16`	`foreach($this->settings->events as $event)`
`19`	`17`	`{`
`20`	`18`	`$parcelType = $this;`
Original file line number	Diff line number	Diff line change
`@@ -11,21 +11,19 @@ public function __construct($attributes = null)`
`11`	`11`	`{`
`12`	`12`	`parent::__construct($attributes);`
`13`	`13`
`14`		`- if(is_string($this->settings))`
	`14`	`+ if(is_array($this->settings))`
`15`	`15`	`{`
`16`		`- $this->settings = json_decode($this->settings);`
`17`		`- }`
`18`		`-`
`19`		`- if(!$this->settings instanceof Postmaster_ParcelSettingsModel)`
`20`		`- {`
`21`		`- $this->settings = new Postmaster_ParcelSettingsModel((array) $this->settings);`
	`16`	`+ $this->setAttribute('settings', new Postmaster_ParcelSettingsModel($this->settings));`
`22`	`17`	`}`
`23`	`18`	`}`
`24`	`19`
`25`	`20`	`public function init()`
`26`	`21`	`{`
`27`	`22`	`$parcelType = $this->getParcelType();`
	`23`	`+ $service = $this->getService();`
	`24`	`+`
`28`	`25`	`$parcelType->init();`
	`26`	`+ $service->init();`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`public function getTableName()`
`@@ -48,33 +46,45 @@ public function getSetting($key)`
`48`	`46`	`return;`
`49`	`47`	`}`
`50`	`48`
`51`		`- public function getParcelTypeSettings($id)`
	`49`	`+ public function getParcelTypeSettingsById($id)`
`52`	`50`	`{`
`53`		`- $this->settings->getParcelTypeSettings($id);`
	`51`	`+ return $this->settings->getParcelTypeSettingsById($id);`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`public function setParcelTypeSettings($id, Array $settings = array())`
`57`	`55`	`{`
`58`		`- $this->settings->setParcelTypeSettings($id, $settings);`
	`56`	`+ return $this->settings->setParcelTypeSettings($id, $settings);`
`59`	`57`	`}`
`60`	`58`
`61`		`- public function getServiceSettings($id)`
	`59`	`+ public function getServiceSettingsByid($id)`
`62`	`60`	`{`
`63`		`- $this->settings->setServiceSettings($id);`
	`61`	`+ return $this->settings->getServiceSettingsById($id);`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`public function setServiceSettings($id, Array $settings = array())`
`67`	`65`	`{`
`68`		`- $this->settings->setServiceSettings($id, $settings);`
	`66`	`+ return $this->settings->setServiceSettings($id, $settings);`
`69`	`67`	`}`
`70`	`68`
`71`		`- public function getService()`
	`69`	`+ public function getService($class = false)`
`72`	`70`	`{`
`73`	`71`	`if(is_null($this->_service))`
`74`	`72`	`{`
`75`		`- $class = $this->settings->service;`
	`73`	`+ if(!$class)`
	`74`	`+ {`
	`75`	`+ $class = $this->settings->service;`
	`76`	`+ }`
	`77`	`+`
`76`	`78`	`$class = new $class();`
`77`		`- $class->setSettings($class->createSettingsModel($this->getServiceSettings($class->id)));`
	`79`	`+`
	`80`	`+ $settings = $this->getServiceSettingsById($class->id);`
	`81`	`+`
	`82`	`+ if(is_array($settings))`
	`83`	`+ {`
	`84`	`+ $settings = $class->createSettingsModel($settings);`
	`85`	`+ }`
	`86`	`+`
	`87`	`+ $class->setSettings($settings);`
`78`	`88`
`79`	`89`	`$this->_service = $class;`
`80`	`90`	`}`
`@@ -92,8 +102,15 @@ public function getParcelType($class = false)`
`92`	`102`	`}`
`93`	`103`
`94`	`104`	`$class = new $class();`
`95`		`- $class->setSettings($class->createSettingsModel($this->getParcelTypeSettings($class->id)));`
`96`		`- // $class->setService($this->getService());`
	`105`	`+`
	`106`	`+ $settings = $this->getParcelTypeSettingsById($class->id);`
	`107`	`+`
	`108`	`+ if(is_array($settings))`
	`109`	`+ {`
	`110`	`+ $settings = $class->createSettingsModel($settings);`
	`111`	`+ }`
	`112`	`+`
	`113`	`+ $class->setSettings($settings);`
`97`	`114`	`$class->setParcelModel($this);`
`98`	`115`
`99`	`116`	`$this->_parcelType = $class;`
`@@ -112,6 +129,7 @@ protected function defineAttributes()`
`112`	`129`	`{`
`113`	`130`	`return array(`
`114`	`131`	`'title' => array(AttributeType::String, 'column' => ColumnType::Text),`
	`132`	`+ 'parcelType' => array(AttributeType::String, 'column' => ColumnType::Text, 'default' => 'default'),`
`115`	`133`	`'settings' => array(AttributeType::Mixed, 'column' => ColumnType::LongText, 'default' => array()),`
`116`	`134`	`'enabled' => array(AttributeType::Bool, 'column' => ColumnType::Int, 'default' => 1),`
`117`	`135`	`'id' => array(AttributeType::String, 'column' => ColumnType::Text),`