boyska/rss-bridge
1
0
Fork 0
forked from blallo/rss-bridge
Code Releases Activity

[core] code simplification

Browse source 
Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
This commit is contained in:
Pierre Mazière 2016-08-27 23:52:59 +02:00
parent de1b39c8e5
commit 701aff420d
1 changed files with 63 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
lib/Bridge.php
View file

@ -256,55 +256,72 @@ abstract class BridgeAbstract implements BridgeInterface {
if($time !== false && (time() - $this->getCacheDuration() < $time)){ if($time !== false && (time() - $this->getCacheDuration() < $time)){
$this->items = $this->cache->loadData(); $this->items = $this->cache->loadData();
} else { return;
if($this->validateData($param)){ }
foreach($param as $name=>$value){
foreach($this->parameters as $context=>$set){
if(isset($this->parameters[$context][$name]))
$this->parameters[$context][$name]['value']=$value;
}
}
if(!empty($this->parameters)){
$queriedContext=$this->getQueriedContext();
if(is_null($queriedContext)){
$this->returnClientError('Required parameter(s) missing');
}else if($queriedContext===false){
$this->returnClientError('Mixed context parameters');
}else{
$this->queriedContext=$queriedContext;
$contexts=array($this->queriedContext);
if(isset($this->parameters['global'])){
$contexts[]='global';
}
foreach($contexts as $context){
foreach($this->parameters[$context] as $p=>$props){
if(isset($props['type']) &&
$props['type']==='checkbox' &&
!isset($props['value'])){
if(!isset($props['defaultValue'])){
$this->parameters[$context][$p]['value']=false;
}else{
$this->parameters[$context][$p]['value']=$props['defaultValue'];
}
}
}
}
foreach($param as $name=>$value){
if(isset($this->parameters['global'][$name])){
$this->parameters[$queriedContext][$name]['value']=$value;
}
}
}
}
}else{
$this->returnClientError('Invalid parameters value(s)');
}
$this->collectData();
if(!is_null($this->cache)){ if(empty($this->parameters) && !empty($param)){
$this->cache->saveData($this->getDatas()); $this->returnClientError('Invalid parameters value(s)');
};
if(!$this->validateData($param)){
$this->returnClientError('Invalid parameters value(s)');
}
// Populate BridgeAbstract::parameters with sanitized data
foreach($param as $name=>$value){
foreach($this->parameters as $context=>$set){
if(isset($this->parameters[$context][$name]))
$this->parameters[$context][$name]['value']=$value;
} }
} }
// Guess the paramter context from input data
$queriedContext=$this->getQueriedContext();
if(is_null($queriedContext)){
$this->returnClientError('Required parameter(s) missing');
}else if($queriedContext===false){
$this->returnClientError('Mixed context parameters');
}
$this->queriedContext=$queriedContext;
// Apply default values to missing data
$contexts=array($this->queriedContext);
if(isset($this->parameters['global'])){
$contexts[]='global';
}
foreach($contexts as $context){
foreach($this->parameters[$context] as $p=>$properties){
if(!isset($properties['type'])){
$this->parameters[$context][$p]['type']='text';
}
if(isset($properties['value'])){
continue;
}
switch($properties['type']){
case 'checkbox':
if(!isset($properties['defaultValue'])){
$this->parameters[$context][$p]['value']=false;
}else{
$this->parameters[$context][$p]['value']=$properties['defaultValue'];
}
break;
}
}
}
// Copy global parameter values to the guessed context
foreach($param as $name=>$value){
if(isset($this->parameters['global'][$name])){
$this->parameters[$queriedContext][$name]['value']=$value;
}
}
$this->collectData();
if(!is_null($this->cache)){
$this->cache->saveData($this->getDatas());
}
} }
public function getName(){ public function getName(){