joomla/Component-Builder
joomla/Component-Builder
39
23
Fork 11
Code Issues 83 Pull Requests Projects 4 Wiki Activity

External Code Inclution Option #228

Merged
Llewellyn merged 8 commits from staging into master 2018-02-08 12:42:02 +00:00
Conversation 3 Commits 8 Files Changed 20 +157 -39
6 changed files with 157 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c38f86823 - Show all commits

2
README.md
View File

@ -126,7 +126,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015
+ *Last Build*: 24th January, 2018
+ *Last Build*: 28th January, 2018
+ *Version*: 2.6.13
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

2
admin/README.txt
View File

@ -126,7 +126,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015
+ *Last Build*: 24th January, 2018
+ *Last Build*: 28th January, 2018
+ *Version*: 2.6.13
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

180
admin/custom/dropbox.php
View File

@ -3,7 +3,7 @@
Vast Development Method
/-------------------------------------------------------------------------------------------------------/
@version 2.0.0 - 21st January, 2017
@version 2.0.3 - 27th January, 2018
@package Dropbox API 2
@subpackage dropbox.php
@author Llewellyn van der Merwe <http://www.vdm.io>
@ -16,7 +16,7 @@
defined('_JEXEC') or die;
/**
* Dropbox class
* Dropbox class to get shared links
*/
class Dropbox
{
@ -48,7 +48,7 @@ class Dropbox
);
/**
* the target pathe to get
* the target path to get
*/
protected $targetPath = false;
protected $targetPathOriginal = false;
@ -56,7 +56,8 @@ class Dropbox
/**
* oauth token
*/
protected $oauthToken;
protected $oauthToken = array();
protected $token = 0;
/**
* the verious pathes we need
@ -67,11 +68,13 @@ class Dropbox
* The array of queries for creating shared links
*/
protected $createSharedLinks = array();
protected $createSharedLinks_ = array(); // retry array
/**
* The array of queries for getting shared links
*/
protected $getSharedLinks = array();
protected $getSharedLinks_ = array(); // retry array
/**
* the success switch
@ -93,6 +96,16 @@ class Dropbox
*/
protected $model;
/**
* the slow down timer
*/
protected $slowdown = 0;
/**
* the speed up switch
*/
protected $speedup = false;
/**
* the mediaData bucket
*/
@ -141,8 +154,19 @@ class Dropbox
{
// we need more then the normal time to run this script 5 minutes at least.
ini_set('max_execution_time', 500);
// little tweak for big folders (use multy tokens)
if (strpos($token, '____') !== false)
{
$this->oauthToken = array_filter((array) explode('____', $token),
function ($string) {
return $this->checkString($string);
});
}
else
{
// set the oauth toke
$this->oauthToken = $token;
$this->oauthToken = array($token);
}
// set the permission type
$this->permissionType = $permissiontype;
@ -176,16 +200,39 @@ class Dropbox
return false;
}
protected function getToken()
{
$key = $this->token;
if (isset($this->oauthToken[$key]))
{
// update key
$this->token++;
return $this->oauthToken[$key];
}
// reset key
$this->token = 1;
// return first token
return $this->oauthToken[0];
}
protected function makeMultiExecCalls()
{
$this->succesCall = true;
// make the fist call
$this->multiSharedLinks($this->firstCall);
// make the second call
$this->multiSharedLinks($this->secondCall);
// make the fist call (again for safety)
$this->multiSharedLinks($this->firstCall);
// make the second call (again for safety)
$this->multiSharedLinks($this->secondCall);
// slow down if needed
$this->speedup = false;
// for safety
if (($this->checkArray($this->createSharedLinks) || $this->checkArray($this->createSharedLinks_) ||
$this->checkArray($this->getSharedLinks) || $this->checkArray($this->getSharedLinks_)) &&
$this->succesCall)
{
return $this->makeMultiExecCalls();
}
// all done
return $this->succesCall;
}
protected function multiSharedLinks($type)
@ -194,14 +241,21 @@ class Dropbox
{
case "create":
// great links if not made already
if (count($this->createSharedLinks) > 0)
if ($this->checkArray($this->createSharedLinks) || $this->checkArray($this->createSharedLinks_))
{
$url = $this->url.$this->domainpath['create_shared_link_with_settings'];
$this->type = 'create_shared_link_with_settings';
// build return function
$storeSharedLink = function ($data, $target) {
// check if we are going to fast
if (isset($data->error_summary) && strpos($data->error_summary, 'too_many_requests') !== false)
{
$this->slowDown($data);
// this call was droped, so we must try again
$this->createSharedLinks_[] = json_encode(array("path" => $target, "settings" => array("requested_visibility" => "public")));
}
// check if link already made
if (isset($data->error_summary) && strpos($data->error_summary, 'shared_link_already_exists') !== false)
elseif (isset($data->error_summary) && strpos($data->error_summary, 'shared_link_already_exists') !== false)
{
$this->getSharedLinks[] = json_encode(array("path" => $target));
}
@ -211,19 +265,33 @@ class Dropbox
}
};
// run call
return $this->multiCall($url, $type, $storeSharedLink);
if ($this->checkArray($this->createSharedLinks))
{
$this->multiCall($url, 'createSharedLinks', $storeSharedLink);
}
// also run the retries
if ($this->checkArray($this->createSharedLinks_))
{
$this->multiCall($url, 'createSharedLinks_', $storeSharedLink);
}
}
break;
case "get":
// now get the already made links
if (count($this->getSharedLinks) > 0)
if ($this->checkArray($this->getSharedLinks) || $this->checkArray($this->getSharedLinks_))
{
$url = $this->url.$this->domainpath['list_shared_links'];
$this->type = 'list_shared_links';
// build return function
$storeSharedLink = function ($data, $target) {
// check if link not made
if (isset($data->error_summary))
if (isset($data->error_summary) && strpos($data->error_summary, 'too_many_requests') !== false)
{
$this->slowDown($data);
// this call was droped, so we must try again
$this->getSharedLinks_[] = json_encode(array("path" => $target));
}
elseif (isset($data->error_summary))
{
$this->createSharedLinks[] = json_encode(array("path" => $target, "settings" => array("requested_visibility" => "public")));
}
@ -233,21 +301,28 @@ class Dropbox
}
};
// run call
return $this->multiCall($url, $type, $storeSharedLink);
if ($this->checkArray($this->getSharedLinks))
{
$this->multiCall($url, 'getSharedLinks', $storeSharedLink);
}
// also run the retries
if ($this->checkArray($this->getSharedLinks_))
{
$this->multiCall($url, 'getSharedLinks_', $storeSharedLink);
}
}
break;
}
return false;
}
protected function multiCall(&$url, $type, &$storeSharedLink)
{
$timer = 1;
$options = array();
// set the options array and make the calls every 250
foreach ($this->{$type."SharedLinks"} as $query)
// set the options array and make the calls every 550
foreach ($this->{$type} as $query)
{
$options[] = array(CURLOPT_HTTPHEADER => array('Authorization: Bearer ' . $this->oauthToken, 'Content-Type: application/json'), CURLOPT_POST => 1, CURLOPT_POSTFIELDS => $query); $timer++;
$options[] = array(CURLOPT_HTTPHEADER => array('Authorization: Bearer ' . $this->getToken(), 'Content-Type: application/json'), CURLOPT_POST => 1, CURLOPT_POSTFIELDS => $query); $timer++;
// check timer
if ($timer >= 550)
{
@ -259,19 +334,33 @@ class Dropbox
}
}
// make sure all was done
if ($timer > 1 && count($options))
if ($timer > 1 && $this->checkArray($options))
{
// run multi curl
$this->curlMultiExec($url, $options, $storeSharedLink);
}
// reset the values
$this->{$type."SharedLinks"} = array();
// only if there is no errors
if (count($this->error_summary) > 0)
$this->{$type} = array();
// check if we have errors
if ($this->checkArray($this->error_summary))
{
return false;
$this->succesCall = false;
}
}
public function slowDown($data)
{
if (!$this->speedup)
{
// set default
$this->slowdown = 300000000;
// can we set it dynamicly
if (isset($data->error) && isset($data->error->retry_after))
{
// convert retry_after minutes to microseconds
$this->slowdown = (int) bcmul($data->error->retry_after, 1000000);
}
}
return true;
}
public function revokeToken($token = null)
@ -279,14 +368,23 @@ class Dropbox
if ($token)
{
// set the oauth toke
$this->oauthToken = $token;
$this->oauthToken[] = $token;
}
// set the call to revoke the token
$this->query = 'null';
$this->type = 'revoke';
if ($this->makeCall())
// remove all tokens
$removed = true;
if ($this->checkArray($this->oauthToken))
{
return true;
foreach($this->oauthToken as $token)
{
if (!$this->makeCall())
{
$removed = false;
}
}
return $removed;
}
return false;
}
@ -339,7 +437,7 @@ class Dropbox
$options = array(
'http' => array(
'header' => "Content-Type: application/json\r\n".
"Authorization: Bearer ".$this->oauthToken,
"Authorization: Bearer ".$this->getToken(),
'method' => "POST"
),
);
@ -374,7 +472,7 @@ class Dropbox
protected function makeCurlCall()
{
// do not run creat shared link this way
$headers = array('Authorization: Bearer '. $this->oauthToken,
$headers = array('Authorization: Bearer '. $this->getToken(),
'Content-Type: application/json'
);
@ -626,8 +724,16 @@ class Dropbox
{
if ($this->checkString($url))
{
// check if we should slow down
if ($this->slowdown > 0)
{
usleep($this->slowdown);
// reset the trafic speed
$this->slowdown = 0;
$this->speedup = true; // we should only sleep once per/bunch
}
// make sure the thread size isn't greater than the # of _options
$threadSize = 20;
$threadSize = 50;
$threadSize = (sizeof($_options) < $threadSize) ? sizeof($_options) : $threadSize;
// set the options
$options = array();
@ -664,8 +770,20 @@ class Dropbox
// $info = curl_getinfo($done['handle']);
// request successful. process output using the callback function.
$output = curl_multi_getcontent($done['handle']);
if ($this->checkJson($output) && isset($_options[$i]))
{
$callback(json_decode($output), json_decode(end($_options[$i]))->path);
}
}
// check if we should slow down
if ($this->slowdown > 0)
{
usleep($this->slowdown);
// reset the trafic speed
$this->slowdown = 0;
$this->speedup = true; // we should only sleep once per/bunch
}
// next key
$key = $i + 1;
if(isset($_options[$key]))
{

2
admin/language/en-GB/en-GB.com_componentbuilder.ini
View File

@ -2135,7 +2135,7 @@ COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_LABEL="Author Email"
COM_COMPONENTBUILDER_CONFIG_AUTHOR_NAME_DESC="The name of the author of this component."
COM_COMPONENTBUILDER_CONFIG_AUTHOR_NAME_LABEL="Author Name"
COM_COMPONENTBUILDER_CONFIG_AUTO_LOAD="Auto"
COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION="You can run a cronjob that will backup all your components as they are mapped in JCB.<br /><br /><b>USE THE FOLLOWING:</b> <span id='cronjob-backup'>loading...<span class='loading-dots' ></span></span><br /><br />Please not that if your Joomla website has a Firewall installed, it will not allow cronjob via direct URL (most of the time), you will then need to adapt the cornjob request to look like a browser. For more info please read https://stackoverflow.com/a/31597823/1429677
COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION="You can run a cronjob that will backup all your components as they are mapped in JCB.<br /><br /><b>USE THE FOLLOWING:</b> <span id='cronjob-backup'>loading...<span class='loading-dots' ></span></span><br /><br />Please note that if your Joomla website has a Firewall installed, it will not allow cronjob via direct URL (most of the time), you will then need to adapt the cornjob request to look like a browser. For more info please read https://stackoverflow.com/a/31597823/1429677
<script type='text/javascript'>
jQuery(document).ready(function($) {
// get token from the form

2
admin/models/componentbuilder.php
View File

@ -466,7 +466,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
getIS(1,board).done(function(result) {
if (result){
jQuery("#cpanel_tabTabs a").each(function() {
if (this.href.indexOf("#vast_development_method") >= 0) {
if (this.href.indexOf("#vast_development_method") >= 0 || this.href.indexOf("#notice_board") >= 0) {
var textVDM = jQuery(this).text();
jQuery(this).html("<span class=\"label label-important vdm-new-notice\">1</span> "+textVDM);
jQuery(this).attr("id","vdm-new-notice");

2
componentbuilder.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2" method="upgrade">
<name>COM_COMPONENTBUILDER</name>
<creationDate>24th January, 2018</creationDate>
<creationDate>28th January, 2018</creationDate>
<author>Llewellyn van der Merwe</author>
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
<authorUrl>http://joomlacomponentbuilder.com</authorUrl>