Version 4.6.0
This commit is contained in:
1 parent
f79dcf067a
commit
517a5e1f70
2036 files changed
+110041
-26162
No files matched your search
+1
-138
@@ -1249,39 +1249,7 @@ class _Url
|
||||
$workingArray[ $last ] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
/* !Deprecated */
|
||||
|
||||
/**
|
||||
* @brief Is internal?
|
||||
* @deprecated Using this property is deprecated. Check if instance of \IPS\Http\Url\Internal
|
||||
*/
|
||||
public $isInternal = FALSE;
|
||||
|
||||
/**
|
||||
* @brief Is friendly?
|
||||
* @deprecated Using this property is deprecated. Check if instance of \IPS\Http\Url\Friendly
|
||||
*/
|
||||
public $isFriendly = FALSE;
|
||||
|
||||
/**
|
||||
* Get FURL query
|
||||
*
|
||||
* @return string
|
||||
* @deprecated Access $friendlyUrlComponent directly
|
||||
*/
|
||||
public function getFurlQuery()
|
||||
{
|
||||
if ( $this instanceof \IPS\Http\Url\Friendly )
|
||||
{
|
||||
return $this->friendlyUrlComponent;
|
||||
}
|
||||
else
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get FURL Definition
|
||||
*
|
||||
@@ -1292,94 +1260,7 @@ class _Url
|
||||
{
|
||||
return \IPS\Http\Url\Friendly::furlDefinition( $revert );
|
||||
}
|
||||
|
||||
/**
|
||||
* Add CSRF check to query string
|
||||
*
|
||||
* @return \IPS\Http\Url
|
||||
* @deprecated This method is defined in \IPS\Http\Url\Internal which will be kept, while this method will be removed in a major version
|
||||
*/
|
||||
public function csrf()
|
||||
{
|
||||
return $this->setQueryString( 'csrfKey', \IPS\Session::i()->csrfKey );
|
||||
}
|
||||
|
||||
/**
|
||||
* Get ACP query string without adsess
|
||||
*
|
||||
* @return string
|
||||
* @deprecated This method is defined in \IPS\Http\Url\Internal which will be kept, while this method will be removed in a major version
|
||||
*/
|
||||
public function acpQueryString()
|
||||
{
|
||||
$queryString = $this->queryString;
|
||||
unset( $queryString['csrf'] );
|
||||
return static::convertQueryAsArrayToString( $queryString );
|
||||
}
|
||||
|
||||
/**
|
||||
* Strip URL arguments
|
||||
*
|
||||
* @param int $position Arguments from this position onward will be stripped. Value of 0 is equivalent to stripping the entire query string
|
||||
* @return \IPS\Http\Url
|
||||
* @deprecated
|
||||
*/
|
||||
public function stripArguments( $position=0 )
|
||||
{
|
||||
if( $position === 0 )
|
||||
{
|
||||
return $this->stripQueryString();
|
||||
}
|
||||
|
||||
$newQueryArray = array();
|
||||
$_index = 0;
|
||||
|
||||
foreach( $this->queryString as $key => $value )
|
||||
{
|
||||
if( $_index >= $position )
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
$newQueryArray[ $key ] = $value;
|
||||
$_index++;
|
||||
}
|
||||
|
||||
return static::createFromComponents( $this->data[ static::COMPONENT_HOST ], $this->data[ static::COMPONENT_SCHEME ], $this->data[ static::COMPONENT_PATH ], $newQueryArray, $this->data[ static::COMPONENT_PORT ], $this->data[ static::COMPONENT_USERNAME ], $this->data[ static::COMPONENT_PASSWORD ], $this->data[ static::COMPONENT_FRAGMENT ] );
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a URL object from data array
|
||||
*
|
||||
* @param array $data URL data pieces
|
||||
* @return \IPS\Http\Url
|
||||
* @deprecated
|
||||
*/
|
||||
public static function createFromArray( $data )
|
||||
{
|
||||
return static::createFromComponents(
|
||||
$data[ static::COMPONENT_HOST ],
|
||||
isset( $data[ static::COMPONENT_SCHEME ] ) ? $data[ static::COMPONENT_SCHEME ] : NULL,
|
||||
isset( $data[ static::COMPONENT_PATH ] ) ? $data[ static::COMPONENT_PATH ] : NULL,
|
||||
isset( $data[ static::COMPONENT_QUERY ] ) ? $data[ static::COMPONENT_QUERY ] : NULL,
|
||||
isset( $data[ static::COMPONENT_PORT ] ) ? $data[ static::COMPONENT_PORT ] : NULL,
|
||||
isset( $data[ static::COMPONENT_USERNAME ] ) ? $data[ static::COMPONENT_USERNAME ] : NULL,
|
||||
isset( $data[ static::COMPONENT_PASSWORD ] ) ? $data[ static::COMPONENT_PASSWORD ] : NULL,
|
||||
isset( $data[ static::COMPONENT_FRAGMENT ] ) ? $data[ static::COMPONENT_FRAGMENT ] : NULL
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return URL that conforms to RFC 3986
|
||||
*
|
||||
* @return string
|
||||
* @deprecated
|
||||
*/
|
||||
public function rfc3986()
|
||||
{
|
||||
return (string) $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a value into an "SEO Title" for friendly URLs
|
||||
*
|
||||
@@ -1391,22 +1272,4 @@ class _Url
|
||||
{
|
||||
return \IPS\Http\Url\Friendly::seoTitle( $value );
|
||||
}
|
||||
|
||||
/**
|
||||
* Get friendly URL data
|
||||
*
|
||||
* @return array Parameters
|
||||
* @deprecated
|
||||
*/
|
||||
public function getFriendlyUrlData()
|
||||
{
|
||||
if ( $this instanceof \IPS\Http\Url\Friendly )
|
||||
{
|
||||
return $this->hiddenQueryString;
|
||||
}
|
||||
else
|
||||
{
|
||||
return array();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user