Fixes for ADSL traffic collection and other ADSL items

modules/adsl/classes/Service/Traffic/Adsl.php

@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Deon George
  * @license    http://dev.leenooks.net/license.html
  */
-class Service_Traffic_ADSL {
+class Service_Traffic_Adsl {
 	protected $so;
 	protected $today;
 	protected $fetchresult = NULL;
@@ -51,7 +51,7 @@ class Service_Traffic_ADSL {
 	 * @return HeadImage
 	 */
 	public static function instance($supplier) {
-		$sc = sprintf('%s_%s',get_called_class(),$supplier);
+		$sc = sprintf('%s_%s',get_called_class(),ucwords(strtolower($supplier)));
 
 		if (! class_exists($sc))
 			throw new Kohana_Exception('Class doesnt exist for :supplier',array(':supplier'=>$supplier));

modules/adsl/classes/Service/Traffic/Adsl/Exetelhspa.php

@@ -1,7 +1,7 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * This class is able to collect traffic information for Exetel HSPA
+ * This class is able to collect traffic information for Exetel hspa
  *
  * Traffic information is collected by each service, and cached,
  * returning just the date in question.
@@ -13,7 +13,7 @@
  * @copyright  (c) 2010 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Service_Traffic_ADSL_ExetelHSPA extends Service_Traffic_ADSL {
+class Service_Traffic_Adsl_Exetelhspa extends Service_Traffic_Adsl {
 	private $login_user_field = 'login_name';
 	private $login_pass_field = 'password';
 	private $date_field = 'date';
@@ -21,7 +21,7 @@ class Service_Traffic_ADSL_ExetelHSPA extends Service_Traffic_ADSL {
 	static $return = array();
 
 	/**
-	 * Get the data for Exetel HSPA services
+	 * Get the data for Exetel hspa services
 	 *
 	 * @return array
 	 */
@@ -30,8 +30,8 @@ class Service_Traffic_ADSL_ExetelHSPA extends Service_Traffic_ADSL {
 		$this->fetchresult = TRUE;
 
 		// If we have already collected the date data, return it.
-		if (! empty(Service_Traffic_ADSL_ExetelHSPA::$return[$date]))
-			return Service_Traffic_ADSL_ExetelHSPA::$return[$date];
+		if (! empty(Service_Traffic_Adsl_Exetelhspa::$return[$date]))
+			return Service_Traffic_Adsl_Exetelhspa::$return[$date];
 
 		include_once 'includes/kohana/modules/simplehtmldom/classes/simple_html_dom.php';
 
@@ -174,14 +174,14 @@ class Service_Traffic_ADSL_ExetelHSPA extends Service_Traffic_ADSL {
 		// Reformat the data into date order.
 		foreach ($update as $service => $sdata)
 			foreach ($sdata as $sdate => $details)
-				Service_Traffic_ADSL_ExetelHSPA::$return[$sdate][$service] = $details;
+				Service_Traffic_Adsl_Exetelhspa::$return[$sdate][$service] = $details;
 
 		// If the date we want is empty, return an array
-		if (empty(Service_Traffic_ADSL_ExetelHSPA::$return[$date]))
+		if (empty(Service_Traffic_Adsl_Exetelhspa::$return[$date]))
 			return array();
 
 		// Return the date we asked for
-		return Service_Traffic_ADSL_ExetelHSPA::$return[$date];
+		return Service_Traffic_Adsl_Exetelhspa::$return[$date];
 	}
 }
 ?>

modules/adsl/classes/Service/Traffic/Adsl/Exetelpe.php

@@ -13,7 +13,7 @@
  * @copyright  (c) 2010 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Service_Traffic_ADSL_ExetelPE extends Service_Traffic_ADSL {
+class Service_Traffic_Adsl_Exetelpe extends Service_Traffic_Adsl {
 	private $login_user_field = 'login_name';
 	private $login_pass_field = 'password';
 	private $date_field = 'date';
@@ -30,8 +30,8 @@ class Service_Traffic_ADSL_ExetelPE extends Service_Traffic_ADSL {
 		$this->fetchresult = TRUE;
 
 		// If we have already collected the date data, return it.
-		if (! empty(Service_Traffic_ADSL_ExetelPE::$return[$date]))
-			return Service_Traffic_ADSL_ExetelPE::$return[$date];
+		if (! empty(Service_Traffic_Adsl_Exetelpe::$return[$date]))
+			return Service_Traffic_Adsl_Exetelpe::$return[$date];
 
 		include_once 'includes/kohana/modules/simplehtmldom/classes/simple_html_dom.php';
 
@@ -167,14 +167,14 @@ class Service_Traffic_ADSL_ExetelPE extends Service_Traffic_ADSL {
 		// Reformat the data into date order.
 		foreach ($update as $service => $sdata)
 			foreach ($sdata as $sdate => $details)
-				Service_Traffic_ADSL_ExetelPE::$return[$sdate][$service] = $details;
+				Service_Traffic_Adsl_Exetelpe::$return[$sdate][$service] = $details;
 
 		// If the date we want is empty, return an array
-		if (empty(Service_Traffic_ADSL_ExetelPE::$return[$date]))
+		if (empty(Service_Traffic_Adsl_Exetelpe::$return[$date]))
 			return array();
 
 		// Return the date we asked for
-		return Service_Traffic_ADSL_ExetelPE::$return[$date];
+		return Service_Traffic_Adsl_Exetelpe::$return[$date];
 	}
 }
 ?>

modules/adsl/classes/Service/Traffic/Adsl/Exetelvisp.php

@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Service_Traffic_ADSL_ExetelVisp extends Service_Traffic_ADSL {
+class Service_Traffic_Adsl_Exetelvisp extends Service_Traffic_Adsl {
 	private $login_user_field = 'username';
 	private $login_pass_field = 'password';
 	private $date_field = 'date';