Skip to content

Commit 7d59bed

Browse files
kkMattkkMatt
committed
1.4 release. Debug improved
1.4 release. Debug improved
1 parent b8c3898 commit 7d59bed

File tree

4 files changed

+59
-29
lines changed

4 files changed

+59
-29
lines changed

‎Libraries/EnvatoAPIManager.php‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
class EnvatoAPIManager
1616
{
1717
protected $debugMode = 0;
18-
protected $savedDebugMessages = array();
19-
protected $savedOkayMessages = array();
20-
protected $savedErrorMessages = array();
18+
protected $savedMessages = array();
2119
protected $username = '';
2220
protected $apiKey = '';
2321
protected $personalToken = '';
@@ -44,17 +42,33 @@ public function inDebug()
4442

4543
public function getSavedDebugMessages()
4644
{
47-
return $this->savedDebugMessages;
45+
return isset($this->savedMessages['debug']) ? $this->savedMessages['debug'] : array();
4846
}
4947

5048
public function getSavedOkayMessages()
5149
{
52-
return $this->savedOkayMessages;
50+
return isset($this->savedMessages['okay']) ? $this->savedMessages['okay'] : array();
5351
}
5452

5553
public function getSavedErrorMessages()
5654
{
57-
return $this->savedErrorMessages;
55+
return isset($this->savedMessages['error']) ? $this->savedMessages['error'] : array();
56+
}
57+
58+
private function saveAllMessages($paramArrMessages)
59+
{
60+
if(isset($paramArrMessages['debug']))
61+
{
62+
$this->savedMessages['debug'] = array_merge($this->getSavedDebugMessages(), $paramArrMessages['debug']);
63+
}
64+
if(isset($paramArrMessages['okay']))
65+
{
66+
$this->savedMessages['okay'] = array_merge($this->getSavedOkayMessages(), $paramArrMessages['okay']);
67+
}
68+
if(isset($paramArrMessages['error']))
69+
{
70+
$this->savedMessages['error'] = array_merge($this->getSavedErrorMessages(), $paramArrMessages['error']);
71+
}
5872
}
5973

6074

@@ -113,10 +127,8 @@ public function getLicenseDetails($paramPurchaseCode)
113127
$this->cachedLicenses[$validPurchaseCode] = $licenseDetails;
114128
}
115129

116-
// Save okay/error messages
117-
$this->savedDebugMessages = $objEnvatoAPI->getDebugMessages();
118-
$this->savedOkayMessages = $objEnvatoAPI->getOkayMessages();
119-
$this->savedErrorMessages = $objEnvatoAPI->getErrorMessages();
130+
// Save all messages
131+
$this->saveAllMessages($objEnvatoAPI->getAllMessages());
120132
}
121133

122134
return $licenseDetails;
@@ -151,10 +163,8 @@ public function getUserDetails($paramUsername)
151163
// Get user details for specified username
152164
$userDetails = $objEnvatoAPI->getUser($validUsername);
153165

154-
// Save okay/error messages
155-
$this->savedDebugMessages = $objEnvatoAPI->getDebugMessages();
156-
$this->savedOkayMessages = $objEnvatoAPI->getOkayMessages();
157-
$this->savedErrorMessages = $objEnvatoAPI->getErrorMessages();
166+
// Save all messages
167+
$this->saveAllMessages($objEnvatoAPI->getAllMessages());
158168
}
159169

160170
return $userDetails;
@@ -214,10 +224,8 @@ private function getPurchasedItemsWithDetails($paramFilterBy)
214224
}
215225
}
216226

217-
// Save okay/error messages
218-
$this->savedDebugMessages = $objEnvatoAPI->getDebugMessages();
219-
$this->savedOkayMessages = $objEnvatoAPI->getOkayMessages();
220-
$this->savedErrorMessages = $objEnvatoAPI->getErrorMessages();
227+
// Save all messages
228+
$this->saveAllMessages($objEnvatoAPI->getAllMessages());
221229
} else
222230
{
223231
// Load from cache
@@ -262,10 +270,8 @@ public function getItemDetailsIfPurchased($paramEnvatoItemId)
262270
// Add item to cache
263271
$this->cachedItems[$validEnvatoItemId] = $itemDetails;
264272

265-
// Save okay/error messages
266-
$this->savedDebugMessages = $objEnvatoAPI->getDebugMessages();
267-
$this->savedOkayMessages = $objEnvatoAPI->getOkayMessages();
268-
$this->savedErrorMessages = $objEnvatoAPI->getErrorMessages();
273+
// Save all messages
274+
$this->saveAllMessages($objEnvatoAPI->getAllMessages());
269275
}
270276

271277
return $itemDetails;
@@ -297,10 +303,8 @@ public function getDownloadUrlIfPurchased($paramEnvatoItemId = 0, $paramPurchase
297303
// Add to cache
298304
$this->cachedDownloadURLs[$validEnvatoItemId] = $downloadURL;
299305

300-
// Save okay/error messages
301-
$this->savedDebugMessages = $objEnvatoAPI->getDebugMessages();
302-
$this->savedOkayMessages = $objEnvatoAPI->getOkayMessages();
303-
$this->savedErrorMessages = $objEnvatoAPI->getErrorMessages();
306+
// Save all messages
307+
$this->saveAllMessages($objEnvatoAPI->getAllMessages());
304308
}
305309

306310
return $downloadURL;

‎Libraries/EnvatoEdgeAPI.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if(!class_exists('EnvatoEdgeAPI')):
1313
class EnvatoEdgeAPI
1414
{
15-
const VERSION = '1.3';
15+
const VERSION = '1.4';
1616
const API_AGENT = 'EnvatoToolkit/%s';
1717

1818
protected $debugMode = 0;
@@ -58,6 +58,15 @@ public function flushMessages()
5858
$this->errorMessages = array();
5959
}
6060

61+
public function getAllMessages()
62+
{
63+
return array(
64+
'debug' => $this->debugMessages,
65+
'okay' => $this->okayMessages,
66+
'error' => $this->errorMessages,
67+
);
68+
}
69+
6170
public function getDebugMessages()
6271
{
6372
return $this->debugMessages;

‎Libraries/EnvatoMarketAPI.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
if(!class_exists('EnvatoMarketAPI')):
1717
class EnvatoMarketAPI
1818
{
19-
const VERSION = '1.3';
19+
const VERSION = '1.4';
2020
const API_AGENT = 'EnvatoToolkit/%s';
2121

2222
protected $debugMode = 0;
@@ -64,6 +64,15 @@ public function flushMessages()
6464
$this->errorMessages = array();
6565
}
6666

67+
public function getAllMessages()
68+
{
69+
return array(
70+
'debug' => $this->debugMessages,
71+
'okay' => $this->okayMessages,
72+
'error' => $this->errorMessages,
73+
);
74+
}
75+
6776
public function getDebugMessages()
6877
{
6978
return $this->debugMessages;

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
**Requires at least:** 4.6
1010

11-
**Tested up to:** 4.8
11+
**Tested up to:** 4.9
12+
13+
**Requires PHP:** 5.4
1214

1315
**Stable tag:** trunk
1416

@@ -369,6 +371,9 @@ So there is no need to save your head revision number or last version on your se
369371

370372
## Changelog ##
371373

374+
### 1.4 ###
375+
* Improved debugging.
376+
372377
### 1.3 ###
373378
* Added support for purchase time and license expiration time. Plus split to two fields on 'license_type' to 'license' and 'license_type'.
374379

@@ -384,6 +389,9 @@ So there is no need to save your head revision number or last version on your se
384389

385390
## Upgrade Notice ##
386391

392+
### 1.4 ###
393+
* Just drag and drop new plugin folder.
394+
387395
### 1.3 ###
388396
* Just drag and drop new code folder.
389397

0 commit comments

Comments
 (0)