[core] Apply common indentation
All files are now using tabs for indentation
This commit is contained in:
parent
32ce2b6541
commit
62eec43980
19 changed files with 1365 additions and 1250 deletions
|
@ -7,9 +7,7 @@ class FileCache extends CacheAbstract{
|
|||
|
||||
public function loadData(){
|
||||
$this->isPrepareCache();
|
||||
|
||||
$datas = unserialize(file_get_contents($this->getCacheFile()));
|
||||
|
||||
return $datas;
|
||||
}
|
||||
|
||||
|
@ -18,13 +16,10 @@ class FileCache extends CacheAbstract{
|
|||
|
||||
//Re-encode datas to UTF-8
|
||||
//$datas = Cache::utf8_encode_deep($datas);
|
||||
|
||||
$writeStream = file_put_contents($this->getCacheFile(), serialize($datas));
|
||||
|
||||
if(!$writeStream) {
|
||||
|
||||
throw new \Exception("Cannot write the cache... Do you have the right permissions ?");
|
||||
|
||||
}
|
||||
|
||||
return $this;
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
<?php
|
||||
/**
|
||||
* Atom
|
||||
* Documentation Source http://en.wikipedia.org/wiki/Atom_%28standard%29 and http://tools.ietf.org/html/rfc4287
|
||||
* Documentation Source http://en.wikipedia.org/wiki/Atom_%28standard%29 and
|
||||
* http://tools.ietf.org/html/rfc4287
|
||||
*/
|
||||
class AtomFormat extends FormatAbstract{
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@ class HtmlFormat extends FormatAbstract{
|
|||
EOD;
|
||||
}
|
||||
|
||||
|
||||
/* Data are prepared, now let's begin the "MAGIE !!!" */
|
||||
$toReturn = <<<EOD
|
||||
<!DOCTYPE html>
|
||||
|
|
|
@ -7,7 +7,6 @@ class JsonFormat extends FormatAbstract{
|
|||
|
||||
public function stringify(){
|
||||
$items = $this->getItems();
|
||||
|
||||
return json_encode($items, JSON_PRETTY_PRINT);
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,9 @@ EOD;
|
|||
$pathBridge = self::getDir() . $nameBridge . '.php';
|
||||
|
||||
if(!file_exists($pathBridge)){
|
||||
throw new \Exception('The bridge you looking for does not exist. It should be at path ' . $pathBridge);
|
||||
throw new \Exception('The bridge you looking for does not exist.'
|
||||
. ' It should be at path '
|
||||
. $pathBridge);
|
||||
}
|
||||
|
||||
require_once $pathBridge;
|
||||
|
@ -92,10 +94,10 @@ EOD;
|
|||
|
||||
static public function isWhitelisted($whitelist, $name){
|
||||
if(in_array($name, $whitelist)
|
||||
or in_array($name . '.php', $whitelist)
|
||||
or in_array($name . 'Bridge', $whitelist) // DEPRECATED
|
||||
or in_array($name . 'Bridge.php', $whitelist) // DEPRECATED
|
||||
or count($whitelist) === 1 and trim($whitelist[0]) === '*'){
|
||||
|| in_array($name . '.php', $whitelist)
|
||||
|| in_array($name . 'Bridge', $whitelist) // DEPRECATED
|
||||
|| in_array($name . 'Bridge.php', $whitelist) // DEPRECATED
|
||||
|| count($whitelist) === 1 and trim($whitelist[0]) === '*'){
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
|
|
|
@ -37,8 +37,9 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
|
||||
protected function validateTextValue($value, $pattern = null){
|
||||
if(!is_null($pattern)){
|
||||
$filteredValue = filter_var($value, FILTER_VALIDATE_REGEXP,
|
||||
array('options' => array(
|
||||
$filteredValue = filter_var($value
|
||||
, FILTER_VALIDATE_REGEXP
|
||||
, array('options' => array(
|
||||
'regexp' => '/^' . $pattern . '$/'
|
||||
))
|
||||
);
|
||||
|
@ -215,16 +216,16 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
foreach($set as $id => $properties){
|
||||
if(isset($inputs[$id]) && !empty($inputs[$id])){
|
||||
$queriedContexts[$context] = true;
|
||||
}elseif(isset($properties['required']) &&
|
||||
$properties['required']===true){
|
||||
} elseif(isset($properties['required'])
|
||||
&& $properties['required'] === true){
|
||||
$queriedContexts[$context] = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(array_key_exists('global',static::PARAMETERS) &&
|
||||
$queriedContexts['global']===false){
|
||||
if(array_key_exists('global', static::PARAMETERS)
|
||||
&& $queriedContexts['global'] === false){
|
||||
return null;
|
||||
}
|
||||
unset($queriedContexts['global']);
|
||||
|
@ -337,7 +338,7 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
$contextOptions = array(
|
||||
'http' => array(
|
||||
'user_agent' => ini_get('user_agent')
|
||||
),
|
||||
)
|
||||
);
|
||||
|
||||
if(defined('PROXY_URL') && $this->useProxy){
|
||||
|
|
|
@ -10,7 +10,8 @@ class Cache{
|
|||
|
||||
static public function create($nameCache){
|
||||
if(!static::isValidNameCache($nameCache)){
|
||||
throw new \InvalidArgumentException('Name cache must be at least one uppercase follow or not by alphanumeric or dash characters.');
|
||||
throw new \InvalidArgumentException('Name cache must be at least'
|
||||
. ' one uppercase follow or not by alphanumeric or dash characters.');
|
||||
}
|
||||
|
||||
$pathCache = self::getDir() . $nameCache . '.php';
|
||||
|
@ -78,6 +79,7 @@ class Cache{
|
|||
new RecursiveDirectoryIterator($cachePath),
|
||||
RecursiveIteratorIterator::CHILD_FIRST
|
||||
);
|
||||
|
||||
foreach($cacheIterator as $cacheFile){
|
||||
if(in_array($cacheFile->getBasename(), array('.', '..')))
|
||||
continue;
|
||||
|
|
|
@ -12,9 +12,8 @@ class Http{
|
|||
static public function getMessageForCode($code){
|
||||
$codes = self::getCodes();
|
||||
|
||||
if( isset($codes[$code]) ){
|
||||
if(isset($codes[$code]))
|
||||
return $codes[$code];
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
|
|
@ -50,7 +50,10 @@ abstract class FeedExpander extends BridgeAbstract {
|
|||
|
||||
protected function collect_RSS_2_0_data($rssContent, $maxItems){
|
||||
$rssContent = $rssContent->channel[0];
|
||||
$this->debugMessage('RSS content is ===========\n' . var_export($rssContent, true) . '===========');
|
||||
$this->debugMessage('RSS content is ===========\n'
|
||||
. var_export($rssContent, true)
|
||||
. '===========');
|
||||
|
||||
$this->load_RSS_2_0_feed_data($rssContent);
|
||||
foreach($rssContent->item as $item){
|
||||
$this->debugMessage('parsing item ' . var_export($item, true));
|
||||
|
|
|
@ -10,7 +10,8 @@ class Format{
|
|||
|
||||
static public function create($nameFormat){
|
||||
if(!preg_match('@^[A-Z][a-zA-Z]*$@', $nameFormat)){
|
||||
throw new \InvalidArgumentException('Name format must be at least one uppercase follow or not by alphabetic characters.');
|
||||
throw new \InvalidArgumentException('Name format must be at least '
|
||||
. 'one uppercase follow or not by alphabetic characters.');
|
||||
}
|
||||
|
||||
$nameFormat = $nameFormat . 'Format';
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
<?php
|
||||
class HTMLUtils {
|
||||
|
||||
public static function displayBridgeCard($bridgeName, $formats, $isActive = true){
|
||||
$bridgeElement = Bridge::create($bridgeName);
|
||||
$bridgeClass = $bridgeName . 'Bridge';
|
||||
|
@ -28,9 +27,24 @@ CARD;
|
|||
|
||||
if($isActive){
|
||||
if(defined('PROXY_URL') && PROXY_BYBRIDGE){
|
||||
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxyoff') . '-' . urlencode('_noproxy');
|
||||
$card .= '<input id="' . $idArg . '" type="checkbox" name="_noproxy" />' . PHP_EOL;
|
||||
$card .= '<label for="' .$idArg. '">Disable proxy ('.((defined('PROXY_NAME') && PROXY_NAME)?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
|
||||
$idArg = 'arg-'
|
||||
. urlencode($bridgeName)
|
||||
. '-'
|
||||
. urlencode('proxyoff')
|
||||
. '-'
|
||||
. urlencode('_noproxy');
|
||||
|
||||
$card .= '<input id="'
|
||||
. $idArg
|
||||
. '" type="checkbox" name="_noproxy" />'
|
||||
. PHP_EOL;
|
||||
|
||||
$card .= '<label for="'
|
||||
. $idArg
|
||||
. '">Disable proxy ('
|
||||
. ((defined('PROXY_NAME') && PROXY_NAME) ? PROXY_NAME : PROXY_URL)
|
||||
. ')</label><br />'
|
||||
. PHP_EOL;
|
||||
}
|
||||
|
||||
$card .= HTMLUtils::getHelperButtonsFormat($formats);
|
||||
|
@ -77,55 +91,140 @@ CARD;
|
|||
if(!isset($inputEntry['defaultValue']))
|
||||
$inputEntry['defaultValue'] = '';
|
||||
|
||||
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode($parameterName) . '-' . urlencode($id);
|
||||
$card .= '<label for="' . $idArg . '">' . $inputEntry['name'] . ' : </label>' . PHP_EOL;
|
||||
$idArg = 'arg-'
|
||||
. urlencode($bridgeName)
|
||||
. '-'
|
||||
. urlencode($parameterName)
|
||||
. '-'
|
||||
. urlencode($id);
|
||||
|
||||
$card .= '<label for="'
|
||||
. $idArg
|
||||
. '">'
|
||||
. $inputEntry['name']
|
||||
. ' : </label>'
|
||||
. PHP_EOL;
|
||||
|
||||
if(!isset($inputEntry['type']) || $inputEntry['type'] == 'text'){
|
||||
$card .= '<input ' . $additionalInfoString . ' id="' . $idArg . '" type="text" value="' . $inputEntry['defaultValue'] . '" placeholder="' . $inputEntry['exampleValue'] . '" name="' . $id . '" /><br />' . PHP_EOL;
|
||||
$card .= '<input '
|
||||
. $additionalInfoString
|
||||
. ' id="'
|
||||
. $idArg
|
||||
. '" type="text" value="'
|
||||
. $inputEntry['defaultValue']
|
||||
. '" placeholder="'
|
||||
. $inputEntry['exampleValue']
|
||||
. '" name="'
|
||||
. $id
|
||||
. '" /><br />'
|
||||
. PHP_EOL;
|
||||
} elseif($inputEntry['type'] == 'number'){
|
||||
$card .= '<input ' . $additionalInfoString . ' id="' . $idArg . '" type="number" value="' . $inputEntry['defaultValue'] . '" placeholder="' . $inputEntry['exampleValue'] . '" name="' . $id . '" /><br />' . PHP_EOL;
|
||||
$card .= '<input '
|
||||
. $additionalInfoString
|
||||
. ' id="'
|
||||
. $idArg
|
||||
. '" type="number" value="'
|
||||
. $inputEntry['defaultValue']
|
||||
. '" placeholder="'
|
||||
. $inputEntry['exampleValue']
|
||||
. '" name="'
|
||||
. $id
|
||||
. '" /><br />'
|
||||
. PHP_EOL;
|
||||
} else if($inputEntry['type'] == 'list'){
|
||||
$card .= '<select ' . $additionalInfoString . ' id="' . $idArg . '" name="' . $id . '" >';
|
||||
$card .= '<select '
|
||||
. $additionalInfoString
|
||||
. ' id="'
|
||||
. $idArg
|
||||
. '" name="'
|
||||
. $id
|
||||
. '" >';
|
||||
|
||||
foreach($inputEntry['values'] as $name => $value){
|
||||
if(is_array($value)){
|
||||
$card .= '<optgroup label="' . htmlentities($name) . '">';
|
||||
foreach($value as $subname => $subvalue){
|
||||
if($inputEntry['defaultValue'] === $subname || $inputEntry['defaultValue'] === $subvalue)
|
||||
$card .= '<option value="' . $subvalue . '" selected>' . $subname . '</option>';
|
||||
else
|
||||
$card .= '<option value="' . $subvalue . '">' . $subname . '</option>';
|
||||
if($inputEntry['defaultValue'] === $subname
|
||||
|| $inputEntry['defaultValue'] === $subvalue){
|
||||
$card .= '<option value="'
|
||||
. $subvalue
|
||||
. '" selected>'
|
||||
. $subname
|
||||
. '</option>';
|
||||
} else {
|
||||
$card .= '<option value="'
|
||||
. $subvalue
|
||||
. '">'
|
||||
. $subname
|
||||
. '</option>';
|
||||
}
|
||||
}
|
||||
$card .= '</optgroup>';
|
||||
} else {
|
||||
if($inputEntry['defaultValue'] === $name || $inputEntry['defaultValue'] === $value)
|
||||
$card .= '<option value="' . $value . '" selected>' . $name . '</option>';
|
||||
else
|
||||
$card .= '<option value="' . $value . '">' . $name . '</option>';
|
||||
if($inputEntry['defaultValue'] === $name
|
||||
|| $inputEntry['defaultValue'] === $value){
|
||||
$card .= '<option value="'
|
||||
. $value
|
||||
. '" selected>'
|
||||
. $name
|
||||
. '</option>';
|
||||
} else {
|
||||
$card .= '<option value="'
|
||||
. $value
|
||||
. '">'
|
||||
. $name
|
||||
. '</option>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$card .= '</select><br >';
|
||||
} elseif($inputEntry['type'] == 'checkbox'){
|
||||
if($inputEntry['defaultValue'] === 'checked')
|
||||
$card .= '<input ' . $additionalInfoString . ' id="' . $idArg . '" type="checkbox" name="' . $id . '" checked /><br />' . PHP_EOL;
|
||||
$card .= '<input '
|
||||
. $additionalInfoString
|
||||
. ' id="'
|
||||
. $idArg
|
||||
. '" type="checkbox" name="'
|
||||
. $id
|
||||
. '" checked /><br />'
|
||||
. PHP_EOL;
|
||||
else
|
||||
$card .= '<input ' . $additionalInfoString . ' id="' . $idArg . '" type="checkbox" name="' . $id . '" /><br />' . PHP_EOL;
|
||||
$card .= '<input '
|
||||
. $additionalInfoString
|
||||
. ' id="'
|
||||
. $idArg
|
||||
. '" type="checkbox" name="'
|
||||
. $id
|
||||
. '" /><br />'
|
||||
. PHP_EOL;
|
||||
}
|
||||
}
|
||||
|
||||
if($isActive){
|
||||
if(defined('PROXY_URL') && PROXY_BYBRIDGE){
|
||||
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxyoff') . '-' . urlencode('_noproxy');
|
||||
$card .= '<input id="' . $idArg . '" type="checkbox" name="_noproxy" />' . PHP_EOL;
|
||||
$card .= '<label for="' .$idArg. '">Disable proxy ('.((defined('PROXY_NAME') && PROXY_NAME)?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
|
||||
}
|
||||
$idArg = 'arg-'
|
||||
. urlencode($bridgeName)
|
||||
. '-'
|
||||
. urlencode('proxyoff')
|
||||
. '-'
|
||||
. urlencode('_noproxy');
|
||||
|
||||
$card .= '<input id="'
|
||||
. $idArg
|
||||
. '" type="checkbox" name="_noproxy" />'
|
||||
. PHP_EOL;
|
||||
|
||||
$card .= '<label for="'
|
||||
. $idArg
|
||||
. '">Disable proxy ('
|
||||
. ((defined('PROXY_NAME') && PROXY_NAME) ? PROXY_NAME : PROXY_URL)
|
||||
. ')</label><br />'
|
||||
. PHP_EOL;
|
||||
}
|
||||
$card .= HTMLUtils::getHelperButtonsFormat($formats);
|
||||
} else {
|
||||
$card .= '<span style="font-weight: bold;">Inactive</span>';
|
||||
}
|
||||
|
||||
$card .= '</form>' . PHP_EOL;
|
||||
}
|
||||
|
||||
|
@ -139,7 +238,12 @@ CARD;
|
|||
private static function getHelperButtonsFormat($formats){
|
||||
$buttons = '';
|
||||
foreach($formats as $name){
|
||||
$buttons .= '<button type="submit" name="format" value="' . $name . '">' . $name . '</button>' . PHP_EOL;
|
||||
$buttons .= '<button type="submit" name="format" value="'
|
||||
. $name
|
||||
. '">'
|
||||
. $name
|
||||
. '</button>'
|
||||
. PHP_EOL;
|
||||
}
|
||||
|
||||
return $buttons;
|
||||
|
@ -164,10 +268,12 @@ class HTMLSanitizer {
|
|||
public static $KEPT_ATTRIBUTES = ["title", "href", "src"];
|
||||
public static $ONLY_TEXT = [];
|
||||
|
||||
public function __construct($tags_to_remove = null, $kept_attributes = null, $only_keep_text = null) {
|
||||
$this->tagsToRemove = $tags_to_remove == null ? HTMLSanitizer::$DEFAULT_CLEAR_TAGS : $tags_to_remove;
|
||||
$this->keptAttributes = $kept_attributes == null ? HTMLSanitizer::$KEPT_ATTRIBUTES : $kept_attributes;
|
||||
$this->onlyKeepText = $only_keep_text == null ? HTMLSanitizer::$ONLY_TEXT : $only_keep_text;
|
||||
public function __construct($tags_to_remove = null
|
||||
, $kept_attributes = null
|
||||
, $only_keep_text = null){
|
||||
$this->tagsToRemove = is_null($tags_to_remove) ? HTMLSanitizer::$DEFAULT_CLEAR_TAGS : $tags_to_remove;
|
||||
$this->keptAttributes = is_null($kept_attributes) ? HTMLSanitizer::$KEPT_ATTRIBUTES : $kept_attributes;
|
||||
$this->onlyKeepText = is_null($only_keep_text) ? HTMLSanitizer::$ONLY_TEXT : $only_keep_text;
|
||||
}
|
||||
|
||||
public function sanitize($textToSanitize){
|
||||
|
@ -191,7 +297,9 @@ class HTMLSanitizer {
|
|||
|
||||
public static function defaultImageSrcTo($content, $server){
|
||||
foreach($content->find('img') as $image){
|
||||
if(strpos($image->src, "http") == NULL && strpos($image->src, "//") == NULL && strpos($image->src, "data:") == NULL)
|
||||
if(is_null(strpos($image->src, "http"))
|
||||
&& is_null(strpos($image->src, "//"))
|
||||
&& is_null(strpos($image->src, "data:")))
|
||||
$image->src = $server . $image->src;
|
||||
}
|
||||
return $content;
|
||||
|
|
|
@ -19,7 +19,12 @@ require __DIR__ . '/HTMLUtils.php';
|
|||
|
||||
$vendorLibSimpleHtmlDom = __DIR__ . PATH_VENDOR . '/simplehtmldom/simple_html_dom.php';
|
||||
if( !file_exists($vendorLibSimpleHtmlDom) ){
|
||||
throw new \HttpException('"PHP Simple HTML DOM Parser" library is missing. Get it from http://simplehtmldom.sourceforge.net and place the script "simple_html_dom.php" in '.substr(PATH_VENDOR,4) . '/simplehtmldom/', 500);
|
||||
throw new \HttpException('"PHP Simple HTML DOM Parser" library is missing.'
|
||||
. ' Get it from http://simplehtmldom.sourceforge.net and place the script'
|
||||
. ' "simple_html_dom.php" in '
|
||||
. substr(PATH_VENDOR,4)
|
||||
. '/simplehtmldom/'
|
||||
, 500);
|
||||
}
|
||||
require_once $vendorLibSimpleHtmlDom;
|
||||
|
||||
|
|
Loading…
Reference in a new issue