joomla/Component-Builder
39
25
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

added dynamic email helper fields to the global settings of all components that use the email helper class

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-12-22 23:32:13 +02:00
parent 0cd5660141
commit 829384a56b
382 changed files with 1919 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
admin/custom/dropboxupdater.php
View File

@@ -69,11 +69,6 @@ class Dropboxupdater
protected $updateInfo;
protected $infoFilePath;
/**
* get the localkey
**/
protected $localkey = false;
/**
* Main dropbox class
**/
@@ -302,6 +297,8 @@ class Dropboxupdater
{
// reset config
$this->detailsConfig = array();
// the source ID
$this->detailsConfig['sourceID'] = $this->data->id;
// get the legal files set
$this->detailsConfig['addTypes'] = $this->data->filetypes;
// set other config settings
@@ -348,7 +345,7 @@ class Dropboxupdater
protected function setUpdateInfoData()
{
// set the info file name
$fileName = md5($this->fileKey.'info'.$this->localkey);
$fileName = md5($this->fileKey.'info');
// set file path
$this->infoFilePath = JPATH_COMPONENT_SITE.'/helpers/'.$fileName.'.json';
@@ -402,7 +399,7 @@ class Dropboxupdater
protected function doUpdate()
{
// we need more then the normal time to run this script 5 minutes at least.
ini_set('max_execution_time', 500);
ini_set('max_execution_time', $this->app_params->get('max_execution_time', 500));
// get data of all the shared links of all target items
if (!$this->dropbox->getFiles($this->data->oauthtoken, $this->data->permissiontype, $this->detailsConfig))
{
@@ -412,23 +409,23 @@ class Dropboxupdater
// if this is a manual update, then revoke the token
if ($this->forceUpdate)
{
$this->dropbox->revokeToken($this->data->oauthtoken);
$this->dropbox->revokeToken();
}
return true;
}
protected function resetUpdate()
public function resetUpdate()
{
if ($this->okay)
if ($this->okay || (isset($this->dropbox->forceReset) && $this->dropbox->forceReset))
{
// make sure the update reset
$this->updateInfo->nextupdate = $this->next;
$this->updateInfo->updateactive = false;
$this->updateInfo->updatenow = false;
return $this->saveUpdateInfo();
// store final update
$this->saveUpdateInfo();
}
return false;
return $this->okay;
}
protected function saveJson($data,$filename)