@@ -868,7 +868,6 @@ discard block |
||
868 | 868 | * This tells SimplePie to ignore any file errors and fall back to cache |
869 | 869 | * instead. This only works if caching is enabled and cached content |
870 | 870 | * still exists. |
871 | - |
|
872 | 871 | * @param bool $enable Force use of cache on fail. |
873 | 872 | */ |
874 | 873 | public function force_cache_fallback($enable = false) |
@@ -1663,7 +1662,7 @@ discard block |
||
1663 | 1662 | // Now also do feed discovery, but if microformats were found don't |
1664 | 1663 | // overwrite the current value of file. |
1665 | 1664 | $discovered = $locate->find($this->autodiscovery, |
1666 | - $this->all_discovered_feeds); |
|
1665 | + $this->all_discovered_feeds); |
|
1667 | 1666 | if ($microformats) |
1668 | 1667 | { |
1669 | 1668 | if ($hub = $locate->get_rel_link('hub')) |
@@ -1928,8 +1927,8 @@ discard block |
||
1928 | 1927 | { |
1929 | 1928 | // sanitize encodes ampersands which are required when used in a url. |
1930 | 1929 | return str_replace('&', '&', |
1931 | - $this->sanitize($this->permanent_url, |
|
1932 | - SIMPLEPIE_CONSTRUCT_IRI)); |
|
1930 | + $this->sanitize($this->permanent_url, |
|
1931 | + SIMPLEPIE_CONSTRUCT_IRI)); |
|
1933 | 1932 | } |
1934 | 1933 | } |
1935 | 1934 | else |
@@ -1937,8 +1936,8 @@ discard block |
||
1937 | 1936 | if ($this->feed_url !== null) |
1938 | 1937 | { |
1939 | 1938 | return str_replace('&', '&', |
1940 | - $this->sanitize($this->feed_url, |
|
1941 | - SIMPLEPIE_CONSTRUCT_IRI)); |
|
1939 | + $this->sanitize($this->feed_url, |
|
1940 | + SIMPLEPIE_CONSTRUCT_IRI)); |
|
1942 | 1941 | } |
1943 | 1942 | } |
1944 | 1943 | return null; |
@@ -2597,8 +2596,8 @@ discard block |
||
2597 | 2596 | } |
2598 | 2597 | |
2599 | 2598 | if (isset($this->data['headers']['link']) && |
2600 | - preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/', |
|
2601 | - $this->data['headers']['link'], $match)) |
|
2599 | + preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/', |
|
2600 | + $this->data['headers']['link'], $match)) |
|
2602 | 2601 | { |
2603 | 2602 | return array($match[1]); |
2604 | 2603 | } |
@@ -3937,112 +3936,112 @@ discard block |
||
3937 | 3936 | */ |
3938 | 3937 | class SimplePie_Cache_Memcached implements SimplePie_Cache_Base |
3939 | 3938 | { |
3940 | - /** |
|
3941 | - * Memcached instance |
|
3942 | - * @var Memcached |
|
3943 | - */ |
|
3944 | - protected $cache; |
|
3945 | - |
|
3946 | - /** |
|
3947 | - * Options |
|
3948 | - * @var array |
|
3949 | - */ |
|
3950 | - protected $options; |
|
3951 | - |
|
3952 | - /** |
|
3953 | - * Cache name |
|
3954 | - * @var string |
|
3955 | - */ |
|
3956 | - protected $name; |
|
3957 | - |
|
3958 | - /** |
|
3959 | - * Create a new cache object |
|
3960 | - * @param string $location Location string (from SimplePie::$cache_location) |
|
3961 | - * @param string $name Unique ID for the cache |
|
3962 | - * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data |
|
3963 | - */ |
|
3964 | - public function __construct($location, $name, $type) { |
|
3965 | - $this->options = array( |
|
3966 | - 'host' => '127.0.0.1', |
|
3967 | - 'port' => 11211, |
|
3968 | - 'extras' => array( |
|
3969 | - 'timeout' => 3600, // one hour |
|
3970 | - 'prefix' => 'simplepie_', |
|
3971 | - ), |
|
3972 | - ); |
|
3973 | - $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location)); |
|
3974 | - |
|
3975 | - $this->name = $this->options['extras']['prefix'] . md5("$name:$type"); |
|
3976 | - |
|
3977 | - $this->cache = new Memcached(); |
|
3978 | - $this->cache->addServer($this->options['host'], (int)$this->options['port']); |
|
3979 | - } |
|
3980 | - |
|
3981 | - /** |
|
3982 | - * Save data to the cache |
|
3983 | - * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property |
|
3984 | - * @return bool Successfulness |
|
3985 | - */ |
|
3986 | - public function save($data) { |
|
3987 | - if ($data instanceof SimplePie) { |
|
3988 | - $data = $data->data; |
|
3989 | - } |
|
3990 | - |
|
3991 | - return $this->setData(serialize($data)); |
|
3992 | - } |
|
3993 | - |
|
3994 | - /** |
|
3995 | - * Retrieve the data saved to the cache |
|
3996 | - * @return array Data for SimplePie::$data |
|
3997 | - */ |
|
3998 | - public function load() { |
|
3999 | - $data = $this->cache->get($this->name); |
|
4000 | - |
|
4001 | - if ($data !== false) { |
|
4002 | - return unserialize($data); |
|
4003 | - } |
|
4004 | - return false; |
|
4005 | - } |
|
4006 | - |
|
4007 | - /** |
|
4008 | - * Retrieve the last modified time for the cache |
|
4009 | - * @return int Timestamp |
|
4010 | - */ |
|
4011 | - public function mtime() { |
|
4012 | - $data = $this->cache->get($this->name . '_mtime'); |
|
4013 | - return (int) $data; |
|
4014 | - } |
|
4015 | - |
|
4016 | - /** |
|
4017 | - * Set the last modified time to the current time |
|
4018 | - * @return bool Success status |
|
4019 | - */ |
|
4020 | - public function touch() { |
|
4021 | - $data = $this->cache->get($this->name); |
|
4022 | - return $this->setData($data); |
|
4023 | - } |
|
4024 | - |
|
4025 | - /** |
|
4026 | - * Remove the cache |
|
4027 | - * @return bool Success status |
|
4028 | - */ |
|
4029 | - public function unlink() { |
|
4030 | - return $this->cache->delete($this->name, 0); |
|
4031 | - } |
|
4032 | - |
|
4033 | - /** |
|
4034 | - * Set the last modified time and data to Memcached |
|
4035 | - * @return bool Success status |
|
4036 | - */ |
|
4037 | - private function setData($data) { |
|
4038 | - |
|
4039 | - if ($data !== false) { |
|
4040 | - $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']); |
|
4041 | - return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']); |
|
4042 | - } |
|
4043 | - |
|
4044 | - return false; |
|
4045 | - } |
|
3939 | + /** |
|
3940 | + * Memcached instance |
|
3941 | + * @var Memcached |
|
3942 | + */ |
|
3943 | + protected $cache; |
|
3944 | + |
|
3945 | + /** |
|
3946 | + * Options |
|
3947 | + * @var array |
|
3948 | + */ |
|
3949 | + protected $options; |
|
3950 | + |
|
3951 | + /** |
|
3952 | + * Cache name |
|
3953 | + * @var string |
|
3954 | + */ |
|
3955 | + protected $name; |
|
3956 | + |
|
3957 | + /** |
|
3958 | + * Create a new cache object |
|
3959 | + * @param string $location Location string (from SimplePie::$cache_location) |
|
3960 | + * @param string $name Unique ID for the cache |
|
3961 | + * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data |
|
3962 | + */ |
|
3963 | + public function __construct($location, $name, $type) { |
|
3964 | + $this->options = array( |
|
3965 | + 'host' => '127.0.0.1', |
|
3966 | + 'port' => 11211, |
|
3967 | + 'extras' => array( |
|
3968 | + 'timeout' => 3600, // one hour |
|
3969 | + 'prefix' => 'simplepie_', |
|
3970 | + ), |
|
3971 | + ); |
|
3972 | + $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location)); |
|
3973 | + |
|
3974 | + $this->name = $this->options['extras']['prefix'] . md5("$name:$type"); |
|
3975 | + |
|
3976 | + $this->cache = new Memcached(); |
|
3977 | + $this->cache->addServer($this->options['host'], (int)$this->options['port']); |
|
3978 | + } |
|
3979 | + |
|
3980 | + /** |
|
3981 | + * Save data to the cache |
|
3982 | + * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property |
|
3983 | + * @return bool Successfulness |
|
3984 | + */ |
|
3985 | + public function save($data) { |
|
3986 | + if ($data instanceof SimplePie) { |
|
3987 | + $data = $data->data; |
|
3988 | + } |
|
3989 | + |
|
3990 | + return $this->setData(serialize($data)); |
|
3991 | + } |
|
3992 | + |
|
3993 | + /** |
|
3994 | + * Retrieve the data saved to the cache |
|
3995 | + * @return array Data for SimplePie::$data |
|
3996 | + */ |
|
3997 | + public function load() { |
|
3998 | + $data = $this->cache->get($this->name); |
|
3999 | + |
|
4000 | + if ($data !== false) { |
|
4001 | + return unserialize($data); |
|
4002 | + } |
|
4003 | + return false; |
|
4004 | + } |
|
4005 | + |
|
4006 | + /** |
|
4007 | + * Retrieve the last modified time for the cache |
|
4008 | + * @return int Timestamp |
|
4009 | + */ |
|
4010 | + public function mtime() { |
|
4011 | + $data = $this->cache->get($this->name . '_mtime'); |
|
4012 | + return (int) $data; |
|
4013 | + } |
|
4014 | + |
|
4015 | + /** |
|
4016 | + * Set the last modified time to the current time |
|
4017 | + * @return bool Success status |
|
4018 | + */ |
|
4019 | + public function touch() { |
|
4020 | + $data = $this->cache->get($this->name); |
|
4021 | + return $this->setData($data); |
|
4022 | + } |
|
4023 | + |
|
4024 | + /** |
|
4025 | + * Remove the cache |
|
4026 | + * @return bool Success status |
|
4027 | + */ |
|
4028 | + public function unlink() { |
|
4029 | + return $this->cache->delete($this->name, 0); |
|
4030 | + } |
|
4031 | + |
|
4032 | + /** |
|
4033 | + * Set the last modified time and data to Memcached |
|
4034 | + * @return bool Success status |
|
4035 | + */ |
|
4036 | + private function setData($data) { |
|
4037 | + |
|
4038 | + if ($data !== false) { |
|
4039 | + $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']); |
|
4040 | + return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']); |
|
4041 | + } |
|
4042 | + |
|
4043 | + return false; |
|
4044 | + } |
|
4046 | 4045 | } |
4047 | 4046 | |
4048 | 4047 | /** |
@@ -4471,143 +4470,143 @@ discard block |
||
4471 | 4470 | * @uses Redis |
4472 | 4471 | */ |
4473 | 4472 | class SimplePie_Cache_Redis implements SimplePie_Cache_Base { |
4474 | - /** |
|
4475 | - * Redis instance |
|
4476 | - * |
|
4477 | - * @var \Redis |
|
4478 | - */ |
|
4479 | - protected $cache; |
|
4480 | - |
|
4481 | - /** |
|
4482 | - * Options |
|
4483 | - * |
|
4484 | - * @var array |
|
4485 | - */ |
|
4486 | - protected $options; |
|
4487 | - |
|
4488 | - /** |
|
4489 | - * Cache name |
|
4490 | - * |
|
4491 | - * @var string |
|
4492 | - */ |
|
4493 | - protected $name; |
|
4494 | - |
|
4495 | - /** |
|
4496 | - * Cache Data |
|
4497 | - * |
|
4498 | - * @var type |
|
4499 | - */ |
|
4500 | - protected $data; |
|
4501 | - |
|
4502 | - /** |
|
4503 | - * Create a new cache object |
|
4504 | - * |
|
4505 | - * @param string $location Location string (from SimplePie::$cache_location) |
|
4506 | - * @param string $name Unique ID for the cache |
|
4507 | - * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data |
|
4508 | - */ |
|
4509 | - public function __construct($location, $name, $options = null) { |
|
4510 | - //$this->cache = \flow\simple\cache\Redis::getRedisClientInstance(); |
|
4511 | - $parsed = SimplePie_Cache::parse_URL($location); |
|
4512 | - $redis = new Redis(); |
|
4513 | - $redis->connect($parsed['host'], $parsed['port']); |
|
4514 | - $this->cache = $redis; |
|
4515 | - |
|
4516 | - if (!is_null($options) && is_array($options)) { |
|
4517 | - $this->options = $options; |
|
4518 | - } else { |
|
4519 | - $this->options = array ( |
|
4520 | - 'prefix' => 'rss:simple_primary:', |
|
4521 | - 'expire' => 0, |
|
4522 | - ); |
|
4523 | - } |
|
4524 | - |
|
4525 | - $this->name = $this->options['prefix'] . $name; |
|
4526 | - } |
|
4527 | - |
|
4528 | - /** |
|
4529 | - * @param \Redis $cache |
|
4530 | - */ |
|
4531 | - public function setRedisClient(\Redis $cache) { |
|
4532 | - $this->cache = $cache; |
|
4533 | - } |
|
4534 | - |
|
4535 | - /** |
|
4536 | - * Save data to the cache |
|
4537 | - * |
|
4538 | - * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property |
|
4539 | - * @return bool Successfulness |
|
4540 | - */ |
|
4541 | - public function save($data) { |
|
4542 | - if ($data instanceof SimplePie) { |
|
4543 | - $data = $data->data; |
|
4544 | - } |
|
4545 | - $response = $this->cache->set($this->name, serialize($data)); |
|
4546 | - if ($this->options['expire']) { |
|
4547 | - $this->cache->expire($this->name, $this->options['expire']); |
|
4548 | - } |
|
4549 | - |
|
4550 | - return $response; |
|
4551 | - } |
|
4552 | - |
|
4553 | - /** |
|
4554 | - * Retrieve the data saved to the cache |
|
4555 | - * |
|
4556 | - * @return array Data for SimplePie::$data |
|
4557 | - */ |
|
4558 | - public function load() { |
|
4559 | - $data = $this->cache->get($this->name); |
|
4560 | - |
|
4561 | - if ($data !== false) { |
|
4562 | - return unserialize($data); |
|
4563 | - } |
|
4564 | - return false; |
|
4565 | - } |
|
4566 | - |
|
4567 | - /** |
|
4568 | - * Retrieve the last modified time for the cache |
|
4569 | - * |
|
4570 | - * @return int Timestamp |
|
4571 | - */ |
|
4572 | - public function mtime() { |
|
4573 | - |
|
4574 | - $data = $this->cache->get($this->name); |
|
4575 | - |
|
4576 | - if ($data !== false) { |
|
4577 | - return time(); |
|
4578 | - } |
|
4579 | - |
|
4580 | - return false; |
|
4581 | - } |
|
4582 | - |
|
4583 | - /** |
|
4584 | - * Set the last modified time to the current time |
|
4585 | - * |
|
4586 | - * @return bool Success status |
|
4587 | - */ |
|
4588 | - public function touch() { |
|
4589 | - |
|
4590 | - $data = $this->cache->get($this->name); |
|
4591 | - |
|
4592 | - if ($data !== false) { |
|
4593 | - $return = $this->cache->set($this->name, $data); |
|
4594 | - if ($this->options['expire']) { |
|
4595 | - return $this->cache->expire($this->name, $this->ttl); |
|
4596 | - } |
|
4597 | - return $return; |
|
4598 | - } |
|
4599 | - |
|
4600 | - return false; |
|
4601 | - } |
|
4602 | - |
|
4603 | - /** |
|
4604 | - * Remove the cache |
|
4605 | - * |
|
4606 | - * @return bool Success status |
|
4607 | - */ |
|
4608 | - public function unlink() { |
|
4609 | - return $this->cache->set($this->name, null); |
|
4610 | - } |
|
4473 | + /** |
|
4474 | + * Redis instance |
|
4475 | + * |
|
4476 | + * @var \Redis |
|
4477 | + */ |
|
4478 | + protected $cache; |
|
4479 | + |
|
4480 | + /** |
|
4481 | + * Options |
|
4482 | + * |
|
4483 | + * @var array |
|
4484 | + */ |
|
4485 | + protected $options; |
|
4486 | + |
|
4487 | + /** |
|
4488 | + * Cache name |
|
4489 | + * |
|
4490 | + * @var string |
|
4491 | + */ |
|
4492 | + protected $name; |
|
4493 | + |
|
4494 | + /** |
|
4495 | + * Cache Data |
|
4496 | + * |
|
4497 | + * @var type |
|
4498 | + */ |
|
4499 | + protected $data; |
|
4500 | + |
|
4501 | + /** |
|
4502 | + * Create a new cache object |
|
4503 | + * |
|
4504 | + * @param string $location Location string (from SimplePie::$cache_location) |
|
4505 | + * @param string $name Unique ID for the cache |
|
4506 | + * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data |
|
4507 | + */ |
|
4508 | + public function __construct($location, $name, $options = null) { |
|
4509 | + //$this->cache = \flow\simple\cache\Redis::getRedisClientInstance(); |
|
4510 | + $parsed = SimplePie_Cache::parse_URL($location); |
|
4511 | + $redis = new Redis(); |
|
4512 | + $redis->connect($parsed['host'], $parsed['port']); |
|
4513 | + $this->cache = $redis; |
|
4514 | + |
|
4515 | + if (!is_null($options) && is_array($options)) { |
|
4516 | + $this->options = $options; |
|
4517 | + } else { |
|
4518 | + $this->options = array ( |
|
4519 | + 'prefix' => 'rss:simple_primary:', |
|
4520 | + 'expire' => 0, |
|
4521 | + ); |
|
4522 | + } |
|
4523 | + |
|
4524 | + $this->name = $this->options['prefix'] . $name; |
|
4525 | + } |
|
4526 | + |
|
4527 | + /** |
|
4528 | + * @param \Redis $cache |
|
4529 | + */ |
|
4530 | + public function setRedisClient(\Redis $cache) { |
|
4531 | + $this->cache = $cache; |
|
4532 | + } |
|
4533 | + |
|
4534 | + /** |
|
4535 | + * Save data to the cache |
|
4536 | + * |
|
4537 | + * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property |
|
4538 | + * @return bool Successfulness |
|
4539 | + */ |
|
4540 | + public function save($data) { |
|
4541 | + if ($data instanceof SimplePie) { |
|
4542 | + $data = $data->data; |
|
4543 | + } |
|
4544 | + $response = $this->cache->set($this->name, serialize($data)); |
|
4545 | + if ($this->options['expire']) { |
|
4546 | + $this->cache->expire($this->name, $this->options['expire']); |
|
4547 | + } |
|
4548 | + |
|
4549 | + return $response; |
|
4550 | + } |
|
4551 | + |
|
4552 | + /** |
|
4553 | + * Retrieve the data saved to the cache |
|
4554 | + * |
|
4555 | + * @return array Data for SimplePie::$data |
|
4556 | + */ |
|
4557 | + public function load() { |
|
4558 | + $data = $this->cache->get($this->name); |
|
4559 | + |
|
4560 | + if ($data !== false) { |
|
4561 | + return unserialize($data); |
|
4562 | + } |
|
4563 | + return false; |
|
4564 | + } |
|
4565 | + |
|
4566 | + /** |
|
4567 | + * Retrieve the last modified time for the cache |
|
4568 | + * |
|
4569 | + * @return int Timestamp |
|
4570 | + */ |
|
4571 | + public function mtime() { |
|
4572 | + |
|
4573 | + $data = $this->cache->get($this->name); |
|
4574 | + |
|
4575 | + if ($data !== false) { |
|
4576 | + return time(); |
|
4577 | + } |
|
4578 | + |
|
4579 | + return false; |
|
4580 | + } |
|
4581 | + |
|
4582 | + /** |
|
4583 | + * Set the last modified time to the current time |
|
4584 | + * |
|
4585 | + * @return bool Success status |
|
4586 | + */ |
|
4587 | + public function touch() { |
|
4588 | + |
|
4589 | + $data = $this->cache->get($this->name); |
|
4590 | + |
|
4591 | + if ($data !== false) { |
|
4592 | + $return = $this->cache->set($this->name, $data); |
|
4593 | + if ($this->options['expire']) { |
|
4594 | + return $this->cache->expire($this->name, $this->ttl); |
|
4595 | + } |
|
4596 | + return $return; |
|
4597 | + } |
|
4598 | + |
|
4599 | + return false; |
|
4600 | + } |
|
4601 | + |
|
4602 | + /** |
|
4603 | + * Remove the cache |
|
4604 | + * |
|
4605 | + * @return bool Success status |
|
4606 | + */ |
|
4607 | + public function unlink() { |
|
4608 | + return $this->cache->set($this->name, null); |
|
4609 | + } |
|
4611 | 4610 | |
4612 | 4611 | } |
4613 | 4612 | |
@@ -8269,9 +8268,9 @@ discard block |
||
8269 | 8268 | * Clean up |
8270 | 8269 | */ |
8271 | 8270 | public function __destruct() { |
8272 | - $this->set_iri(null, true); |
|
8273 | - $this->set_path(null, true); |
|
8274 | - $this->set_authority(null, true); |
|
8271 | + $this->set_iri(null, true); |
|
8272 | + $this->set_path(null, true); |
|
8273 | + $this->set_authority(null, true); |
|
8275 | 8274 | } |
8276 | 8275 | |
8277 | 8276 | /** |
@@ -8794,9 +8793,9 @@ discard block |
||
8794 | 8793 | // Relative urls cannot have a colon in the first path segment (and the |
8795 | 8794 | // slashes themselves are not included so skip the first character). |
8796 | 8795 | if (!$this->scheme && !$isauthority && |
8797 | - strpos($this->ipath, ':') !== false && |
|
8798 | - strpos($this->ipath, '/', 1) !== false && |
|
8799 | - strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false; |
|
8796 | + strpos($this->ipath, ':') !== false && |
|
8797 | + strpos($this->ipath, '/', 1) !== false && |
|
8798 | + strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false; |
|
8800 | 8799 | |
8801 | 8800 | return true; |
8802 | 8801 | } |
@@ -9469,7 +9468,7 @@ discard block |
||
9469 | 9468 | $fn = 'md5'; |
9470 | 9469 | } |
9471 | 9470 | return call_user_func($fn, |
9472 | - $this->get_permalink().$this->get_title().$this->get_content()); |
|
9471 | + $this->get_permalink().$this->get_title().$this->get_content()); |
|
9473 | 9472 | } |
9474 | 9473 | |
9475 | 9474 | /** |
@@ -9538,47 +9537,47 @@ discard block |
||
9538 | 9537 | public function get_description($description_only = false) |
9539 | 9538 | { |
9540 | 9539 | if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary')) && |
9541 | - ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9540 | + ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9542 | 9541 | { |
9543 | 9542 | return $return; |
9544 | 9543 | } |
9545 | 9544 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) && |
9546 | - ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9545 | + ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9547 | 9546 | { |
9548 | 9547 | return $return; |
9549 | 9548 | } |
9550 | 9549 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) && |
9551 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0])))) |
|
9550 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0])))) |
|
9552 | 9551 | { |
9553 | 9552 | return $return; |
9554 | 9553 | } |
9555 | 9554 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) && |
9556 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0])))) |
|
9555 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0])))) |
|
9557 | 9556 | { |
9558 | 9557 | return $return; |
9559 | 9558 | } |
9560 | 9559 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) && |
9561 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT))) |
|
9560 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT))) |
|
9562 | 9561 | { |
9563 | 9562 | return $return; |
9564 | 9563 | } |
9565 | 9564 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) && |
9566 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT))) |
|
9565 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT))) |
|
9567 | 9566 | { |
9568 | 9567 | return $return; |
9569 | 9568 | } |
9570 | 9569 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) && |
9571 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0])))) |
|
9570 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0])))) |
|
9572 | 9571 | { |
9573 | 9572 | return $return; |
9574 | 9573 | } |
9575 | 9574 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) && |
9576 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT))) |
|
9575 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT))) |
|
9577 | 9576 | { |
9578 | 9577 | return $return; |
9579 | 9578 | } |
9580 | 9579 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) && |
9581 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML))) |
|
9580 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML))) |
|
9582 | 9581 | { |
9583 | 9582 | return $return; |
9584 | 9583 | } |
@@ -9610,17 +9609,17 @@ discard block |
||
9610 | 9609 | public function get_content($content_only = false) |
9611 | 9610 | { |
9612 | 9611 | if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content')) && |
9613 | - ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9612 | + ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9614 | 9613 | { |
9615 | 9614 | return $return; |
9616 | 9615 | } |
9617 | 9616 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) && |
9618 | - ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9617 | + ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0])))) |
|
9619 | 9618 | { |
9620 | 9619 | return $return; |
9621 | 9620 | } |
9622 | 9621 | elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) && |
9623 | - ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0])))) |
|
9622 | + ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0])))) |
|
9624 | 9623 | { |
9625 | 9624 | return $return; |
9626 | 9625 | } |
@@ -12335,8 +12334,8 @@ discard block |
||
12335 | 12334 | $sniffer = $this->registry->create('Content_Type_Sniffer', array($file)); |
12336 | 12335 | $sniffed = $sniffer->get_type(); |
12337 | 12336 | $mime_types = array('application/rss+xml', 'application/rdf+xml', |
12338 | - 'text/rdf', 'application/atom+xml', 'text/xml', |
|
12339 | - 'application/xml', 'application/x-rss+xml'); |
|
12337 | + 'text/rdf', 'application/atom+xml', 'text/xml', |
|
12338 | + 'application/xml', 'application/x-rss+xml'); |
|
12340 | 12339 | if ($check_html) |
12341 | 12340 | { |
12342 | 12341 | $mime_types[] = 'text/html'; |
@@ -12510,12 +12509,12 @@ discard block |
||
12510 | 12509 | if ($this->dom === null) |
12511 | 12510 | { |
12512 | 12511 | throw new SimplePie_Exception('DOMDocument not found, unable to use '. |
12513 | - 'locator'); |
|
12512 | + 'locator'); |
|
12514 | 12513 | } |
12515 | 12514 | if (!class_exists('DOMXpath')) |
12516 | 12515 | { |
12517 | 12516 | throw new SimplePie_Exception('DOMXpath not found, unable to use '. |
12518 | - 'get_rel_link'); |
|
12517 | + 'get_rel_link'); |
|
12519 | 12518 | } |
12520 | 12519 | |
12521 | 12520 | $xpath = new DOMXpath($this->dom); |
@@ -12525,22 +12524,22 @@ discard block |
||
12525 | 12524 | $href = trim($link->getAttribute('href')); |
12526 | 12525 | $parsed = $this->registry->call('Misc', 'parse_url', array($href)); |
12527 | 12526 | if ($parsed['scheme'] === '' || |
12528 | - preg_match('/^https?$/i', $parsed['scheme'])) |
|
12527 | + preg_match('/^https?$/i', $parsed['scheme'])) |
|
12529 | 12528 | { |
12530 | 12529 | if (method_exists($link, 'getLineNo') && |
12531 | - $this->base_location < $link->getLineNo()) |
|
12530 | + $this->base_location < $link->getLineNo()) |
|
12532 | 12531 | { |
12533 | 12532 | $href = |
12534 | 12533 | $this->registry->call('Misc', 'absolutize_url', |
12535 | - array(trim($link->getAttribute('href')), |
|
12536 | - $this->base)); |
|
12534 | + array(trim($link->getAttribute('href')), |
|
12535 | + $this->base)); |
|
12537 | 12536 | } |
12538 | 12537 | else |
12539 | 12538 | { |
12540 | 12539 | $href = |
12541 | 12540 | $this->registry->call('Misc', 'absolutize_url', |
12542 | - array(trim($link->getAttribute('href')), |
|
12543 | - $this->http_base)); |
|
12541 | + array(trim($link->getAttribute('href')), |
|
12542 | + $this->http_base)); |
|
12544 | 12543 | } |
12545 | 12544 | if ($href === false) |
12546 | 12545 | { |
@@ -16630,9 +16629,9 @@ discard block |
||
16630 | 16629 | } |
16631 | 16630 | $channel = array('channel' => array(array('child' => array('' => |
16632 | 16631 | array('link' => $link, 'image' => $image, 'title' => $feed_title, |
16633 | - 'item' => $items))))); |
|
16632 | + 'item' => $items))))); |
|
16634 | 16633 | $rss = array(array('attribs' => array('' => array('version' => '2.0')), |
16635 | - 'child' => array('' => $channel))); |
|
16634 | + 'child' => array('' => $channel))); |
|
16636 | 16635 | $this->data = array('child' => array('' => array('rss' => $rss))); |
16637 | 16636 | return true; |
16638 | 16637 | } |
@@ -254,16 +254,16 @@ discard block |
||
254 | 254 | <div class="more"> |
255 | 255 | <?php |
256 | 256 | |
257 | - if ($year != '' && $month != '') { |
|
258 | - ?> |
|
257 | + if ($year != '' && $month != '') { |
|
258 | + ?> |
|
259 | 259 | <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
260 | 260 | <?php |
261 | - } else { |
|
262 | - ?> |
|
261 | + } else { |
|
262 | + ?> |
|
263 | 263 | <a href="<?php print $globalURL; ?>/marine/statistics/type" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
264 | 264 | <?php |
265 | - } |
|
266 | - ?> |
|
265 | + } |
|
266 | + ?> |
|
267 | 267 | </div> |
268 | 268 | </div> |
269 | 269 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | ?> |
298 | 298 | <div class="more"> |
299 | 299 | <?php |
300 | - /* |
|
300 | + /* |
|
301 | 301 | if ($year != '' && $month != '') { |
302 | 302 | ?> |
303 | 303 | <a href="<?php print $globalURL; ?>/tracker/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | <?php |
309 | 309 | } |
310 | 310 | */ |
311 | - ?> |
|
311 | + ?> |
|
312 | 312 | </div> |
313 | 313 | </div> |
314 | 314 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | </form> |
8 | 8 | </div> |
9 | 9 | <?php |
10 | - if (isset($owner)) { |
|
10 | + if (isset($owner)) { |
|
11 | 11 | ?> |
12 | 12 | <div class="sub-menu sub-menu-container"> |
13 | 13 | <ul class="nav nav-pills"> |
@@ -38,5 +38,5 @@ discard block |
||
38 | 38 | </ul> |
39 | 39 | </div> |
40 | 40 | <?php |
41 | - } |
|
41 | + } |
|
42 | 42 | ?> |
43 | 43 | \ No newline at end of file |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | $id = $spotter_item['Waypoint']['@attributes']['id']; |
24 | 24 | if ($id == 0 || !is_numeric($id)) $id = $j; |
25 | 25 | $output .= '{"type": "Feature",'; |
26 | - $output .= '"id": '.$id.','; |
|
27 | - $output .= '"properties": {'; |
|
26 | + $output .= '"id": '.$id.','; |
|
27 | + $output .= '"properties": {'; |
|
28 | 28 | $output .= '"type": "'.$spotter_item['@attributes']['type'].'",'; |
29 | 29 | //$output .= '"id": "'.$spotter_item['Waypoint']['@attributes']['id'].'",'; |
30 | 30 | $output .= '"name": "'.$spotter_item['Waypoint']['@attributes']['name'].'",'; |
@@ -35,31 +35,31 @@ discard block |
||
35 | 35 | } elseif ($spotter_item['@attributes']['type'] == 'Finish') { |
36 | 36 | $output .= '"icon": "/images/tsk/tsk-finish.png"'; |
37 | 37 | } else $output .= '"icon": "/images/tsk/number_'.$id.'.png"'; |
38 | - $output .= '},'; |
|
39 | - $output .= '"geometry": {'; |
|
38 | + $output .= '},'; |
|
39 | + $output .= '"geometry": {'; |
|
40 | 40 | $output .= '"type": "Point",'; |
41 | 41 | $output .= '"coordinates": ['; |
42 | - $output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude']; |
|
42 | + $output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude']; |
|
43 | 43 | $output .= ']'; |
44 | - $output .= '}'; |
|
44 | + $output .= '}'; |
|
45 | 45 | $output .= '},'; |
46 | 46 | $j++; |
47 | 47 | } |
48 | 48 | // Lines |
49 | 49 | $output .= '{"type": "Feature",'; |
50 | - $output .= '"properties": {'; |
|
50 | + $output .= '"properties": {'; |
|
51 | 51 | $output .= '"type": "'.$spotter_array['@attributes']['type'].'"'; |
52 | - $output .= '},'; |
|
53 | - $output .= '"geometry": {'; |
|
52 | + $output .= '},'; |
|
53 | + $output .= '"geometry": {'; |
|
54 | 54 | $output .= '"type": "LineString",'; |
55 | 55 | $output .= '"coordinates": ['; |
56 | 56 | foreach($spotter_array['Point'] as $spotter_item) |
57 | 57 | { |
58 | - $output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],'; |
|
58 | + $output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],'; |
|
59 | 59 | } |
60 | 60 | $output = substr($output, 0, -1); |
61 | 61 | $output .= ']'; |
62 | - $output .= '}'; |
|
62 | + $output .= '}'; |
|
63 | 63 | $output .= '},'; |
64 | 64 | $output = substr($output, 0, -1); |
65 | 65 | } |
@@ -13,11 +13,11 @@ discard block |
||
13 | 13 | } |
14 | 14 | |
15 | 15 | /** |
16 | - * Gets the images based on the aircraft registration |
|
17 | - * |
|
18 | - * @return Array the images list |
|
19 | - * |
|
20 | - */ |
|
16 | + * Gets the images based on the aircraft registration |
|
17 | + * |
|
18 | + * @return Array the images list |
|
19 | + * |
|
20 | + */ |
|
21 | 21 | public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
22 | 22 | { |
23 | 23 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
41 | - * Gets the images based on the ship name |
|
42 | - * |
|
43 | - * @return Array the images list |
|
44 | - * |
|
45 | - */ |
|
41 | + * Gets the images based on the ship name |
|
42 | + * |
|
43 | + * @return Array the images list |
|
44 | + * |
|
45 | + */ |
|
46 | 46 | public function getMarineImage($mmsi,$imo = '',$name = '') |
47 | 47 | { |
48 | 48 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
@@ -69,11 +69,11 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
72 | - * Gets the image copyright based on the Exif data |
|
73 | - * |
|
74 | - * @return String image copyright |
|
75 | - * |
|
76 | - */ |
|
72 | + * Gets the image copyright based on the Exif data |
|
73 | + * |
|
74 | + * @return String image copyright |
|
75 | + * |
|
76 | + */ |
|
77 | 77 | public function getExifCopyright($url) { |
78 | 78 | $exif = exif_read_data($url); |
79 | 79 | $copyright = ''; |
@@ -88,11 +88,11 @@ discard block |
||
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
91 | - * Adds the images based on the aircraft registration |
|
92 | - * |
|
93 | - * @return String either success or error |
|
94 | - * |
|
95 | - */ |
|
91 | + * Adds the images based on the aircraft registration |
|
92 | + * |
|
93 | + * @return String either success or error |
|
94 | + * |
|
95 | + */ |
|
96 | 96 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
97 | 97 | { |
98 | 98 | global $globalDebug,$globalAircraftImageFetch, $globalOffline; |
@@ -120,11 +120,11 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
123 | - * Adds the images based on the marine name |
|
124 | - * |
|
125 | - * @return String either success or error |
|
126 | - * |
|
127 | - */ |
|
123 | + * Adds the images based on the marine name |
|
124 | + * |
|
125 | + * @return String either success or error |
|
126 | + * |
|
127 | + */ |
|
128 | 128 | public function addMarineImage($mmsi,$imo = '',$name = '') |
129 | 129 | { |
130 | 130 | global $globalDebug,$globalMarineImageFetch, $globalOffline; |
@@ -161,12 +161,12 @@ discard block |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
164 | - * Gets the aircraft image |
|
165 | - * |
|
166 | - * @param String $aircraft_registration the registration of the aircraft |
|
167 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
168 | - * |
|
169 | - */ |
|
164 | + * Gets the aircraft image |
|
165 | + * |
|
166 | + * @param String $aircraft_registration the registration of the aircraft |
|
167 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
168 | + * |
|
169 | + */ |
|
170 | 170 | public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '') |
171 | 171 | { |
172 | 172 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
@@ -210,14 +210,14 @@ discard block |
||
210 | 210 | } |
211 | 211 | |
212 | 212 | /** |
213 | - * Gets the vessel image |
|
214 | - * |
|
215 | - * @param String $mmsi the vessel mmsi |
|
216 | - * @param String $imo the vessel imo |
|
217 | - * @param String $name the vessel name |
|
218 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
219 | - * |
|
220 | - */ |
|
213 | + * Gets the vessel image |
|
214 | + * |
|
215 | + * @param String $mmsi the vessel mmsi |
|
216 | + * @param String $imo the vessel imo |
|
217 | + * @param String $name the vessel name |
|
218 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
219 | + * |
|
220 | + */ |
|
221 | 221 | public function findMarineImage($mmsi,$imo = '',$name = '') |
222 | 222 | { |
223 | 223 | global $globalMarineImageSources; |
@@ -251,13 +251,13 @@ discard block |
||
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
254 | - * Gets the aircraft image from Planespotters |
|
255 | - * |
|
256 | - * @param String $aircraft_registration the registration of the aircraft |
|
257 | - * @param String $aircraft_name type of the aircraft |
|
258 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
259 | - * |
|
260 | - */ |
|
254 | + * Gets the aircraft image from Planespotters |
|
255 | + * |
|
256 | + * @param String $aircraft_registration the registration of the aircraft |
|
257 | + * @param String $aircraft_name type of the aircraft |
|
258 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
259 | + * |
|
260 | + */ |
|
261 | 261 | public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
262 | 262 | $Common = new Common(); |
263 | 263 | // If aircraft registration is only number, also check with aircraft model |
@@ -285,13 +285,13 @@ discard block |
||
285 | 285 | } |
286 | 286 | |
287 | 287 | /** |
288 | - * Gets the aircraft image from Deviantart |
|
289 | - * |
|
290 | - * @param String $registration the registration of the aircraft |
|
291 | - * @param String $name type of the aircraft |
|
292 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
293 | - * |
|
294 | - */ |
|
288 | + * Gets the aircraft image from Deviantart |
|
289 | + * |
|
290 | + * @param String $registration the registration of the aircraft |
|
291 | + * @param String $name type of the aircraft |
|
292 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
293 | + * |
|
294 | + */ |
|
295 | 295 | public function fromDeviantart($type,$registration, $name='') { |
296 | 296 | $Common = new Common(); |
297 | 297 | if ($type == 'aircraft') { |
@@ -325,13 +325,13 @@ discard block |
||
325 | 325 | } |
326 | 326 | |
327 | 327 | /** |
328 | - * Gets the aircraft image from JetPhotos |
|
329 | - * |
|
330 | - * @param String $aircraft_registration the registration of the aircraft |
|
331 | - * @param String $aircraft_name type of the aircraft |
|
332 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
333 | - * |
|
334 | - */ |
|
328 | + * Gets the aircraft image from JetPhotos |
|
329 | + * |
|
330 | + * @param String $aircraft_registration the registration of the aircraft |
|
331 | + * @param String $aircraft_name type of the aircraft |
|
332 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
333 | + * |
|
334 | + */ |
|
335 | 335 | public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
336 | 336 | $Common = new Common(); |
337 | 337 | $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
@@ -367,13 +367,13 @@ discard block |
||
367 | 367 | } |
368 | 368 | |
369 | 369 | /** |
370 | - * Gets the aircraft image from PlanePictures |
|
371 | - * |
|
372 | - * @param String $aircraft_registration the registration of the aircraft |
|
373 | - * @param String $aircraft_name type of the aircraft |
|
374 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
375 | - * |
|
376 | - */ |
|
370 | + * Gets the aircraft image from PlanePictures |
|
371 | + * |
|
372 | + * @param String $aircraft_registration the registration of the aircraft |
|
373 | + * @param String $aircraft_name type of the aircraft |
|
374 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
375 | + * |
|
376 | + */ |
|
377 | 377 | public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
378 | 378 | $Common = new Common(); |
379 | 379 | $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
@@ -401,13 +401,13 @@ discard block |
||
401 | 401 | } |
402 | 402 | |
403 | 403 | /** |
404 | - * Gets the aircraft image from Flickr |
|
405 | - * |
|
406 | - * @param String $registration the registration of the aircraft |
|
407 | - * @param String $name type of the aircraft |
|
408 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
409 | - * |
|
410 | - */ |
|
404 | + * Gets the aircraft image from Flickr |
|
405 | + * |
|
406 | + * @param String $registration the registration of the aircraft |
|
407 | + * @param String $name type of the aircraft |
|
408 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
409 | + * |
|
410 | + */ |
|
411 | 411 | public function fromFlickr($type,$registration,$name='') { |
412 | 412 | $Common = new Common(); |
413 | 413 | if ($type == 'aircraft') { |
@@ -451,13 +451,13 @@ discard block |
||
451 | 451 | } |
452 | 452 | |
453 | 453 | /** |
454 | - * Gets the aircraft image from Bing |
|
455 | - * |
|
456 | - * @param String $aircraft_registration the registration of the aircraft |
|
457 | - * @param String $aircraft_name type of the aircraft |
|
458 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
459 | - * |
|
460 | - */ |
|
454 | + * Gets the aircraft image from Bing |
|
455 | + * |
|
456 | + * @param String $aircraft_registration the registration of the aircraft |
|
457 | + * @param String $aircraft_name type of the aircraft |
|
458 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
459 | + * |
|
460 | + */ |
|
461 | 461 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
462 | 462 | global $globalImageBingKey; |
463 | 463 | $Common = new Common(); |
@@ -488,13 +488,13 @@ discard block |
||
488 | 488 | } |
489 | 489 | |
490 | 490 | /** |
491 | - * Gets the aircraft image from airport-data |
|
492 | - * |
|
493 | - * @param String $aircraft_registration the registration of the aircraft |
|
494 | - * @param String $aircraft_name type of the aircraft |
|
495 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
496 | - * |
|
497 | - */ |
|
491 | + * Gets the aircraft image from airport-data |
|
492 | + * |
|
493 | + * @param String $aircraft_registration the registration of the aircraft |
|
494 | + * @param String $aircraft_name type of the aircraft |
|
495 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
496 | + * |
|
497 | + */ |
|
498 | 498 | public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
499 | 499 | $Common = new Common(); |
500 | 500 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
@@ -513,13 +513,13 @@ discard block |
||
513 | 513 | } |
514 | 514 | |
515 | 515 | /** |
516 | - * Gets image from WikiMedia |
|
517 | - * |
|
518 | - * @param String $registration the registration of the aircraft/mmsi |
|
519 | - * @param String $name name |
|
520 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
521 | - * |
|
522 | - */ |
|
516 | + * Gets image from WikiMedia |
|
517 | + * |
|
518 | + * @param String $registration the registration of the aircraft/mmsi |
|
519 | + * @param String $name name |
|
520 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
521 | + * |
|
522 | + */ |
|
523 | 523 | public function fromWikimedia($type,$registration,$name='') { |
524 | 524 | $Common = new Common(); |
525 | 525 | if ($type == 'aircraft') { |
@@ -574,13 +574,13 @@ discard block |
||
574 | 574 | } |
575 | 575 | |
576 | 576 | /** |
577 | - * Gets the aircraft image from custom url |
|
578 | - * |
|
579 | - * @param String $registration the registration of the aircraft |
|
580 | - * @param String $name type of the aircraft |
|
581 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
582 | - * |
|
583 | - */ |
|
577 | + * Gets the aircraft image from custom url |
|
578 | + * |
|
579 | + * @param String $registration the registration of the aircraft |
|
580 | + * @param String $name type of the aircraft |
|
581 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
582 | + * |
|
583 | + */ |
|
584 | 584 | public function fromCustomSource($type,$registration,$name='') { |
585 | 585 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
586 | 586 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
@@ -14,35 +14,35 @@ discard block |
||
14 | 14 | public $db; |
15 | 15 | |
16 | 16 | protected $texts = Array( |
17 | - 'MI' => 'Shallow', |
|
18 | - 'PR' => 'Partial', |
|
19 | - 'BC' => 'Low drifting', |
|
20 | - 'BL' => 'Blowing', |
|
21 | - 'SH' => 'Showers', |
|
22 | - 'TS' => 'Thunderstorm', |
|
23 | - 'FZ' => 'Freezing', |
|
24 | - 'DZ' => 'Drizzle', |
|
25 | - 'RA' => 'Rain', |
|
26 | - 'SN' => 'Snow', |
|
27 | - 'SG' => 'Snow Grains', |
|
28 | - 'IC' => 'Ice crystals', |
|
29 | - 'PL' => 'Ice pellets', |
|
30 | - 'GR' => 'Hail', |
|
31 | - 'GS' => 'Small hail', |
|
32 | - 'UP' => 'Unknown', |
|
33 | - 'BR' => 'Mist', |
|
34 | - 'FG' => 'Fog', |
|
35 | - 'FU' => 'Smoke', |
|
36 | - 'VA' => 'Volcanic ash', |
|
37 | - 'DU' => 'Widespread dust', |
|
38 | - 'SA' => 'Sand', |
|
39 | - 'HZ' => 'Haze', |
|
40 | - 'PY' => 'Spray', |
|
41 | - 'PO' => 'Well developed dust / sand whirls', |
|
42 | - 'SQ' => 'Squalls', |
|
43 | - 'FC' => 'Funnel clouds inc tornadoes or waterspouts', |
|
44 | - 'SS' => 'Sandstorm', |
|
45 | - 'DS' => 'Duststorm' |
|
17 | + 'MI' => 'Shallow', |
|
18 | + 'PR' => 'Partial', |
|
19 | + 'BC' => 'Low drifting', |
|
20 | + 'BL' => 'Blowing', |
|
21 | + 'SH' => 'Showers', |
|
22 | + 'TS' => 'Thunderstorm', |
|
23 | + 'FZ' => 'Freezing', |
|
24 | + 'DZ' => 'Drizzle', |
|
25 | + 'RA' => 'Rain', |
|
26 | + 'SN' => 'Snow', |
|
27 | + 'SG' => 'Snow Grains', |
|
28 | + 'IC' => 'Ice crystals', |
|
29 | + 'PL' => 'Ice pellets', |
|
30 | + 'GR' => 'Hail', |
|
31 | + 'GS' => 'Small hail', |
|
32 | + 'UP' => 'Unknown', |
|
33 | + 'BR' => 'Mist', |
|
34 | + 'FG' => 'Fog', |
|
35 | + 'FU' => 'Smoke', |
|
36 | + 'VA' => 'Volcanic ash', |
|
37 | + 'DU' => 'Widespread dust', |
|
38 | + 'SA' => 'Sand', |
|
39 | + 'HZ' => 'Haze', |
|
40 | + 'PY' => 'Spray', |
|
41 | + 'PO' => 'Well developed dust / sand whirls', |
|
42 | + 'SQ' => 'Squalls', |
|
43 | + 'FC' => 'Funnel clouds inc tornadoes or waterspouts', |
|
44 | + 'SS' => 'Sandstorm', |
|
45 | + 'DS' => 'Duststorm' |
|
46 | 46 | ); |
47 | 47 | |
48 | 48 | /* |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg'; |
178 | 178 | */ |
179 | 179 | } |
180 | - /* |
|
180 | + /* |
|
181 | 181 | // Wind Direction |
182 | 182 | if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) { |
183 | 183 | $result['wind_direction'] = $matches[1]; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | $result['speed_variable'] = $matches[1]; |
189 | 189 | } |
190 | 190 | */ |
191 | - // Visibility |
|
191 | + // Visibility |
|
192 | 192 | if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) { |
193 | 193 | if (isset($matches[3]) && strlen($matches[3]) > 0) { |
194 | 194 | $result['visibility'] = (float)$matches[3] * 1609.34; |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | else $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
247 | 247 | if (isset($matches[3])) { |
248 | 248 | $range = Array( |
249 | - 'from' => (float)$matches[2], |
|
250 | - 'to' => (float)$matches[4], |
|
251 | - 'unit' => $matches[5] ? 'FT' : 'M' |
|
249 | + 'from' => (float)$matches[2], |
|
250 | + 'to' => (float)$matches[4], |
|
251 | + 'unit' => $matches[5] ? 'FT' : 'M' |
|
252 | 252 | ); |
253 | 253 | } |
254 | 254 | $result['RVR'] = $matches[1]; |
@@ -176,8 +176,8 @@ |
||
176 | 176 | |
177 | 177 | private function urshift($n, $s) { |
178 | 178 | return ($n >= 0) ? ($n >> $s) : |
179 | - (($n & 0x7fffffff) >> $s) | |
|
180 | - (0x40000000 >> ($s - 1)); |
|
179 | + (($n & 0x7fffffff) >> $s) | |
|
180 | + (0x40000000 >> ($s - 1)); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | /* |
@@ -32,11 +32,11 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
35 | - * Change IATA to ICAO value for ident |
|
36 | - * |
|
37 | - * @param String $ident ident |
|
38 | - * @return String the icao |
|
39 | - */ |
|
35 | + * Change IATA to ICAO value for ident |
|
36 | + * |
|
37 | + * @param String $ident ident |
|
38 | + * @return String the icao |
|
39 | + */ |
|
40 | 40 | public function ident2icao($ident) { |
41 | 41 | if (substr($ident,0,2) == 'AF') { |
42 | 42 | if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
@@ -52,11 +52,11 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
55 | - * Deletes all info in the live table |
|
56 | - * |
|
57 | - * @return String success or false |
|
58 | - * |
|
59 | - */ |
|
55 | + * Deletes all info in the live table |
|
56 | + * |
|
57 | + * @return String success or false |
|
58 | + * |
|
59 | + */ |
|
60 | 60 | public function deleteLiveAcarsData() |
61 | 61 | { |
62 | 62 | global $globalDBdriver; |
@@ -76,11 +76,11 @@ discard block |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
79 | - * Deletes all info in the archive table |
|
80 | - * |
|
81 | - * @return String success or false |
|
82 | - * |
|
83 | - */ |
|
79 | + * Deletes all info in the archive table |
|
80 | + * |
|
81 | + * @return String success or false |
|
82 | + * |
|
83 | + */ |
|
84 | 84 | public function deleteArchiveAcarsData() |
85 | 85 | { |
86 | 86 | global $globalACARSArchiveKeepMonths, $globalDBdriver; |
@@ -101,11 +101,11 @@ discard block |
||
101 | 101 | |
102 | 102 | |
103 | 103 | /** |
104 | - * Parse ACARS data |
|
105 | - * |
|
106 | - * @param String ACARS data in acarsdec data |
|
107 | - * |
|
108 | - */ |
|
104 | + * Parse ACARS data |
|
105 | + * |
|
106 | + * @param String ACARS data in acarsdec data |
|
107 | + * |
|
108 | + */ |
|
109 | 109 | public function parse($data) { |
110 | 110 | global $globalDebug, $globalACARSArchive; |
111 | 111 | //$Image = new Image($this->db); |
@@ -735,11 +735,11 @@ discard block |
||
735 | 735 | } |
736 | 736 | |
737 | 737 | /** |
738 | - * Add ACARS data |
|
739 | - * |
|
740 | - * @param String ACARS data in acarsdec data |
|
741 | - * |
|
742 | - */ |
|
738 | + * Add ACARS data |
|
739 | + * |
|
740 | + * @param String ACARS data in acarsdec data |
|
741 | + * |
|
742 | + */ |
|
743 | 743 | function add($data) { |
744 | 744 | global $globalDebug, $globalACARSArchive; |
745 | 745 | $Image = new Image($this->db); |
@@ -786,15 +786,15 @@ discard block |
||
786 | 786 | } |
787 | 787 | |
788 | 788 | /** |
789 | - * Add Live ACARS data in DB |
|
790 | - * |
|
791 | - * @param String $ident ident |
|
792 | - * @param String $registration Registration of the aircraft |
|
793 | - * @param String $label Label of the ACARS message |
|
794 | - * @param String $block_id Block id of the ACARS message |
|
795 | - * @param String $msg_no Number of the ACARS message |
|
796 | - * @param String $message ACARS message |
|
797 | - */ |
|
789 | + * Add Live ACARS data in DB |
|
790 | + * |
|
791 | + * @param String $ident ident |
|
792 | + * @param String $registration Registration of the aircraft |
|
793 | + * @param String $label Label of the ACARS message |
|
794 | + * @param String $block_id Block id of the ACARS message |
|
795 | + * @param String $msg_no Number of the ACARS message |
|
796 | + * @param String $message ACARS message |
|
797 | + */ |
|
798 | 798 | public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
799 | 799 | global $globalDebug; |
800 | 800 | date_default_timezone_set('UTC'); |
@@ -830,15 +830,15 @@ discard block |
||
830 | 830 | } |
831 | 831 | |
832 | 832 | /** |
833 | - * Add Archive ACARS data in DB |
|
834 | - * |
|
835 | - * @param String $ident ident |
|
836 | - * @param String $registration Registration of the aircraft |
|
837 | - * @param String $label Label of the ACARS message |
|
838 | - * @param String $block_id Block id of the ACARS message |
|
839 | - * @param String $msg_no Number of the ACARS message |
|
840 | - * @param String $message ACARS message |
|
841 | - */ |
|
833 | + * Add Archive ACARS data in DB |
|
834 | + * |
|
835 | + * @param String $ident ident |
|
836 | + * @param String $registration Registration of the aircraft |
|
837 | + * @param String $label Label of the ACARS message |
|
838 | + * @param String $block_id Block id of the ACARS message |
|
839 | + * @param String $msg_no Number of the ACARS message |
|
840 | + * @param String $message ACARS message |
|
841 | + */ |
|
842 | 842 | public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
843 | 843 | global $globalDebug; |
844 | 844 | date_default_timezone_set('UTC'); |
@@ -869,11 +869,11 @@ discard block |
||
869 | 869 | } |
870 | 870 | |
871 | 871 | /** |
872 | - * Get Message title from label from DB |
|
873 | - * |
|
874 | - * @param String $label |
|
875 | - * @return String Return ACARS title |
|
876 | - */ |
|
872 | + * Get Message title from label from DB |
|
873 | + * |
|
874 | + * @param String $label |
|
875 | + * @return String Return ACARS title |
|
876 | + */ |
|
877 | 877 | public function getTitlefromLabel($label) { |
878 | 878 | $Connection = new Connection($this->db); |
879 | 879 | $this->db = $Connection->db; |
@@ -892,10 +892,10 @@ discard block |
||
892 | 892 | } |
893 | 893 | |
894 | 894 | /** |
895 | - * List all Message title & label from DB |
|
896 | - * |
|
897 | - * @return Array Return ACARS data in array |
|
898 | - */ |
|
895 | + * List all Message title & label from DB |
|
896 | + * |
|
897 | + * @return Array Return ACARS data in array |
|
898 | + */ |
|
899 | 899 | public function getAllTitleLabel() { |
900 | 900 | $query = "SELECT * FROM acars_label ORDER BY title"; |
901 | 901 | $query_values = array(); |
@@ -912,11 +912,11 @@ discard block |
||
912 | 912 | } |
913 | 913 | |
914 | 914 | /** |
915 | - * Get Live ACARS data from DB |
|
916 | - * |
|
917 | - * @param String $ident |
|
918 | - * @return Array Return ACARS data in array |
|
919 | - */ |
|
915 | + * Get Live ACARS data from DB |
|
916 | + * |
|
917 | + * @param String $ident |
|
918 | + * @return Array Return ACARS data in array |
|
919 | + */ |
|
920 | 920 | public function getLiveAcarsData($ident) { |
921 | 921 | $query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC"; |
922 | 922 | $query_values = array(':ident' => $ident); |
@@ -933,10 +933,10 @@ discard block |
||
933 | 933 | } |
934 | 934 | |
935 | 935 | /** |
936 | - * Get Latest ACARS data from DB |
|
937 | - * |
|
938 | - * @return Array Return ACARS data in array |
|
939 | - */ |
|
936 | + * Get Latest ACARS data from DB |
|
937 | + * |
|
938 | + * @return Array Return ACARS data in array |
|
939 | + */ |
|
940 | 940 | public function getLatestAcarsData($limit = '',$label = '') { |
941 | 941 | global $globalURL, $globalDBdriver; |
942 | 942 | $Image = new Image($this->db); |
@@ -1024,10 +1024,10 @@ discard block |
||
1024 | 1024 | } |
1025 | 1025 | |
1026 | 1026 | /** |
1027 | - * Get Archive ACARS data from DB |
|
1028 | - * |
|
1029 | - * @return Array Return ACARS data in array |
|
1030 | - */ |
|
1027 | + * Get Archive ACARS data from DB |
|
1028 | + * |
|
1029 | + * @return Array Return ACARS data in array |
|
1030 | + */ |
|
1031 | 1031 | public function getArchiveAcarsData($limit = '',$label = '') { |
1032 | 1032 | global $globalURL, $globalDBdriver; |
1033 | 1033 | $Image = new Image($this->db); |
@@ -1115,13 +1115,13 @@ discard block |
||
1115 | 1115 | } |
1116 | 1116 | |
1117 | 1117 | /** |
1118 | - * Add ModeS data to DB |
|
1119 | - * |
|
1120 | - * @param String $ident ident |
|
1121 | - * @param String $registration Registration of the aircraft |
|
1122 | - * @param String $icao |
|
1123 | - * @param String $ICAOTypeCode |
|
1124 | - */ |
|
1118 | + * Add ModeS data to DB |
|
1119 | + * |
|
1120 | + * @param String $ident ident |
|
1121 | + * @param String $registration Registration of the aircraft |
|
1122 | + * @param String $icao |
|
1123 | + * @param String $ICAOTypeCode |
|
1124 | + */ |
|
1125 | 1125 | public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') { |
1126 | 1126 | global $globalDebug, $globalDBdriver; |
1127 | 1127 | $ident = trim($ident); |
@@ -25,11 +25,11 @@ |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
28 | - * Change IATA to ICAO value for ident |
|
29 | - * |
|
30 | - * @param String $ident ident |
|
31 | - * @return String the icao |
|
32 | - */ |
|
28 | + * Change IATA to ICAO value for ident |
|
29 | + * |
|
30 | + * @param String $ident ident |
|
31 | + * @return String the icao |
|
32 | + */ |
|
33 | 33 | public function ident2icao($ident) { |
34 | 34 | $Spotter = new Spotter(); |
35 | 35 | if (!is_numeric(substr($ident, 0, 3))) { |