sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 3.4.8

Browse Source
This commit is contained in:
Neo committed 2025-12-19 00:42:42 -08:00
1 parent b45ea0dffb
commit c603205a25
1398 files changed
+36675 -31023
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

upload/admin/sources/classes/output/adminOutput.php
+28 -5
View File
@@ -3,17 +3,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Admin Output Library
* Last Updated: $LastChangedDate: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
* Last Updated: $LastChangedDate: 2015-05-11 04:44:42 -0400 (Mon, 11 May 2015) $
* </pre>
*
* @author $Author: AndyMillne $
* @author $Author: stuarts $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/company/standards.php#license
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 12380 $
* @version $Rev: 12637 $
*
*/
@@ -149,6 +149,27 @@ class adminOutput extends output
$this->settings['base_url'] = $this->settings['base_url'] . 'app=' . IPS_APP_COMPONENT . '&amp;';
$this->settings['extraJsModules'] = '';
/* HTTPS fixes */
if( $this->isHTTPS )
{
$this->enableAcpHTTPS();
}
}
/**
* Enable HTTPS
*
* @return @e void
*/
public function enableAcpHTTPS()
{
$this->settings['skin_acp_url'] = str_replace( 'http://', 'https://', $this->settings['skin_acp_url'] );
$this->settings['js_main_url'] = str_replace( 'http://', 'https://', $this->settings['js_main_url'] );
$this->settings['css_base_url'] = str_replace( 'http://', 'https://', $this->settings['css_base_url'] );
$this->settings['js_base_url'] = str_replace( 'http://', 'https://', $this->settings['js_base_url'] );
$this->settings['base_url'] = str_replace( 'http://', 'https://', $this->settings['base_url'] );
$this->settings['js_app_url'] = str_replace( 'http://', 'https://', $this->settings['js_app_url'] );
}
/**
@@ -666,7 +687,9 @@ class adminOutput extends output
*/
public function multipleRedirectFinish($text='')
{
$text = ( $text ) ? $text : $this->lang->words['mr_completed'];
$this->lang->loadLanguageFile( array( 'admin_tools' ), 'core' );
$text = ! empty( $text ) ? $text : $this->lang->words['mr_completed'];
print $this->global_template->global_redirect_done( $text );
exit();
upload/admin/sources/classes/output/formats/coreOutput.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Ouput format: HTML
* (Matt Mecham)
* Last Updated: $Date: 2013-03-12 16:14:42 -0400 (Tue, 12 Mar 2013) $
upload/admin/sources/classes/output/formats/html/conf.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Ouput format: HTML
* (Matt Mecham)
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
upload/admin/sources/classes/output/formats/html/htmlOutput.php
+17 -9
View File
@@ -3,22 +3,22 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Ouput format: HTML
* (Matt Mecham)
* Last Updated: $Date: 2013-05-20 16:38:23 -0400 (Mon, 20 May 2013) $
* Last Updated: $Date: 2014-10-01 13:50:54 -0400 (Wed, 01 Oct 2014) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: rashbrook $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/company/standards.php#license
* @package IP.Board
* @link http://www.invisionpower.com
* @since 9th March 2005 11:03
* @version $Revision: 12261 $
* @version $Revision: 12522 $
*
*/
require_once( IPS_ROOT_PATH . 'sources/base/darkLAE.php' );/*noLibHook*/
class htmlOutput extends coreOutput implements interface_output
{
/**
@@ -65,7 +65,7 @@ class htmlOutput extends coreOutput implements interface_output
parent::__construct( $output );
/* Print only seems only relevant to html method, so... */
if ( !empty( $_GET['forcePrint'] ) AND ( $_GET['_k'] == $this->member->form_hash ) )
if ( !empty( $_GET['forcePrint'] ) )
{
$this->_printOnly = true;
}
@@ -291,12 +291,20 @@ class htmlOutput extends coreOutput implements interface_output
$title = $title . ' ' . $this->lang->words['page_title_page'] . ' ' . $this->_current_page_title;
}
$ieCompatible = "<meta http-equiv='X-UA-Compatible' content='IE=edge' />";
if ( strpos( $this->member->user_agent, 'Trident/7' ) !== FALSE )
{
$ieCompatible = "<meta http-equiv='X-UA-Compatible' content='IE=EmulateIE10' />";
}
$finalOutput = $this->output->getTemplate($templateGroup)->$templateName( $output, $documentHeadItems, $this->_css, $jsLoaderItems, $this->_metaTags,
array( 'title' => $title,
'applications' => $this->core_fetchApplicationData(),
'page' => $this->_current_page_title,
'notifications' =>( $notificationLatest ) ? IPSText::jsonEncodeForTemplate( $notificationLatest ) : '',
'inlineMsg' => $inlineMsg ),
'inlineMsg' => $inlineMsg,
'ie_compatible' => $ieCompatible ),
array( 'navigation' => $navigation,
'adHeaderCode' => ! empty( $extraData['adHeaderCode'] ) ? $extraData['adHeaderCode'] : '',
'adFooterCode' => ! empty( $extraData['adFooterCode'] ) ? $extraData['adFooterCode'] : '' ),
@@ -614,7 +622,7 @@ class htmlOutput extends coreOutput implements interface_output
$version = ( $this->settings['ipb_display_version'] AND $this->settings['ipb_display_version'] != 0 ) ? ' ' . IPB_VERSION : '';
if ($this->settings['ipb_copy_number'] && $this->settings['ips_cp_purchase'])
if (!darkLAE::$settings['ipboard_copyright_showing'])
{
/**
* @link http://community.invisionpower.com/tracker/issue-23750-licensed-to-wont-work-if-copyright-removal-purchased/
@@ -635,7 +643,7 @@ class htmlOutput extends coreOutput implements interface_output
{
$copyright = "<!-- Copyright Information -->
<p id='copyright'>
<a href='' title='Community Forum Software by Invision Power Services'>Community Forum Software by IP.Board{$version}</a>";
<a href='http://www.invisionpower.com/apps/board/' title='Community Forum Software by Invision Power Services'>Community Forum Software by IP.Board{$version}</a>";
if ( $this->settings['ipb_reg_name'] )
{
upload/admin/sources/classes/output/formats/html/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/sources/classes/output/formats/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/sources/classes/output/formats/xml/conf.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Ouput format: XML
* (Matt Mecham)
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
upload/admin/sources/classes/output/formats/xml/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/sources/classes/output/formats/xml/xmlOutput.php
+3 -3
View File
@@ -3,7 +3,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Ouput format: HTML
* (Matt Mecham)
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
@@ -314,8 +314,8 @@ class xmlOutput extends coreOutput implements interface_output
{
$copyright = "<!-- Copyright Information -->
<p id='copyright'>
Powered By <a href='' title='IP.Board Homepage'>IP.Board</a>
{$version} &copy; ".date("Y")." &nbsp;IPS, <abbr title='Incorporated'>Inc</abbr>.
Powered By <a href='http://www.invisionboard.com' title='IP.Board Homepage'>IP.Board</a>
{$version} &copy; ".date("Y")." &nbsp;<a href='http://www.invisionpower.com' title='IPS Homepage'>IPS, <abbr title='Incorporated'>Inc</abbr></a>.
";
if ( $this->settings['ipb_reg_name'] )
upload/admin/sources/classes/output/index.html
+1 -1
View File
@@ -5,6 +5,6 @@
<hr>
You have reached this page in error, please use your back button to return to the forum.
<hr>
IP.Board
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/sources/classes/output/publicOutput.php
+17 -5
View File
@@ -3,18 +3,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Public output methods
* Last Updated: $Date: 2013-05-20 16:38:23 -0400 (Mon, 20 May 2013) $
* Last Updated: $Date: 2015-05-11 05:07:45 -0400 (Mon, 11 May 2015) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: stuarts $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/company/standards.php#license
* @package IP.Board
* @link http://www.invisionpower.com
* @since Who knows...
* @version $Revision: 12261 $
* @version $Revision: 12638 $
*
*/
@@ -1938,6 +1938,9 @@ class output
case 'http':
$base = str_replace( 'https://', 'http://', $this->settings['base_url'] );
break;
case 'preferHttps':
$base = $this->isHTTPS ? str_replace( 'http://', 'https://', $this->settings['base_url'] ) : str_replace( 'https://', 'http://', $this->settings['base_url'] );
break;
}
}
@@ -2591,7 +2594,7 @@ class output
/* preg_match is to prevent redirecting in older Android and IE browsers (Does not affect IE10). They will take %c5%82, break down to separate characters and re-encode as %c3%85%c2%82, creating
an infinite redirect loop. Ticket 848516, 853009 and @link http://community.invisionpower.com/resources/bugs.html/_/ip-board/urls-with-multi-byte-characters-causing-infinite-redirect-on-old-android-devices-r41601 */
if ( $base_url . $_toTest != $newurl AND !preg_match( "/(android 2|msie)/i", $this->member->user_agent ) )
if ( $base_url . $_toTest != $newurl AND !preg_match( "/(android 2|msie|trident|safari)/i", $this->member->user_agent ) )
{
/* Load information file */
if( $storeData['app'] && is_file( IPSLib::getAppDir( $storeData['app'] ) . '/extensions/furlRedirect.php' ) )
@@ -3528,6 +3531,15 @@ class output
*/
public function showError( $message, $code=0, $logError=FALSE, $logExtra='', $header=401 )
{
//-----------------------------------------
// Wipe out the saved post data
//-----------------------------------------
if( $_POST['Post'] )
{
$_POST['Post'] = NULL;
}
//-----------------------------------------
// INIT
//-----------------------------------------
upload/admin/sources/classes/output/systemTemplates.php
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* System Templates
* Last Updated: $Date: 2012-05-10 21:10:13 +0100 (Thu, 10 May 2012) $
* </pre>