Merge branch 'lib-upgrades' into 'master'
Third-party library upgrades * lib: Upgrade php-gettext from 1.0.11 to 1.0.12 * lib: Upgrade accept-to-gettext.php from 2003-08-14 to 2007-04-01 * lib: Upgrade JShrink from 0.5.1 to 1.1.0 * lib: Upgrade mobile-detect from svn r44 (2012-05-03) to 2.8.24 (2016-11-11) * lib: Upgrade php-publisher from ??? to a5d6a0e (2016-11-15) * lib: Upgrade php-subscriber from ??? to 1213f89 (2016-11-15) * lib: Upgrade script.aculo.us from 1.8.3 to 1.9.0 * lib: Upgrade timezones.txt from 2010k/l/m/n/2011a to 2016j See merge request !40
This commit is contained in:
Andrew Dolgov
commit
0047f2578f
|
|
@ -140,7 +140,7 @@
|
||||||
define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . VERSION . ' (http://tt-rss.org/)');
|
define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . VERSION . ' (http://tt-rss.org/)');
|
||||||
ini_set('user_agent', SELF_USER_AGENT);
|
ini_set('user_agent', SELF_USER_AGENT);
|
||||||
|
|
||||||
require_once 'lib/pubsubhubbub/publisher.php';
|
require_once 'lib/pubsubhubbub/Publisher.php';
|
||||||
|
|
||||||
$schema_version = false;
|
$schema_version = false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -595,7 +595,7 @@
|
||||||
if ($feed_hub_url && $feed_self_url && function_exists('curl_init') &&
|
if ($feed_hub_url && $feed_self_url && function_exists('curl_init') &&
|
||||||
!ini_get("open_basedir")) {
|
!ini_get("open_basedir")) {
|
||||||
|
|
||||||
require_once 'lib/pubsubhubbub/subscriber.php';
|
require_once 'lib/pubsubhubbub/Subscriber.php';
|
||||||
|
|
||||||
$callback_url = get_self_url_prefix() .
|
$callback_url = get_self_url_prefix() .
|
||||||
"/public.php?op=pubsub&id=$feed";
|
"/public.php?op=pubsub&id=$feed";
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -63,6 +63,8 @@
|
||||||
* Revision 1.2 2003/08/14 10:23:59 wouter
|
* Revision 1.2 2003/08/14 10:23:59 wouter
|
||||||
* Removed little error in Content-Type header syntaxis.
|
* Removed little error in Content-Type header syntaxis.
|
||||||
*
|
*
|
||||||
|
* 2007-04-01
|
||||||
|
* add '@' before use of arrays, to avoid PHP warnings.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* not really important, this one; perhaps I could've put it inline with
|
/* not really important, this one; perhaps I could've put it inline with
|
||||||
|
|
@ -147,12 +149,12 @@ function al2gt($gettextlangs, $mime) {
|
||||||
$noct=@preg_split("/-/",$allang);
|
$noct=@preg_split("/-/",$allang);
|
||||||
|
|
||||||
$testvals=array(
|
$testvals=array(
|
||||||
array($alscores[$allang], $acscores[$gtcs]),
|
array(@$alscores[$allang], @$acscores[$gtcs]),
|
||||||
array($alscores[$noct[0]], $acscores[$gtcs]),
|
array(@$alscores[$noct[0]], @$acscores[$gtcs]),
|
||||||
array($alscores[$allang], $acscores["*"]),
|
array(@$alscores[$allang], @$acscores["*"]),
|
||||||
array($alscores[$noct[0]], $acscores["*"]),
|
array(@$alscores[$noct[0]], @$acscores["*"]),
|
||||||
array($alscores["*"], $acscores[$gtcs]),
|
array(@$alscores["*"], @$acscores[$gtcs]),
|
||||||
array($alscores["*"], $acscores["*"]));
|
array(@$alscores["*"], @$acscores["*"]));
|
||||||
|
|
||||||
$found=FALSE;
|
$found=FALSE;
|
||||||
foreach($testvals as $tval) {
|
foreach($testvals as $tval) {
|
||||||
|
|
|
||||||
|
|
@ -174,14 +174,13 @@ function _get_codeset($domain=null) {
|
||||||
* Convert the given string to the encoding set by bind_textdomain_codeset.
|
* Convert the given string to the encoding set by bind_textdomain_codeset.
|
||||||
*/
|
*/
|
||||||
function _encode($text) {
|
function _encode($text) {
|
||||||
$source_encoding = mb_detect_encoding($text);
|
|
||||||
$target_encoding = _get_codeset();
|
$target_encoding = _get_codeset();
|
||||||
if ($source_encoding != $target_encoding) {
|
if (function_exists("mb_detect_encoding")) {
|
||||||
return mb_convert_encoding($text, $target_encoding, $source_encoding);
|
$source_encoding = mb_detect_encoding($text);
|
||||||
|
if ($source_encoding != $target_encoding)
|
||||||
|
$text = mb_convert_encoding($text, $target_encoding, $source_encoding);
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
return $text;
|
return $text;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -350,6 +350,10 @@ class gettext_reader {
|
||||||
* @return int array index of the right plural form
|
* @return int array index of the right plural form
|
||||||
*/
|
*/
|
||||||
function select_string($n) {
|
function select_string($n) {
|
||||||
|
if (!is_int($n)) {
|
||||||
|
throw new InvalidArgumentException(
|
||||||
|
"Select_string only accepts integers: " . $n);
|
||||||
|
}
|
||||||
$string = $this->get_plural_forms();
|
$string = $this->get_plural_forms();
|
||||||
$string = str_replace('nplurals',"\$total",$string);
|
$string = str_replace('nplurals',"\$total",$string);
|
||||||
$string = str_replace("n",$n,$string);
|
$string = str_replace("n",$n,$string);
|
||||||
|
|
|
||||||
|
|
@ -1,48 +1,22 @@
|
||||||
<?php
|
<?php
|
||||||
|
/*
|
||||||
|
* This file is part of the JShrink package.
|
||||||
|
*
|
||||||
|
* (c) Robert Hafner <tedivm@tedivm.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JShrink
|
* JShrink
|
||||||
*
|
*
|
||||||
* Copyright (c) 2009-2012, Robert Hafner <tedivm@tedivm.com>.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
*
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
*
|
|
||||||
* * Neither the name of Robert Hafner nor the names of his
|
|
||||||
* contributors may be used to endorse or promote products derived
|
|
||||||
* from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
*
|
||||||
* @package JShrink
|
* @package JShrink
|
||||||
* @author Robert Hafner <tedivm@tedivm.com>
|
* @author Robert Hafner <tedivm@tedivm.com>
|
||||||
* @copyright 2009-2012 Robert Hafner <tedivm@tedivm.com>
|
|
||||||
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
|
|
||||||
* @link https://github.com/tedivm/JShrink
|
|
||||||
* @version Release: 0.5.1
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace JShrink;
|
namespace JShrink;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Minifier
|
* Minifier
|
||||||
|
|
@ -79,7 +53,6 @@ class Minifier
|
||||||
*/
|
*/
|
||||||
protected $a = '';
|
protected $a = '';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The next character being looked at (after a);
|
* The next character being looked at (after a);
|
||||||
*
|
*
|
||||||
|
|
@ -108,36 +81,51 @@ class Minifier
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
static protected $defaultOptions = array('flaggedComments' => true);
|
protected static $defaultOptions = array('flaggedComments' => true);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Contains a copy of the JShrink object used to run minification. This is
|
* Contains lock ids which are used to replace certain code patterns and
|
||||||
* only used internally, and is only stored for performance reasons. There
|
* prevent them from being minified
|
||||||
* is no internal data shared between minification requests.
|
*
|
||||||
|
* @var array
|
||||||
*/
|
*/
|
||||||
static protected $jshrink;
|
protected $locks = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Minifier::minify takes a string containing javascript and removes
|
* Takes a string containing javascript and removes unneeded characters in
|
||||||
* unneeded characters in order to shrink the code without altering it's
|
* order to shrink the code without altering it's functionality.
|
||||||
* functionality.
|
*
|
||||||
|
* @param string $js The raw javascript to be minified
|
||||||
|
* @param array $options Various runtime options in an associative array
|
||||||
|
* @throws \Exception
|
||||||
|
* @return bool|string
|
||||||
*/
|
*/
|
||||||
static public function minify($js, $options = array())
|
public static function minify($js, $options = array())
|
||||||
{
|
{
|
||||||
try{
|
try {
|
||||||
ob_start();
|
ob_start();
|
||||||
$currentOptions = array_merge(self::$defaultOptions, $options);
|
|
||||||
|
|
||||||
if(!isset(self::$jshrink))
|
$jshrink = new Minifier();
|
||||||
self::$jshrink = new Minifier();
|
$js = $jshrink->lock($js);
|
||||||
|
$jshrink->minifyDirectToOutput($js, $options);
|
||||||
|
|
||||||
self::$jshrink->breakdownScript($js, $currentOptions);
|
// Sometimes there's a leading new line, so we trim that out here.
|
||||||
return ob_get_clean();
|
$js = ltrim(ob_get_clean());
|
||||||
|
$js = $jshrink->unlock($js);
|
||||||
|
unset($jshrink);
|
||||||
|
|
||||||
}catch(Exception $e){
|
return $js;
|
||||||
if(isset(self::$jshrink))
|
|
||||||
self::$jshrink->clean();
|
|
||||||
|
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
|
||||||
|
if (isset($jshrink)) {
|
||||||
|
// Since the breakdownScript function probably wasn't finished
|
||||||
|
// we clean it out before discarding it.
|
||||||
|
$jshrink->clean();
|
||||||
|
unset($jshrink);
|
||||||
|
}
|
||||||
|
|
||||||
|
// without this call things get weird, with partially outputted js.
|
||||||
ob_end_clean();
|
ob_end_clean();
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
|
@ -148,83 +136,80 @@ class Minifier
|
||||||
* stripping out all unneeded characters.
|
* stripping out all unneeded characters.
|
||||||
*
|
*
|
||||||
* @param string $js The raw javascript to be minified
|
* @param string $js The raw javascript to be minified
|
||||||
* @param array $currentOptions Various runtime options in an associative array
|
* @param array $options Various runtime options in an associative array
|
||||||
*/
|
*/
|
||||||
protected function breakdownScript($js, $currentOptions)
|
protected function minifyDirectToOutput($js, $options)
|
||||||
{
|
{
|
||||||
// reset work attributes in case this isn't the first run.
|
$this->initialize($js, $options);
|
||||||
|
$this->loop();
|
||||||
$this->clean();
|
$this->clean();
|
||||||
|
}
|
||||||
|
|
||||||
$this->options = $currentOptions;
|
/**
|
||||||
|
* Initializes internal variables, normalizes new lines,
|
||||||
|
*
|
||||||
|
* @param string $js The raw javascript to be minified
|
||||||
|
* @param array $options Various runtime options in an associative array
|
||||||
|
*/
|
||||||
|
protected function initialize($js, $options)
|
||||||
|
{
|
||||||
|
$this->options = array_merge(static::$defaultOptions, $options);
|
||||||
$js = str_replace("\r\n", "\n", $js);
|
$js = str_replace("\r\n", "\n", $js);
|
||||||
|
$js = str_replace('/**/', '', $js);
|
||||||
$this->input = str_replace("\r", "\n", $js);
|
$this->input = str_replace("\r", "\n", $js);
|
||||||
|
|
||||||
|
// We add a newline to the end of the script to make it easier to deal
|
||||||
|
// with comments at the bottom of the script- this prevents the unclosed
|
||||||
|
// comment error that can otherwise occur.
|
||||||
|
$this->input .= PHP_EOL;
|
||||||
|
|
||||||
$this->a = $this->getReal();
|
// Populate "a" with a new line, "b" with the first character, before
|
||||||
|
// entering the loop
|
||||||
// the only time the length can be higher than 1 is if a conditional
|
$this->a = "\n";
|
||||||
// comment needs to be displayed and the only time that can happen for
|
$this->b = $this->getReal();
|
||||||
// $a is on the very first run
|
|
||||||
while(strlen($this->a) > 1)
|
|
||||||
{
|
|
||||||
echo $this->a;
|
|
||||||
$this->a = $this->getReal();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->b = $this->getReal();
|
/**
|
||||||
|
* The primary action occurs here. This function loops through the input string,
|
||||||
while($this->a !== false && !is_null($this->a) && $this->a !== '')
|
* outputting anything that's relevant and discarding anything that is not.
|
||||||
|
*/
|
||||||
|
protected function loop()
|
||||||
{
|
{
|
||||||
|
while ($this->a !== false && !is_null($this->a) && $this->a !== '') {
|
||||||
|
|
||||||
// now we give $b the same check for conditional comments we gave $a
|
switch ($this->a) {
|
||||||
// before we began looping
|
|
||||||
if(strlen($this->b) > 1)
|
|
||||||
{
|
|
||||||
echo $this->a . $this->b;
|
|
||||||
$this->a = $this->getReal();
|
|
||||||
$this->b = $this->getReal();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch($this->a)
|
|
||||||
{
|
|
||||||
// new lines
|
// new lines
|
||||||
case "\n":
|
case "\n":
|
||||||
// if the next line is something that can't stand alone
|
// if the next line is something that can't stand alone preserve the newline
|
||||||
// preserve the newline
|
if (strpos('(-+{[@', $this->b) !== false) {
|
||||||
if(strpos('(-+{[@', $this->b) !== false)
|
|
||||||
{
|
|
||||||
echo $this->a;
|
echo $this->a;
|
||||||
$this->saveString();
|
$this->saveString();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if its a space we move down to the string test below
|
// if B is a space we skip the rest of the switch block and go down to the
|
||||||
|
// string/regex check below, resetting $this->b with getReal
|
||||||
if($this->b === ' ')
|
if($this->b === ' ')
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// otherwise we treat the newline like a space
|
// otherwise we treat the newline like a space
|
||||||
|
|
||||||
case ' ':
|
case ' ':
|
||||||
if(self::isAlphaNumeric($this->b))
|
if(static::isAlphaNumeric($this->b))
|
||||||
echo $this->a;
|
echo $this->a;
|
||||||
|
|
||||||
$this->saveString();
|
$this->saveString();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
switch($this->b)
|
switch ($this->b) {
|
||||||
{
|
|
||||||
case "\n":
|
case "\n":
|
||||||
if(strpos('}])+-"\'', $this->a) !== false)
|
if (strpos('}])+-"\'', $this->a) !== false) {
|
||||||
{
|
|
||||||
echo $this->a;
|
echo $this->a;
|
||||||
$this->saveString();
|
$this->saveString();
|
||||||
break;
|
break;
|
||||||
}else{
|
} else {
|
||||||
if(self::isAlphaNumeric($this->a))
|
if (static::isAlphaNumeric($this->a)) {
|
||||||
{
|
|
||||||
echo $this->a;
|
echo $this->a;
|
||||||
$this->saveString();
|
$this->saveString();
|
||||||
}
|
}
|
||||||
|
|
@ -232,13 +217,12 @@ class Minifier
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ' ':
|
case ' ':
|
||||||
if(!self::isAlphaNumeric($this->a))
|
if(!static::isAlphaNumeric($this->a))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// check for some regex that breaks stuff
|
// check for some regex that breaks stuff
|
||||||
if($this->a == '/' && ($this->b == '\'' || $this->b == '"'))
|
if ($this->a === '/' && ($this->b === '\'' || $this->b === '"')) {
|
||||||
{
|
|
||||||
$this->saveRegex();
|
$this->saveRegex();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -255,198 +239,12 @@ class Minifier
|
||||||
if(($this->b == '/' && strpos('(,=:[!&|?', $this->a) !== false))
|
if(($this->b == '/' && strpos('(,=:[!&|?', $this->a) !== false))
|
||||||
$this->saveRegex();
|
$this->saveRegex();
|
||||||
}
|
}
|
||||||
$this->clean();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the next string for processing based off of the current index.
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
protected function getChar()
|
|
||||||
{
|
|
||||||
if(isset($this->c))
|
|
||||||
{
|
|
||||||
$char = $this->c;
|
|
||||||
unset($this->c);
|
|
||||||
}else{
|
|
||||||
$tchar = substr($this->input, $this->index, 1);
|
|
||||||
if(isset($tchar) && $tchar !== false)
|
|
||||||
{
|
|
||||||
$char = $tchar;
|
|
||||||
$this->index++;
|
|
||||||
}else{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if($char !== "\n" && ord($char) < 32)
|
|
||||||
return ' ';
|
|
||||||
|
|
||||||
return $char;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This function gets the next "real" character. It is essentially a wrapper
|
|
||||||
* around the getChar function that skips comments. This has significant
|
|
||||||
* performance benefits as the skipping is done using native functions (ie,
|
|
||||||
* c code) rather than in script php.
|
|
||||||
*
|
|
||||||
* @return string Next 'real' character to be processed.
|
|
||||||
*/
|
|
||||||
protected function getReal()
|
|
||||||
{
|
|
||||||
$startIndex = $this->index;
|
|
||||||
$char = $this->getChar();
|
|
||||||
|
|
||||||
if($char == '/')
|
|
||||||
{
|
|
||||||
$this->c = $this->getChar();
|
|
||||||
|
|
||||||
if($this->c == '/')
|
|
||||||
{
|
|
||||||
$thirdCommentString = substr($this->input, $this->index, 1);
|
|
||||||
|
|
||||||
// kill rest of line
|
|
||||||
$char = $this->getNext("\n");
|
|
||||||
|
|
||||||
if($thirdCommentString == '@')
|
|
||||||
{
|
|
||||||
$endPoint = ($this->index) - $startIndex;
|
|
||||||
unset($this->c);
|
|
||||||
$char = "\n" . substr($this->input, $startIndex, $endPoint);
|
|
||||||
}else{
|
|
||||||
$char = $this->getChar();
|
|
||||||
$char = $this->getChar();
|
|
||||||
}
|
|
||||||
|
|
||||||
}elseif($this->c == '*'){
|
|
||||||
|
|
||||||
$this->getChar(); // current C
|
|
||||||
$thirdCommentString = $this->getChar();
|
|
||||||
|
|
||||||
if($thirdCommentString == '@')
|
|
||||||
{
|
|
||||||
// conditional comment
|
|
||||||
|
|
||||||
// we're gonna back up a bit and and send the comment back,
|
|
||||||
// where the first char will be echoed and the rest will be
|
|
||||||
// treated like a string
|
|
||||||
$this->index = $this->index-2;
|
|
||||||
return '/';
|
|
||||||
|
|
||||||
}elseif($this->getNext('*/')){
|
|
||||||
// kill everything up to the next */
|
|
||||||
|
|
||||||
$this->getChar(); // get *
|
|
||||||
$this->getChar(); // get /
|
|
||||||
|
|
||||||
$char = $this->getChar(); // get next real character
|
|
||||||
|
|
||||||
// if YUI-style comments are enabled we reinsert it into the stream
|
|
||||||
if($this->options['flaggedComments'] && $thirdCommentString == '!')
|
|
||||||
{
|
|
||||||
$endPoint = ($this->index - 1) - $startIndex;
|
|
||||||
echo "\n" . substr($this->input, $startIndex, $endPoint) . "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
}else{
|
|
||||||
$char = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if($char === false)
|
|
||||||
throw new \RuntimeException('Stray comment. ' . $this->index);
|
|
||||||
|
|
||||||
// if we're here c is part of the comment and therefore tossed
|
|
||||||
if(isset($this->c))
|
|
||||||
unset($this->c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $char;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pushes the index ahead to the next instance of the supplied string. If it
|
|
||||||
* is found the first character of the string is returned.
|
|
||||||
*
|
|
||||||
* @return string|false Returns the first character of the string or false.
|
|
||||||
*/
|
|
||||||
protected function getNext($string)
|
|
||||||
{
|
|
||||||
$pos = strpos($this->input, $string, $this->index);
|
|
||||||
|
|
||||||
if($pos === false)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
$this->index = $pos;
|
|
||||||
return substr($this->input, $this->index, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When a javascript string is detected this function crawls for the end of
|
|
||||||
* it and saves the whole string.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
protected function saveString()
|
|
||||||
{
|
|
||||||
$this->a = $this->b;
|
|
||||||
if($this->a == "'" || $this->a == '"') // is the character a quote
|
|
||||||
{
|
|
||||||
// save literal string
|
|
||||||
$stringType = $this->a;
|
|
||||||
|
|
||||||
while(1)
|
|
||||||
{
|
|
||||||
echo $this->a;
|
|
||||||
$this->a = $this->getChar();
|
|
||||||
|
|
||||||
switch($this->a)
|
|
||||||
{
|
|
||||||
case $stringType:
|
|
||||||
break 2;
|
|
||||||
|
|
||||||
case "\n":
|
|
||||||
throw new \RuntimeException('Unclosed string. ' . $this->index);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '\\':
|
|
||||||
echo $this->a;
|
|
||||||
$this->a = $this->getChar();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When a regular expression is detected this funcion crawls for the end of
|
|
||||||
* it and saves the whole regex.
|
|
||||||
*/
|
|
||||||
protected function saveRegex()
|
|
||||||
{
|
|
||||||
echo $this->a . $this->b;
|
|
||||||
|
|
||||||
while(($this->a = $this->getChar()) !== false)
|
|
||||||
{
|
|
||||||
if($this->a == '/')
|
|
||||||
break;
|
|
||||||
|
|
||||||
if($this->a == '\\')
|
|
||||||
{
|
|
||||||
echo $this->a;
|
|
||||||
$this->a = $this->getChar();
|
|
||||||
}
|
|
||||||
|
|
||||||
if($this->a == "\n")
|
|
||||||
throw new \RuntimeException('Stray regex pattern. ' . $this->index);
|
|
||||||
|
|
||||||
echo $this->a;
|
|
||||||
}
|
|
||||||
$this->b = $this->getReal();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resets attributes that do not need to be stored between requests so that
|
* Resets attributes that do not need to be stored between requests so that
|
||||||
* the next request is ready to go.
|
* the next request is ready to go. Another reason for this is to make sure
|
||||||
|
* the variables are cleared and are not taking up memory.
|
||||||
*/
|
*/
|
||||||
protected function clean()
|
protected function clean()
|
||||||
{
|
{
|
||||||
|
|
@ -457,14 +255,333 @@ class Minifier
|
||||||
unset($this->options);
|
unset($this->options);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the next string for processing based off of the current index.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function getChar()
|
||||||
|
{
|
||||||
|
// Check to see if we had anything in the look ahead buffer and use that.
|
||||||
|
if (isset($this->c)) {
|
||||||
|
$char = $this->c;
|
||||||
|
unset($this->c);
|
||||||
|
|
||||||
|
// Otherwise we start pulling from the input.
|
||||||
|
} else {
|
||||||
|
$char = substr($this->input, $this->index, 1);
|
||||||
|
|
||||||
|
// If the next character doesn't exist return false.
|
||||||
|
if (isset($char) && $char === false) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise increment the pointer and use this char.
|
||||||
|
$this->index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalize all whitespace except for the newline character into a
|
||||||
|
// standard space.
|
||||||
|
if($char !== "\n" && ord($char) < 32)
|
||||||
|
|
||||||
|
return ' ';
|
||||||
|
|
||||||
|
return $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function gets the next "real" character. It is essentially a wrapper
|
||||||
|
* around the getChar function that skips comments. This has significant
|
||||||
|
* performance benefits as the skipping is done using native functions (ie,
|
||||||
|
* c code) rather than in script php.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @return string Next 'real' character to be processed.
|
||||||
|
* @throws \RuntimeException
|
||||||
|
*/
|
||||||
|
protected function getReal()
|
||||||
|
{
|
||||||
|
$startIndex = $this->index;
|
||||||
|
$char = $this->getChar();
|
||||||
|
|
||||||
|
// Check to see if we're potentially in a comment
|
||||||
|
if ($char !== '/') {
|
||||||
|
return $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->c = $this->getChar();
|
||||||
|
|
||||||
|
if ($this->c === '/') {
|
||||||
|
return $this->processOneLineComments($startIndex);
|
||||||
|
|
||||||
|
} elseif ($this->c === '*') {
|
||||||
|
return $this->processMultiLineComments($startIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removed one line comments, with the exception of some very specific types of
|
||||||
|
* conditional comments.
|
||||||
|
*
|
||||||
|
* @param int $startIndex The index point where "getReal" function started
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function processOneLineComments($startIndex)
|
||||||
|
{
|
||||||
|
$thirdCommentString = substr($this->input, $this->index, 1);
|
||||||
|
|
||||||
|
// kill rest of line
|
||||||
|
$this->getNext("\n");
|
||||||
|
|
||||||
|
if ($thirdCommentString == '@') {
|
||||||
|
$endPoint = $this->index - $startIndex;
|
||||||
|
unset($this->c);
|
||||||
|
$char = "\n" . substr($this->input, $startIndex, $endPoint);
|
||||||
|
} else {
|
||||||
|
// first one is contents of $this->c
|
||||||
|
$this->getChar();
|
||||||
|
$char = $this->getChar();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Skips multiline comments where appropriate, and includes them where needed.
|
||||||
|
* Conditional comments and "license" style blocks are preserved.
|
||||||
|
*
|
||||||
|
* @param int $startIndex The index point where "getReal" function started
|
||||||
|
* @return bool|string False if there's no character
|
||||||
|
* @throws \RuntimeException Unclosed comments will throw an error
|
||||||
|
*/
|
||||||
|
protected function processMultiLineComments($startIndex)
|
||||||
|
{
|
||||||
|
$this->getChar(); // current C
|
||||||
|
$thirdCommentString = $this->getChar();
|
||||||
|
|
||||||
|
// kill everything up to the next */ if it's there
|
||||||
|
if ($this->getNext('*/')) {
|
||||||
|
|
||||||
|
$this->getChar(); // get *
|
||||||
|
$this->getChar(); // get /
|
||||||
|
$char = $this->getChar(); // get next real character
|
||||||
|
|
||||||
|
// Now we reinsert conditional comments and YUI-style licensing comments
|
||||||
|
if (($this->options['flaggedComments'] && $thirdCommentString === '!')
|
||||||
|
|| ($thirdCommentString === '@') ) {
|
||||||
|
|
||||||
|
// If conditional comments or flagged comments are not the first thing in the script
|
||||||
|
// we need to echo a and fill it with a space before moving on.
|
||||||
|
if ($startIndex > 0) {
|
||||||
|
echo $this->a;
|
||||||
|
$this->a = " ";
|
||||||
|
|
||||||
|
// If the comment started on a new line we let it stay on the new line
|
||||||
|
if ($this->input[($startIndex - 1)] === "\n") {
|
||||||
|
echo "\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$endPoint = ($this->index - 1) - $startIndex;
|
||||||
|
echo substr($this->input, $startIndex, $endPoint);
|
||||||
|
|
||||||
|
return $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
$char = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($char === false)
|
||||||
|
throw new \RuntimeException('Unclosed multiline comment at position: ' . ($this->index - 2));
|
||||||
|
|
||||||
|
// if we're here c is part of the comment and therefore tossed
|
||||||
|
if(isset($this->c))
|
||||||
|
unset($this->c);
|
||||||
|
|
||||||
|
return $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pushes the index ahead to the next instance of the supplied string. If it
|
||||||
|
* is found the first character of the string is returned and the index is set
|
||||||
|
* to it's position.
|
||||||
|
*
|
||||||
|
* @param string $string
|
||||||
|
* @return string|false Returns the first character of the string or false.
|
||||||
|
*/
|
||||||
|
protected function getNext($string)
|
||||||
|
{
|
||||||
|
// Find the next occurrence of "string" after the current position.
|
||||||
|
$pos = strpos($this->input, $string, $this->index);
|
||||||
|
|
||||||
|
// If it's not there return false.
|
||||||
|
if($pos === false)
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Adjust position of index to jump ahead to the asked for string
|
||||||
|
$this->index = $pos;
|
||||||
|
|
||||||
|
// Return the first character of that string.
|
||||||
|
return substr($this->input, $this->index, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When a javascript string is detected this function crawls for the end of
|
||||||
|
* it and saves the whole string.
|
||||||
|
*
|
||||||
|
* @throws \RuntimeException Unclosed strings will throw an error
|
||||||
|
*/
|
||||||
|
protected function saveString()
|
||||||
|
{
|
||||||
|
$startpos = $this->index;
|
||||||
|
|
||||||
|
// saveString is always called after a gets cleared, so we push b into
|
||||||
|
// that spot.
|
||||||
|
$this->a = $this->b;
|
||||||
|
|
||||||
|
// If this isn't a string we don't need to do anything.
|
||||||
|
if ($this->a !== "'" && $this->a !== '"') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// String type is the quote used, " or '
|
||||||
|
$stringType = $this->a;
|
||||||
|
|
||||||
|
// Echo out that starting quote
|
||||||
|
echo $this->a;
|
||||||
|
|
||||||
|
// Loop until the string is done
|
||||||
|
while (true) {
|
||||||
|
|
||||||
|
// Grab the very next character and load it into a
|
||||||
|
$this->a = $this->getChar();
|
||||||
|
|
||||||
|
switch ($this->a) {
|
||||||
|
|
||||||
|
// If the string opener (single or double quote) is used
|
||||||
|
// output it and break out of the while loop-
|
||||||
|
// The string is finished!
|
||||||
|
case $stringType:
|
||||||
|
break 2;
|
||||||
|
|
||||||
|
// New lines in strings without line delimiters are bad- actual
|
||||||
|
// new lines will be represented by the string \n and not the actual
|
||||||
|
// character, so those will be treated just fine using the switch
|
||||||
|
// block below.
|
||||||
|
case "\n":
|
||||||
|
throw new \RuntimeException('Unclosed string at position: ' . $startpos );
|
||||||
|
break;
|
||||||
|
|
||||||
|
// Escaped characters get picked up here. If it's an escaped new line it's not really needed
|
||||||
|
case '\\':
|
||||||
|
|
||||||
|
// a is a slash. We want to keep it, and the next character,
|
||||||
|
// unless it's a new line. New lines as actual strings will be
|
||||||
|
// preserved, but escaped new lines should be reduced.
|
||||||
|
$this->b = $this->getChar();
|
||||||
|
|
||||||
|
// If b is a new line we discard a and b and restart the loop.
|
||||||
|
if ($this->b === "\n") {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// echo out the escaped character and restart the loop.
|
||||||
|
echo $this->a . $this->b;
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
// Since we're not dealing with any special cases we simply
|
||||||
|
// output the character and continue our loop.
|
||||||
|
default:
|
||||||
|
echo $this->a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When a regular expression is detected this function crawls for the end of
|
||||||
|
* it and saves the whole regex.
|
||||||
|
*
|
||||||
|
* @throws \RuntimeException Unclosed regex will throw an error
|
||||||
|
*/
|
||||||
|
protected function saveRegex()
|
||||||
|
{
|
||||||
|
echo $this->a . $this->b;
|
||||||
|
|
||||||
|
while (($this->a = $this->getChar()) !== false) {
|
||||||
|
if($this->a === '/')
|
||||||
|
break;
|
||||||
|
|
||||||
|
if ($this->a === '\\') {
|
||||||
|
echo $this->a;
|
||||||
|
$this->a = $this->getChar();
|
||||||
|
}
|
||||||
|
|
||||||
|
if($this->a === "\n")
|
||||||
|
throw new \RuntimeException('Unclosed regex pattern at position: ' . $this->index);
|
||||||
|
|
||||||
|
echo $this->a;
|
||||||
|
}
|
||||||
|
$this->b = $this->getReal();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks to see if a character is alphanumeric.
|
* Checks to see if a character is alphanumeric.
|
||||||
*
|
*
|
||||||
|
* @param string $char Just one character
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
static protected function isAlphaNumeric($char)
|
protected static function isAlphaNumeric($char)
|
||||||
{
|
{
|
||||||
return preg_match('/^[\w\$]$/', $char) === 1 || $char == '/';
|
return preg_match('/^[\w\$\pL]$/', $char) === 1 || $char == '/';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Replace patterns in the given string and store the replacement
|
||||||
|
*
|
||||||
|
* @param string $js The string to lock
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function lock($js)
|
||||||
|
{
|
||||||
|
/* lock things like <code>"asd" + ++x;</code> */
|
||||||
|
$lock = '"LOCK---' . crc32(time()) . '"';
|
||||||
|
|
||||||
|
$matches = array();
|
||||||
|
preg_match('/([+-])(\s+)([+-])/S', $js, $matches);
|
||||||
|
if (empty($matches)) {
|
||||||
|
return $js;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->locks[$lock] = $matches[2];
|
||||||
|
|
||||||
|
$js = preg_replace('/([+-])\s+([+-])/S', "$1{$lock}$2", $js);
|
||||||
|
/* -- */
|
||||||
|
|
||||||
|
return $js;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Replace "locks" with the original characters
|
||||||
|
*
|
||||||
|
* @param string $js The string to unlock
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function unlock($js)
|
||||||
|
{
|
||||||
|
if (empty($this->locks)) {
|
||||||
|
return $js;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->locks as $lock => $replacement) {
|
||||||
|
$js = str_replace($lock, $replacement, $js);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $js;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -1,21 +1,61 @@
|
||||||
JShrink is a php class that minifies javascript so that it can be delivered to the client quicker. This code can be used by any product looking to minify their javascript on the fly (although caching the results is suggested for performance reasons). Unlike many other products this is not a port into php but a native application, resulting in better performance.
|
# JShrink [](https://travis-ci.org/tedivm/JShrink)
|
||||||
|
|
||||||
### Usage
|
[](https://github.com/tedivm/JShrink/blob/master/LICENSE)
|
||||||
|
[](https://packagist.org/packages/tedivm/JShrink)
|
||||||
|
[](https://coveralls.io/r/tedivm/JShrink?branch=master)
|
||||||
|
[](https://packagist.org/packages/tedivm/JShrink)
|
||||||
|
|
||||||
|
|
||||||
|
JShrink is a php class that minifies javascript so that it can be delivered to the client quicker. This code can be used
|
||||||
|
by any product looking to minify their javascript on the fly (although caching the results is suggested for performance
|
||||||
|
reasons). Unlike many other products this is not a port into php but a native application, resulting in better
|
||||||
|
performance.
|
||||||
|
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
Minifying your code is simple call to a static function-
|
Minifying your code is simple call to a static function-
|
||||||
|
|
||||||
````
|
```php
|
||||||
<?php
|
<?php
|
||||||
|
include('vendor/autoload.php');
|
||||||
|
|
||||||
// Basic (default) usage.
|
// Basic (default) usage.
|
||||||
$minifiedCode = JShrink\Minifier::minify($js);
|
$minifiedCode = \JShrink\Minifier::minify($js);
|
||||||
|
|
||||||
// Disable YUI style comment preservation.
|
// Disable YUI style comment preservation.
|
||||||
$minifiedCode = JShrink\Minifier::minify($js, array('flaggedComments' => false));
|
$minifiedCode = \JShrink\Minifier::minify($js, array('flaggedComments' => false));
|
||||||
````
|
```
|
||||||
|
|
||||||
### Results
|
|
||||||
|
## Results
|
||||||
|
|
||||||
* Raw - 586,990
|
* Raw - 586,990
|
||||||
* Gzip - 151,301
|
* Gzip - 151,301
|
||||||
* JShrink - 371,982
|
* JShrink - 371,982
|
||||||
* JShrink and Gzip - 93,507
|
* JShrink and Gzip - 93,507
|
||||||
|
|
||||||
|
|
||||||
|
## Installing
|
||||||
|
|
||||||
|
### Composer
|
||||||
|
|
||||||
|
Installing JShrink can be done through a variety of methods, although Composer is
|
||||||
|
recommended.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
"require": {
|
||||||
|
"tedivm/jshrink": "~1.0"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Github
|
||||||
|
|
||||||
|
Releases of JShrink are available on [Github](https://github.com/tedious/JShrink/releases).
|
||||||
|
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
JShrink is licensed under the BSD License. See the LICENSE file for details.
|
||||||
|
|
||||||
|
In the spirit of open source, use of this library for evil is discouraged but not prohibited.
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,125 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* a PHP client library for pubsubhubbub.
|
||||||
|
*
|
||||||
|
* @link https://github.com/pubsubhubbub/
|
||||||
|
*
|
||||||
|
* @author Josh Fraser | joshfraser.com | josh@eventvue.com
|
||||||
|
* @license Apache License 2.0
|
||||||
|
*/
|
||||||
|
namespace pubsubhubbub\publisher;
|
||||||
|
|
||||||
|
use InvalidArgumentException;
|
||||||
|
|
||||||
|
class Publisher
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $hub_url;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $last_response;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new Publisher.
|
||||||
|
*
|
||||||
|
* @param string $hub_url
|
||||||
|
*/
|
||||||
|
public function __construct($hub_url)
|
||||||
|
{
|
||||||
|
if (! isset($hub_url)) {
|
||||||
|
throw new InvalidArgumentException('Please specify a hub url');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! preg_match('|^https?://|i', $hub_url)) {
|
||||||
|
throw new InvalidArgumentException('The specified hub url does not appear to be valid: ' . $hub_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->hub_url = $hub_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Accepts either a single url or an array of urls.
|
||||||
|
*
|
||||||
|
* @param string|array $topic_urls
|
||||||
|
* @param callable $http_function
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function publish_update($topic_urls, $http_function = false)
|
||||||
|
{
|
||||||
|
if (! isset($topic_urls)) {
|
||||||
|
throw new InvalidArgumentException('Please specify a topic url');
|
||||||
|
}
|
||||||
|
|
||||||
|
// check that we're working with an array
|
||||||
|
if (! is_array($topic_urls)) {
|
||||||
|
$topic_urls = [$topic_urls];
|
||||||
|
}
|
||||||
|
|
||||||
|
// set the mode to publish
|
||||||
|
$post_string = 'hub.mode=publish';
|
||||||
|
// loop through each topic url
|
||||||
|
foreach ($topic_urls as $topic_url) {
|
||||||
|
|
||||||
|
// lightweight check that we're actually working w/ a valid url
|
||||||
|
if (! preg_match('|^https?://|i', $topic_url)) {
|
||||||
|
throw new InvalidArgumentException('The specified topic url does not appear to be valid: ' . $topic_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
// append the topic url parameters
|
||||||
|
$post_string .= '&hub.url=' . urlencode($topic_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
// make the http post request and return true/false
|
||||||
|
// easy to over-write to use your own http function
|
||||||
|
if ($http_function) {
|
||||||
|
return $http_function($this->hub_url, $post_string);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->http_post($this->hub_url, $post_string);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns any error message from the latest request.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function last_response()
|
||||||
|
{
|
||||||
|
return $this->last_response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default http function that uses curl to post to the hub endpoint.
|
||||||
|
*
|
||||||
|
* @param string $url
|
||||||
|
* @param string $post_string
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
private function http_post($url, $post_string)
|
||||||
|
{
|
||||||
|
// add any additional curl options here
|
||||||
|
$options = [
|
||||||
|
CURLOPT_URL => $url,
|
||||||
|
CURLOPT_POST => true,
|
||||||
|
CURLOPT_POSTFIELDS => $post_string,
|
||||||
|
CURLOPT_USERAGENT => 'PubSubHubbub-Publisher-PHP/1.0',
|
||||||
|
];
|
||||||
|
|
||||||
|
$ch = curl_init();
|
||||||
|
curl_setopt_array($ch, $options);
|
||||||
|
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$this->last_response = $response;
|
||||||
|
$info = curl_getinfo($ch);
|
||||||
|
|
||||||
|
curl_close($ch);
|
||||||
|
|
||||||
|
return $info['http_code'] == 204;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
This PHP library for PubSubHubbub was written by Josh Fraser (joshfraser.com) and is released under the Apache 2.0 License
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
// specify which hub you want to use. in this case we'll use the demo hub on app engine.
|
|
||||||
$hub_url = "http://pubsubhubbub.appspot.com/";
|
|
||||||
|
|
||||||
// create a new pubsubhubbub publisher
|
|
||||||
$p = new Publisher($hub_url);
|
|
||||||
|
|
||||||
// specify the feed that has been updated
|
|
||||||
$topic_url = "http://www.onlineaspect.com";
|
|
||||||
|
|
||||||
// notify the hub that the specified topic_url (ATOM feed) has been updated
|
|
||||||
// alternatively, publish_update() also accepts an array of topic urls
|
|
||||||
if ($p->publish_update($topic_url)) {
|
|
||||||
echo "$topic_url was successfully published to $hub_url";
|
|
||||||
} else {
|
|
||||||
echo "Ooops...";
|
|
||||||
print_r($p->last_response());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,210 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* A PHP client library for pubsubhubbub.
|
||||||
|
*
|
||||||
|
* @link http://code.google.com/p/pubsubhubbub/
|
||||||
|
*
|
||||||
|
* @author Josh Fraser | joshfraser.com | josh@eventvue.com
|
||||||
|
* @license Apache License 2.0
|
||||||
|
*/
|
||||||
|
namespace Pubsubhubbub\Subscriber;
|
||||||
|
|
||||||
|
use InvalidArgumentException;
|
||||||
|
|
||||||
|
class Subscriber
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Put your google key here.
|
||||||
|
* Required if you want to use the google feed API to lookup RSS feeds.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $google_key = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $hub_url;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $callback_url;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $credentials;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string accepted values are "async" and "sync"
|
||||||
|
*/
|
||||||
|
protected $verify = 'async';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $verify_token;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $lease_seconds;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new Subscriber (credentials added for SuperFeedr support).
|
||||||
|
*
|
||||||
|
* @param string $hub_url
|
||||||
|
* @param string $callback_url
|
||||||
|
* @param string $credentials
|
||||||
|
*/
|
||||||
|
public function __construct($hub_url, $callback_url, $credentials = false)
|
||||||
|
{
|
||||||
|
if (! isset($hub_url)) {
|
||||||
|
throw new InvalidArgumentException('Please specify a hub url');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! preg_match('|^https?://|i', $hub_url)) {
|
||||||
|
throw new InvalidArgumentException('The specified hub url does not appear to be valid: ' . $hub_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($callback_url)) {
|
||||||
|
throw new InvalidArgumentException('Please specify a callback');
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->hub_url = $hub_url;
|
||||||
|
$this->callback_url = $callback_url;
|
||||||
|
$this->credentials = $credentials;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* $use_regexp lets you choose whether to use google AJAX feed api (faster, but cached) or a regexp to read from site.
|
||||||
|
*
|
||||||
|
* @param string $url
|
||||||
|
* @param callable $http_function
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function find_feed($url, $http_function = false)
|
||||||
|
{
|
||||||
|
// using google feed API
|
||||||
|
$url = "http://ajax.googleapis.com/ajax/services/feed/lookup?key={$this->google_key}&v=1.0&q=" . urlencode($url);
|
||||||
|
// fetch the content
|
||||||
|
if ($http_function) {
|
||||||
|
$response = $http_function($url);
|
||||||
|
} else {
|
||||||
|
$response = $this->http($url);
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = json_decode($response, true);
|
||||||
|
$rss_url = $result['responseData']['url'];
|
||||||
|
|
||||||
|
return $rss_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Subscribe to a topic.
|
||||||
|
*
|
||||||
|
* @param string $topic_url
|
||||||
|
* @param callable $http_function
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function subscribe($topic_url, $http_function = false)
|
||||||
|
{
|
||||||
|
return $this->change_subscription('subscribe', $topic_url, $http_function);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unsubscribe from a topic.
|
||||||
|
*
|
||||||
|
* @param string $topic_url
|
||||||
|
* @param callable $http_function
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function unsubscribe($topic_url, $http_function = false)
|
||||||
|
{
|
||||||
|
return $this->change_subscription('unsubscribe', $topic_url, $http_function);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper function since sub/unsub are handled the same way.
|
||||||
|
*
|
||||||
|
* @param string $mode
|
||||||
|
* @param string $topic_url
|
||||||
|
* @param callable $http_function
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
private function change_subscription($mode, $topic_url, $http_function = false)
|
||||||
|
{
|
||||||
|
if (! isset($topic_url)) {
|
||||||
|
throw new InvalidArgumentException('Please specify a topic url');
|
||||||
|
}
|
||||||
|
|
||||||
|
// lightweight check that we're actually working w/ a valid url
|
||||||
|
if (! preg_match('|^https?://|i', $topic_url)) {
|
||||||
|
throw new InvalidArgumentException('The specified topic url does not appear to be valid: ' . $topic_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
// set the mode subscribe/unsubscribe
|
||||||
|
$post_string = 'hub.mode=' . $mode;
|
||||||
|
$post_string .= '&hub.callback=' . urlencode($this->callback_url);
|
||||||
|
$post_string .= '&hub.verify=' . $this->verify;
|
||||||
|
$post_string .= '&hub.verify_token=' . $this->verify_token;
|
||||||
|
$post_string .= '&hub.lease_seconds=' . $this->lease_seconds;
|
||||||
|
|
||||||
|
// append the topic url parameters
|
||||||
|
$post_string .= '&hub.topic=' . urlencode($topic_url);
|
||||||
|
|
||||||
|
// make the http post request and return true/false
|
||||||
|
// easy to over-write to use your own http function
|
||||||
|
if ($http_function) {
|
||||||
|
return call_user_func_array($http_function, [$this->hub_url, $post_string]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->http($this->hub_url, $post_string);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default http function that uses curl to post to the hub endpoint.
|
||||||
|
*
|
||||||
|
* @param string $url
|
||||||
|
* @param string $post_string
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
private function http($url, $post_string)
|
||||||
|
{
|
||||||
|
|
||||||
|
// add any additional curl options here
|
||||||
|
$options = [
|
||||||
|
CURLOPT_URL => $url,
|
||||||
|
CURLOPT_USERAGENT => 'PubSubHubbub-Subscriber-PHP/1.0',
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($post_string) {
|
||||||
|
$options[CURLOPT_POST] = true;
|
||||||
|
$options[CURLOPT_POSTFIELDS] = $post_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->credentials) {
|
||||||
|
$options[CURLOPT_USERPWD] = $this->credentials;
|
||||||
|
}
|
||||||
|
|
||||||
|
$ch = curl_init();
|
||||||
|
curl_setopt_array($ch, $options);
|
||||||
|
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$info = curl_getinfo($ch);
|
||||||
|
|
||||||
|
// all good -- anything in the 200 range
|
||||||
|
if (substr($info['http_code'], 0, 1) == '2') {
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,86 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
// a PHP client library for pubsubhubbub
|
|
||||||
// as defined at http://code.google.com/p/pubsubhubbub/
|
|
||||||
// written by Josh Fraser | joshfraser.com | josh@eventvue.com
|
|
||||||
// Released under Apache License 2.0
|
|
||||||
|
|
||||||
class Publisher {
|
|
||||||
|
|
||||||
protected $hub_url;
|
|
||||||
protected $last_response;
|
|
||||||
|
|
||||||
// create a new Publisher
|
|
||||||
public function __construct($hub_url) {
|
|
||||||
|
|
||||||
if (!isset($hub_url))
|
|
||||||
throw new Exception('Please specify a hub url');
|
|
||||||
|
|
||||||
if (!preg_match("|^https?://|i",$hub_url))
|
|
||||||
throw new Exception('The specified hub url does not appear to be valid: '.$hub_url);
|
|
||||||
|
|
||||||
$this->hub_url = $hub_url;
|
|
||||||
}
|
|
||||||
|
|
||||||
// accepts either a single url or an array of urls
|
|
||||||
public function publish_update($topic_urls, $http_function = false) {
|
|
||||||
if (!isset($topic_urls))
|
|
||||||
throw new Exception('Please specify a topic url');
|
|
||||||
|
|
||||||
// check that we're working with an array
|
|
||||||
if (!is_array($topic_urls)) {
|
|
||||||
$topic_urls = array($topic_urls);
|
|
||||||
}
|
|
||||||
|
|
||||||
// set the mode to publish
|
|
||||||
$post_string = "hub.mode=publish";
|
|
||||||
// loop through each topic url
|
|
||||||
foreach ($topic_urls as $topic_url) {
|
|
||||||
|
|
||||||
// lightweight check that we're actually working w/ a valid url
|
|
||||||
if (!preg_match("|^https?://|i",$topic_url))
|
|
||||||
throw new Exception('The specified topic url does not appear to be valid: '.$topic_url);
|
|
||||||
|
|
||||||
// append the topic url parameters
|
|
||||||
$post_string .= "&hub.url=".urlencode($topic_url);
|
|
||||||
}
|
|
||||||
|
|
||||||
// make the http post request and return true/false
|
|
||||||
// easy to over-write to use your own http function
|
|
||||||
if ($http_function)
|
|
||||||
return $http_function($this->hub_url,$post_string);
|
|
||||||
else
|
|
||||||
return $this->http_post($this->hub_url,$post_string);
|
|
||||||
}
|
|
||||||
|
|
||||||
// returns any error message from the latest request
|
|
||||||
public function last_response() {
|
|
||||||
return $this->last_response;
|
|
||||||
}
|
|
||||||
|
|
||||||
// default http function that uses curl to post to the hub endpoint
|
|
||||||
private function http_post($url, $post_string) {
|
|
||||||
|
|
||||||
// add any additional curl options here
|
|
||||||
$options = array(CURLOPT_URL => $url,
|
|
||||||
CURLOPT_POST => true,
|
|
||||||
CURLOPT_POSTFIELDS => $post_string,
|
|
||||||
CURLOPT_USERAGENT => "PubSubHubbub-Publisher-PHP/1.0");
|
|
||||||
|
|
||||||
$ch = curl_init();
|
|
||||||
curl_setopt_array($ch, $options);
|
|
||||||
|
|
||||||
$response = curl_exec($ch);
|
|
||||||
$this->last_response = $response;
|
|
||||||
$info = curl_getinfo($ch);
|
|
||||||
|
|
||||||
curl_close($ch);
|
|
||||||
|
|
||||||
// all good
|
|
||||||
if ($info['http_code'] == 204)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,120 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
// a PHP client library for pubsubhubbub
|
|
||||||
// as defined at http://code.google.com/p/pubsubhubbub/
|
|
||||||
// written by Josh Fraser | joshfraser.com | josh@eventvue.com
|
|
||||||
// Released under Apache License 2.0
|
|
||||||
|
|
||||||
class Subscriber {
|
|
||||||
|
|
||||||
// put your google key here
|
|
||||||
// required if you want to use the google feed API to lookup RSS feeds
|
|
||||||
protected $google_key = "";
|
|
||||||
|
|
||||||
protected $hub_url;
|
|
||||||
protected $callback_url;
|
|
||||||
protected $credentials;
|
|
||||||
// accepted values are "async" and "sync"
|
|
||||||
protected $verify = "async";
|
|
||||||
protected $verify_token;
|
|
||||||
protected $lease_seconds;
|
|
||||||
|
|
||||||
// create a new Subscriber (credentials added for SuperFeedr support)
|
|
||||||
public function __construct($hub_url, $callback_url, $credentials = false) {
|
|
||||||
|
|
||||||
if (!isset($hub_url))
|
|
||||||
throw new Exception('Please specify a hub url');
|
|
||||||
|
|
||||||
if (!preg_match("|^https?://|i",$hub_url))
|
|
||||||
throw new Exception('The specified hub url does not appear to be valid: '.$hub_url);
|
|
||||||
|
|
||||||
if (!isset($callback_url))
|
|
||||||
throw new Exception('Please specify a callback');
|
|
||||||
|
|
||||||
$this->hub_url = $hub_url;
|
|
||||||
$this->callback_url = $callback_url;
|
|
||||||
$this->credentials = $credentials;
|
|
||||||
}
|
|
||||||
|
|
||||||
// $use_regexp lets you choose whether to use google AJAX feed api (faster, but cached) or a regexp to read from site
|
|
||||||
public function find_feed($url, $http_function = false) {
|
|
||||||
// using google feed API
|
|
||||||
$url = "http://ajax.googleapis.com/ajax/services/feed/lookup?key={$this->google_key}&v=1.0&q=".urlencode($url);
|
|
||||||
// fetch the content
|
|
||||||
if ($http_function)
|
|
||||||
$response = $http_function($url);
|
|
||||||
else
|
|
||||||
$response = $this->http($url);
|
|
||||||
|
|
||||||
$result = json_decode($response, true);
|
|
||||||
$rss_url = $result['responseData']['url'];
|
|
||||||
return $rss_url;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function subscribe($topic_url, $http_function = false) {
|
|
||||||
return $this->change_subscription("subscribe", $topic_url, $http_function = false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function unsubscribe($topic_url, $http_function = false) {
|
|
||||||
return $this->change_subscription("unsubscribe", $topic_url, $http_function = false);
|
|
||||||
}
|
|
||||||
|
|
||||||
// helper function since sub/unsub are handled the same way
|
|
||||||
private function change_subscription($mode, $topic_url, $http_function = false) {
|
|
||||||
if (!isset($topic_url))
|
|
||||||
throw new Exception('Please specify a topic url');
|
|
||||||
|
|
||||||
// lightweight check that we're actually working w/ a valid url
|
|
||||||
if (!preg_match("|^https?://|i",$topic_url))
|
|
||||||
throw new Exception('The specified topic url does not appear to be valid: '.$topic_url);
|
|
||||||
|
|
||||||
// set the mode subscribe/unsubscribe
|
|
||||||
$post_string = "hub.mode=".$mode;
|
|
||||||
$post_string .= "&hub.callback=".urlencode($this->callback_url);
|
|
||||||
$post_string .= "&hub.verify=".$this->verify;
|
|
||||||
$post_string .= "&hub.verify_token=".$this->verify_token;
|
|
||||||
$post_string .= "&hub.lease_seconds=".$this->lease_seconds;
|
|
||||||
|
|
||||||
// append the topic url parameters
|
|
||||||
$post_string .= "&hub.topic=".urlencode($topic_url);
|
|
||||||
|
|
||||||
// make the http post request and return true/false
|
|
||||||
// easy to over-write to use your own http function
|
|
||||||
if ($http_function)
|
|
||||||
return $http_function($this->hub_url,$post_string);
|
|
||||||
else
|
|
||||||
return $this->http($this->hub_url,$post_string);
|
|
||||||
}
|
|
||||||
|
|
||||||
// default http function that uses curl to post to the hub endpoint
|
|
||||||
private function http($url, $post_string) {
|
|
||||||
|
|
||||||
// add any additional curl options here
|
|
||||||
$options = array(CURLOPT_URL => $url,
|
|
||||||
CURLOPT_USERAGENT => "PubSubHubbub-Subscriber-PHP/1.0",
|
|
||||||
CURLOPT_RETURNTRANSFER => true);
|
|
||||||
|
|
||||||
if ($post_string) {
|
|
||||||
$options[CURLOPT_POST] = true;
|
|
||||||
$options[CURLOPT_POSTFIELDS] = $post_string;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->credentials)
|
|
||||||
$options[CURLOPT_USERPWD] = $this->credentials;
|
|
||||||
|
|
||||||
$ch = curl_init();
|
|
||||||
curl_setopt_array($ch, $options);
|
|
||||||
|
|
||||||
$response = curl_exec($ch);
|
|
||||||
$info = curl_getinfo($ch);
|
|
||||||
|
|
||||||
// all good -- anything in the 200 range
|
|
||||||
if (substr($info['http_code'],0,1) == "2") {
|
|
||||||
return $response;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
// script.aculo.us controls.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
|
// script.aculo.us controls.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
|
||||||
|
|
||||||
// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
|
// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
|
||||||
// (c) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
|
// (c) 2005-2010 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
|
||||||
// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com)
|
// (c) 2005-2010 Jon Tirsen (http://www.tirsen.com)
|
||||||
// Contributors:
|
// Contributors:
|
||||||
// Richard Livsey
|
// Richard Livsey
|
||||||
// Rahul Bhargava
|
// Rahul Bhargava
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
|
// script.aculo.us effects.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
|
||||||
|
|
||||||
// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
|
// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
|
||||||
// Contributors:
|
// Contributors:
|
||||||
// Justin Palmer (http://encytemedia.com/)
|
// Justin Palmer (http://encytemedia.com/)
|
||||||
// Mark Pilgrim (http://diveintomark.org/)
|
// Mark Pilgrim (http://diveintomark.org/)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// script.aculo.us scriptaculous.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
|
// script.aculo.us scriptaculous.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
|
||||||
|
|
||||||
// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
|
// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining
|
// Permission is hereby granted, free of charge, to any person obtaining
|
||||||
// a copy of this software and associated documentation files (the
|
// a copy of this software and associated documentation files (the
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
// For details, see the script.aculo.us web site: http://script.aculo.us/
|
// For details, see the script.aculo.us web site: http://script.aculo.us/
|
||||||
|
|
||||||
var Scriptaculous = {
|
var Scriptaculous = {
|
||||||
Version: '1.8.3',
|
Version: '1.9.0',
|
||||||
require: function(libraryName) {
|
require: function(libraryName) {
|
||||||
try{
|
try{
|
||||||
// inserting via DOM fails in Safari 2.0, so brute force approach
|
// inserting via DOM fails in Safari 2.0, so brute force approach
|
||||||
|
|
@ -54,7 +54,7 @@ var Scriptaculous = {
|
||||||
Scriptaculous.REQUIRED_PROTOTYPE);
|
Scriptaculous.REQUIRED_PROTOTYPE);
|
||||||
|
|
||||||
var js = /scriptaculous\.js(\?.*)?$/;
|
var js = /scriptaculous\.js(\?.*)?$/;
|
||||||
$$('head script[src]').findAll(function(s) {
|
$$('script[src]').findAll(function(s) {
|
||||||
return s.src.match(js);
|
return s.src.match(js);
|
||||||
}).each(function(s) {
|
}).each(function(s) {
|
||||||
var path = s.src.replace(js, ''),
|
var path = s.src.replace(js, ''),
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ Africa/Freetown
|
||||||
Africa/Gaborone
|
Africa/Gaborone
|
||||||
Africa/Harare
|
Africa/Harare
|
||||||
Africa/Johannesburg
|
Africa/Johannesburg
|
||||||
|
Africa/Juba
|
||||||
Africa/Kampala
|
Africa/Kampala
|
||||||
Africa/Khartoum
|
Africa/Khartoum
|
||||||
Africa/Kigali
|
Africa/Kigali
|
||||||
|
|
@ -96,6 +97,7 @@ America/Chihuahua
|
||||||
America/Coral_Harbour
|
America/Coral_Harbour
|
||||||
America/Cordoba
|
America/Cordoba
|
||||||
America/Costa_Rica
|
America/Costa_Rica
|
||||||
|
America/Creston
|
||||||
America/Cuiaba
|
America/Cuiaba
|
||||||
America/Curacao
|
America/Curacao
|
||||||
America/Danmarkshavn
|
America/Danmarkshavn
|
||||||
|
|
@ -108,6 +110,7 @@ America/Edmonton
|
||||||
America/Eirunepe
|
America/Eirunepe
|
||||||
America/El_Salvador
|
America/El_Salvador
|
||||||
America/Ensenada
|
America/Ensenada
|
||||||
|
America/Fort_Nelson
|
||||||
America/Fort_Wayne
|
America/Fort_Wayne
|
||||||
America/Fortaleza
|
America/Fortaleza
|
||||||
America/Glace_Bay
|
America/Glace_Bay
|
||||||
|
|
@ -139,10 +142,12 @@ America/Juneau
|
||||||
America/Kentucky/Louisville
|
America/Kentucky/Louisville
|
||||||
America/Kentucky/Monticello
|
America/Kentucky/Monticello
|
||||||
America/Knox_IN
|
America/Knox_IN
|
||||||
|
America/Kralendijk
|
||||||
America/La_Paz
|
America/La_Paz
|
||||||
America/Lima
|
America/Lima
|
||||||
America/Los_Angeles
|
America/Los_Angeles
|
||||||
America/Louisville
|
America/Louisville
|
||||||
|
America/Lower_Princes
|
||||||
America/Maceio
|
America/Maceio
|
||||||
America/Managua
|
America/Managua
|
||||||
America/Manaus
|
America/Manaus
|
||||||
|
|
@ -153,6 +158,7 @@ America/Mazatlan
|
||||||
America/Mendoza
|
America/Mendoza
|
||||||
America/Menominee
|
America/Menominee
|
||||||
America/Merida
|
America/Merida
|
||||||
|
America/Metlakatla
|
||||||
America/Mexico_City
|
America/Mexico_City
|
||||||
America/Miquelon
|
America/Miquelon
|
||||||
America/Moncton
|
America/Moncton
|
||||||
|
|
@ -165,6 +171,7 @@ America/New_York
|
||||||
America/Nipigon
|
America/Nipigon
|
||||||
America/Nome
|
America/Nome
|
||||||
America/Noronha
|
America/Noronha
|
||||||
|
America/North_Dakota/Beulah
|
||||||
America/North_Dakota/Center
|
America/North_Dakota/Center
|
||||||
America/North_Dakota/New_Salem
|
America/North_Dakota/New_Salem
|
||||||
America/Ojinaga
|
America/Ojinaga
|
||||||
|
|
@ -191,6 +198,7 @@ America/Santo_Domingo
|
||||||
America/Sao_Paulo
|
America/Sao_Paulo
|
||||||
America/Scoresbysund
|
America/Scoresbysund
|
||||||
America/Shiprock
|
America/Shiprock
|
||||||
|
America/Sitka
|
||||||
America/St_Barthelemy
|
America/St_Barthelemy
|
||||||
America/St_Johns
|
America/St_Johns
|
||||||
America/St_Kitts
|
America/St_Kitts
|
||||||
|
|
@ -220,6 +228,7 @@ Antarctica/Palmer
|
||||||
Antarctica/Rothera
|
Antarctica/Rothera
|
||||||
Antarctica/South_Pole
|
Antarctica/South_Pole
|
||||||
Antarctica/Syowa
|
Antarctica/Syowa
|
||||||
|
Antarctica/Troll
|
||||||
Antarctica/Vostok
|
Antarctica/Vostok
|
||||||
Arctic/Longyearbyen
|
Arctic/Longyearbyen
|
||||||
Asia/Aden
|
Asia/Aden
|
||||||
|
|
@ -230,14 +239,17 @@ Asia/Aqtau
|
||||||
Asia/Aqtobe
|
Asia/Aqtobe
|
||||||
Asia/Ashgabat
|
Asia/Ashgabat
|
||||||
Asia/Ashkhabad
|
Asia/Ashkhabad
|
||||||
|
Asia/Atyrau
|
||||||
Asia/Baghdad
|
Asia/Baghdad
|
||||||
Asia/Bahrain
|
Asia/Bahrain
|
||||||
Asia/Baku
|
Asia/Baku
|
||||||
Asia/Bangkok
|
Asia/Bangkok
|
||||||
|
Asia/Barnaul
|
||||||
Asia/Beirut
|
Asia/Beirut
|
||||||
Asia/Bishkek
|
Asia/Bishkek
|
||||||
Asia/Brunei
|
Asia/Brunei
|
||||||
Asia/Calcutta
|
Asia/Calcutta
|
||||||
|
Asia/Chita
|
||||||
Asia/Choibalsan
|
Asia/Choibalsan
|
||||||
Asia/Chongqing
|
Asia/Chongqing
|
||||||
Asia/Chungking
|
Asia/Chungking
|
||||||
|
|
@ -248,8 +260,10 @@ Asia/Dhaka
|
||||||
Asia/Dili
|
Asia/Dili
|
||||||
Asia/Dubai
|
Asia/Dubai
|
||||||
Asia/Dushanbe
|
Asia/Dushanbe
|
||||||
|
Asia/Famagusta
|
||||||
Asia/Gaza
|
Asia/Gaza
|
||||||
Asia/Harbin
|
Asia/Harbin
|
||||||
|
Asia/Hebron
|
||||||
Asia/Ho_Chi_Minh
|
Asia/Ho_Chi_Minh
|
||||||
Asia/Hong_Kong
|
Asia/Hong_Kong
|
||||||
Asia/Hovd
|
Asia/Hovd
|
||||||
|
|
@ -264,6 +278,7 @@ Asia/Karachi
|
||||||
Asia/Kashgar
|
Asia/Kashgar
|
||||||
Asia/Kathmandu
|
Asia/Kathmandu
|
||||||
Asia/Katmandu
|
Asia/Katmandu
|
||||||
|
Asia/Khandyga
|
||||||
Asia/Kolkata
|
Asia/Kolkata
|
||||||
Asia/Krasnoyarsk
|
Asia/Krasnoyarsk
|
||||||
Asia/Kuala_Lumpur
|
Asia/Kuala_Lumpur
|
||||||
|
|
@ -293,6 +308,7 @@ Asia/Samarkand
|
||||||
Asia/Seoul
|
Asia/Seoul
|
||||||
Asia/Shanghai
|
Asia/Shanghai
|
||||||
Asia/Singapore
|
Asia/Singapore
|
||||||
|
Asia/Srednekolymsk
|
||||||
Asia/Taipei
|
Asia/Taipei
|
||||||
Asia/Tashkent
|
Asia/Tashkent
|
||||||
Asia/Tbilisi
|
Asia/Tbilisi
|
||||||
|
|
@ -301,13 +317,16 @@ Asia/Tel_Aviv
|
||||||
Asia/Thimbu
|
Asia/Thimbu
|
||||||
Asia/Thimphu
|
Asia/Thimphu
|
||||||
Asia/Tokyo
|
Asia/Tokyo
|
||||||
|
Asia/Tomsk
|
||||||
Asia/Ujung_Pandang
|
Asia/Ujung_Pandang
|
||||||
Asia/Ulaanbaatar
|
Asia/Ulaanbaatar
|
||||||
Asia/Ulan_Bator
|
Asia/Ulan_Bator
|
||||||
Asia/Urumqi
|
Asia/Urumqi
|
||||||
|
Asia/Ust-Nera
|
||||||
Asia/Vientiane
|
Asia/Vientiane
|
||||||
Asia/Vladivostok
|
Asia/Vladivostok
|
||||||
Asia/Yakutsk
|
Asia/Yakutsk
|
||||||
|
Asia/Yangon
|
||||||
Asia/Yekaterinburg
|
Asia/Yekaterinburg
|
||||||
Asia/Yerevan
|
Asia/Yerevan
|
||||||
Atlantic/Azores
|
Atlantic/Azores
|
||||||
|
|
@ -405,6 +424,7 @@ Etc/UTC
|
||||||
Etc/Zulu
|
Etc/Zulu
|
||||||
Europe/Amsterdam
|
Europe/Amsterdam
|
||||||
Europe/Andorra
|
Europe/Andorra
|
||||||
|
Europe/Astrakhan
|
||||||
Europe/Athens
|
Europe/Athens
|
||||||
Europe/Belfast
|
Europe/Belfast
|
||||||
Europe/Belgrade
|
Europe/Belgrade
|
||||||
|
|
@ -413,6 +433,7 @@ Europe/Bratislava
|
||||||
Europe/Brussels
|
Europe/Brussels
|
||||||
Europe/Bucharest
|
Europe/Bucharest
|
||||||
Europe/Budapest
|
Europe/Budapest
|
||||||
|
Europe/Busingen
|
||||||
Europe/Chisinau
|
Europe/Chisinau
|
||||||
Europe/Copenhagen
|
Europe/Copenhagen
|
||||||
Europe/Dublin
|
Europe/Dublin
|
||||||
|
|
@ -424,6 +445,7 @@ Europe/Istanbul
|
||||||
Europe/Jersey
|
Europe/Jersey
|
||||||
Europe/Kaliningrad
|
Europe/Kaliningrad
|
||||||
Europe/Kiev
|
Europe/Kiev
|
||||||
|
Europe/Kirov
|
||||||
Europe/Lisbon
|
Europe/Lisbon
|
||||||
Europe/Ljubljana
|
Europe/Ljubljana
|
||||||
Europe/London
|
Europe/London
|
||||||
|
|
@ -444,6 +466,7 @@ Europe/Rome
|
||||||
Europe/Samara
|
Europe/Samara
|
||||||
Europe/San_Marino
|
Europe/San_Marino
|
||||||
Europe/Sarajevo
|
Europe/Sarajevo
|
||||||
|
Europe/Saratov
|
||||||
Europe/Simferopol
|
Europe/Simferopol
|
||||||
Europe/Skopje
|
Europe/Skopje
|
||||||
Europe/Sofia
|
Europe/Sofia
|
||||||
|
|
@ -451,6 +474,7 @@ Europe/Stockholm
|
||||||
Europe/Tallinn
|
Europe/Tallinn
|
||||||
Europe/Tirane
|
Europe/Tirane
|
||||||
Europe/Tiraspol
|
Europe/Tiraspol
|
||||||
|
Europe/Ulyanovsk
|
||||||
Europe/Uzhgorod
|
Europe/Uzhgorod
|
||||||
Europe/Vaduz
|
Europe/Vaduz
|
||||||
Europe/Vatican
|
Europe/Vatican
|
||||||
|
|
@ -500,6 +524,7 @@ NZ
|
||||||
NZ-CHAT
|
NZ-CHAT
|
||||||
Pacific/Apia
|
Pacific/Apia
|
||||||
Pacific/Auckland
|
Pacific/Auckland
|
||||||
|
Pacific/Bougainville
|
||||||
Pacific/Chatham
|
Pacific/Chatham
|
||||||
Pacific/Chuuk
|
Pacific/Chuuk
|
||||||
Pacific/Easter
|
Pacific/Easter
|
||||||
|
|
@ -566,3 +591,4 @@ US/Samoa
|
||||||
UTC
|
UTC
|
||||||
W-SU
|
W-SU
|
||||||
WET
|
WET
|
||||||
|
Zulu
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue