Version 4.5.0
This commit is contained in:
1 parent
1a0c7fd3c2
commit
f79dcf067a
3791 files changed
+248032
-76372
No files matched your search
@@ -11,7 +11,7 @@
|
||||
namespace IPS\Helpers\CoverPhoto;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
@@ -37,7 +37,7 @@ abstract class _Controller extends \IPS\Dispatcher\Controller
|
||||
|
||||
$form = new \IPS\Helpers\Form( 'coverPhoto' );
|
||||
$form->class = 'ipsForm_vertical ipsForm_noLabels';
|
||||
$form->add( new \IPS\Helpers\Form\Upload( 'cover_photo', NULL, TRUE, array( 'image' => TRUE, 'minimize' => FALSE, 'maxFileSize' => ( $photo->maxSize and $photo->maxSize != -1 ) ? $photo->maxSize / 1024 : NULL, 'storageExtension' => $this->_coverPhotoStorageExtension() ) ) );
|
||||
$form->add( new \IPS\Helpers\Form\Upload( 'cover_photo', NULL, TRUE, array( 'image' => TRUE, 'allowStockPhotos' => TRUE, 'minimize' => FALSE, 'maxFileSize' => ( $photo->maxSize and $photo->maxSize != -1 ) ? $photo->maxSize / 1024 : NULL, 'storageExtension' => $this->_coverPhotoStorageExtension() ) ) );
|
||||
if ( $values = $form->values() )
|
||||
{
|
||||
try
|
||||
@@ -56,7 +56,7 @@ abstract class _Controller extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
else
|
||||
{
|
||||
\IPS\Output::i()->output = $form->customTemplate( array( call_user_func_array( array( \IPS\Theme::i(), 'getTemplate' ), array( 'forms', 'core' ) ), 'popupTemplate' ) );
|
||||
\IPS\Output::i()->output = $form->customTemplate( array( \IPS\Theme::i()->getTemplate( 'forms', 'core' ), 'popupTemplate' ) );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ abstract class _Controller extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
else
|
||||
{
|
||||
\IPS\Output::i()->redirect( $_SERVER['HTTP_REFERER'] );
|
||||
\IPS\Output::i()->redirect( $this->_coverPhotoReturnUrl() );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ abstract class _Controller extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
else
|
||||
{
|
||||
\IPS\Output::i()->redirect( $_SERVER['HTTP_REFERER'] );
|
||||
\IPS\Output::i()->redirect( $this->_coverPhotoReturnUrl() );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,7 +129,6 @@ abstract class _Controller extends \IPS\Dispatcher\Controller
|
||||
* Set Cover Photo
|
||||
*
|
||||
* @param \IPS\Helpers\CoverPhoto $photo New Photo
|
||||
* @param string $type 'new', 'remove', 'reposition'
|
||||
* @return void
|
||||
*/
|
||||
abstract protected function _coverPhotoSet( \IPS\Helpers\CoverPhoto $photo );
|
||||
@@ -148,11 +147,6 @@ abstract class _Controller extends \IPS\Dispatcher\Controller
|
||||
*/
|
||||
protected function _coverPhotoReturnUrl()
|
||||
{
|
||||
$returnURL = ( isset( $_SERVER['HTTP_REFERER'] ) AND $_SERVER['HTTP_REFERER'] ) ? \IPS\Http\Url::createFromString( $_SERVER['HTTP_REFERER'] ) : \IPS\Request::i()->url()->stripQueryString( 'do' );
|
||||
if ( !( $returnURL instanceof \IPS\Http\Url\Internal ) )
|
||||
{
|
||||
$returnURL = \IPS\Request::i()->url()->stripQueryString( 'do' );
|
||||
}
|
||||
return $returnURL;
|
||||
return \IPS\Request::i()->referrer() ?: \IPS\Request::i()->url()->stripQueryString( 'do' );
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user