Merge branch 'master' into patch-5

README.md

@@ -17,7 +17,7 @@ Cloud servers: Move/Upload all of the files in the oneportalcloud folder to modu
 3.  On the same page, choose "Configure" to set module access
 4.  From the Addons Menu, choose OnePortal Server Import 
 5.  Follow the prompts on-screen to configure the Import
-6.  OnePortal API Key will be required at this time [Guide for OnePortal API](http://support.limestonenetworks.com/knowledge-base/api-usage-methods/ "Limestone Networks API Usage")
+6.  OnePortal API Key will be required at this time [Guide for OnePortal API](http://support.limestonenetworks.com/knowledge-base/api-usage-methods/ "Limestone Networks API Usage"). Keys are managed in [OnePortal API Manager](https://one.limestonenetworks.com/administrative/apilegacy.html)
 
 # Dedicated Server Module Manual Setup
 

oneportal/oneportal.php

@@ -99,7 +99,7 @@ function oneportal_TerminateAccount($params) {
 			10,
 			"Please cancel {$server_id}",
 			'This server has been cancelled through our billing system and we are no longer being paid by our client for this server. Please cancel it.',
-			(int) $userlist->user[0]['id'],
+			(int) $userlist->row0->id,
 			$server = $server_id);
 
 	if (empty($newticket->error)) {

opserverimport/README.md

@@ -4,6 +4,6 @@
 2. Install the Opserverimport module files at /path_to/whmcs/modules/addons/opserverimport 
 3. From the WHMCS Administrative web interface, navigate to Setup -> Addon Modules.
 4. Locate and Activate the OnePortal Server Import module
-5. Configure the module to allow suitable administrative priveleges to access the module
+5. Configure the module to allow suitable administrative privileges to access the module
 6. Navigate to Addons -> OnePortal Server Import in dropdown menu. 
-7. Follow the prompts to customize the import (if desired) and provide the API key - Keys are managed in [OnePortal API Manager](https://one.limestonenetworks.com/administrative/api.html)
+7. Follow the prompts to customize the import (if desired) and provide the API key - Keys are managed in [OnePortal API Manager](https://one.limestonenetworks.com/administrative/apilegacy.html)

opserverimport/opserverimport.php

@@ -265,7 +265,7 @@ function opserverimport_output($vars) {
                     'description' => $description,
                     'stockcontrol' => '0',
                     'servertype' => 'opserverimport',
-                    'autosetup' => 'Off',
+                    'autosetup' => '',
                     'name' => trim($product['name']),
                     'paytype' => 'recurring',
                 );
@@ -347,10 +347,12 @@ function opserverimport_output($vars) {
             <div class="panel panel-default">
                 <div class="panel-heading"><strong>STEP 1</strong></div>
                 <div class="panel-body">
+
                     This utility creates products and configurable options based upon Dedicated Server products available from Limestone Networks.
                     <br /> Configure the Client Area features and insert OnePortal API key on the next step.
                     <br /> Before accessing the product import, create a product group (WHMCS Admin->Setup->Products/Services->Products/Services->Create Product Group).
                     <br /> Group can be named "Dedicated Servers" or any other name.
+
                 </div>
                     <form method="post" action="addonmodules.php?module=opserverimport">
                         <input type="hidden" name="step2" value="1">