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

Version 3.2.3

Browse Source
This commit is contained in:
Neo committed 2025-12-19 00:34:03 -08:00
1 parent ae5c01cc78
commit 78706903a2
2641 files changed
+228363 -201264
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

upload/admin/setup/sources/classes/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>
<a href="http://www.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/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>
<a href="http://www.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/sources/classes/output/output.php
+114 -91
View File
@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer output methods
* Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
* Last Updated: $Date: 2011-07-22 12:01:28 -0400 (Fri, 22 Jul 2011) $
* </pre>
*
* @author Matt Mecham
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @link http://hatynka.in
* @since 1st December 2008
* @version $Revision: 6881 $
* @version $Revision: 9305 $
*
*/
@@ -186,7 +186,7 @@ class output
* @access public
* @param object ipsRegistry reference
* @param bool Whether to init
* @return void
* @return @e void
*/
public function __construct( ipsRegistry $registry, $init=FALSE )
{
@@ -203,14 +203,14 @@ class output
if ( $init === TRUE )
{
/* Load 'template' */
require_once( IPS_ROOT_PATH . 'setup/templates/skin_setup.php' );
require_once( IPS_ROOT_PATH . 'setup/templates/skin_setup.php' );/*noLibHook*/
$this->template = new skin_setup( $registry );
/* Images URL */
$this->imageUrl = '../setup/public/images';
$this->imageUrl = '../setup/' . PUBLIC_DIRECTORY . '/images';
/* Fetch sequence data */
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
$file = ( IPS_IS_UPGRADER ) ? IPS_ROOT_PATH . 'setup/xml/upgrade_sequence.xml' : IPS_ROOT_PATH . 'setup/xml/sequence.xml';
@@ -240,7 +240,7 @@ class output
/* Set up URLs */
$this->settings['base_url'] = ( $this->settings['base_url'] ) ? $this->settings['base_url'] : IPSSetUp::getSavedData('install_url');
$this->settings['img_url_no_dir'] = $this->settings['base_url'] . '/public/style_images/';
$this->settings['img_url_no_dir'] = $this->settings['base_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/';
/* Set Current Page */
$this->currentPage = ( $this->request['section'] ) ? $this->request['section'] : 'index';
@@ -303,13 +303,36 @@ class output
}
}
}
/**
* Keeps upgrader happy
*/
public function buildSEOUrl( $url, $type, $title, $template )
{
}
public function isLargeTouchDevice()
{
return false;
}
public function isSmallTouchDevice()
{
return false;
}
public function getReplacement()
{
}
/**
* Add an message string
*
* @access public
* @param string Message
* @return void
* @return @e void
*/
public function addMessage( $string )
{
@@ -321,7 +344,7 @@ class output
*
* @access public
* @param string Error
* @return void
* @return @e void
*/
public function addError( $string )
{
@@ -333,7 +356,7 @@ class output
*
* @access public
* @param string Warning
* @return void
* @return @e void
*/
public function addWarning( $string )
{
@@ -368,7 +391,7 @@ class output
* @access public
* @param string content to add
* @param boolean Prepend isntead of append
* @return void
* @return @e void
*/
public function addContent( $content, $prepend=false )
{
@@ -388,7 +411,7 @@ class output
* @access public
* @param string Current Human version
* @param string App key
* @return void
* @return @e void
*/
public function setVersionAndApp( $version, $app )
{
@@ -402,7 +425,7 @@ class output
* @access public
* @param mixed Current step
* @param int Total steps
* @return void
* @return @e void
*/
public function setInstallStep( $current, $total )
{
@@ -414,7 +437,7 @@ class output
*
* @access public
* @param boolean TRUE = hide button, FALSE = show button
* @return void
* @return @e void
*/
public function setHideButton( $hide=FALSE )
{
@@ -426,7 +449,7 @@ class output
*
* @access public
* @param string action URL
* @return void
* @return @e void
*/
public function setNextAction( $url )
{
@@ -438,7 +461,7 @@ class output
*
* @access public
* @param string Page title
* @return void
* @return @e void
*/
public function setTitle( $title )
{
@@ -453,7 +476,7 @@ class output
* @param string Nav URL
* @param string SEO title
* @param string SEO template
* @return void
* @return @e void
*/
public function addNavigation( $title, $url, $seoTitle='', $seoTemplate='' )
{
@@ -465,7 +488,7 @@ class output
*
* @access public
* @param bool Error yes/no
* @return void
* @return @e void
*/
public function setError( $boolean )
{
@@ -490,7 +513,6 @@ class output
* @access public
* @param string
* @return string
* @todo [Future] Remove the legacy remapping in 3.1. We will assume posts have been rebuilt by then.
*/
public function replaceMacros( $text )
{
@@ -504,19 +526,13 @@ class output
$text = str_replace( "{style_image_url}" , $this->settings['img_url'] , $text );
$text = str_replace( "{style_images_url}" , $this->settings['img_url'] , $text );
//-----------------------------------------
// Fix legacy emoticon/avatar/images links
//-----------------------------------------
$text = preg_replace( "#img\s+?src=([\"'])(?:{$this->settings['board_url']}[^\"']+?)?(?<!public%2F)style_(images|avatars|emoticons)([^\"']+?)[\"'](.+?)?".">#is", "img src=\\1".$this->settings['public_dir']."style_\\2\\3\\1\\4>", $text );
//-----------------------------------------
// Fix up IPB image url
//-----------------------------------------
if ( $this->settings['ipb_img_url'] )
{
$text = preg_replace( "#img\s+?src=[\"']public/style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"".$this->settings['ipb_img_url']."public/style_\\1\\2\"\\3>", $text );
$text = preg_replace( "#img\s+?src=[\"']" . PUBLIC_DIRECTORY . "/style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"" . $this->settings['ipb_img_url'] . PUBLIC_DIRECTORY . "/style_\\1\\2\"\\3>", $text );
}
@@ -528,7 +544,7 @@ class output
*
* @access public
* @param boolean TRUE - freeze data, FALSE, do not.
* @return void Nothin'
* @return @e void Nothin'
*/
public function sendOutput( $saveData=TRUE )
{
@@ -596,45 +612,50 @@ class output
* @param string SEO Title
* @return string HTML to browser and exits
*/
public function redirectScreen( $text="", $url="", $seoTitle="" )
public function redirectScreen( $text="", $url="", $seoTitle="", $seoTemplate='' )
{
//-----------------------------------------
// INIT
//-----------------------------------------
$this->_sendOutputSetUp( 'redirect' );
//-----------------------------------------
// Forcing silent redirects?
//-----------------------------------------
if ( $this->settings['ipb_remove_redirect_pages'] == 1 )
/* Use new inline notifications */
if ( ! defined('IPS_FORCE_HTML_REDIRECT') OR ! IPS_FORCE_HTML_REDIRECT )
{
$this->silentRedirect( $url );
$_SESSION['ips_InlineMessage'] = $text;
$this->silentRedirect($url, $seoTitle, false, $seoTemplate );
}
//-----------------------------------------
// Gather output
//-----------------------------------------
$output = $this->outputFormatClass->fetchOutput( $this->_html, $this->_title, $this->_navigation, $this->_documentHeadItems, $this->_jsLoader, array( 'url' => $url, 'text' => $text, 'seoTitle' => $seoTitle ) );
//-----------------------------------------
// Check for SQL Debug
//-----------------------------------------
$this->_checkSQLDebug();
//-----------------------------------------
// Print it...
//-----------------------------------------
$this->outputFormatClass->printHeader();
print $output;
$this->outputFormatClass->finishUp();
else
{
//-----------------------------------------
// INIT
//-----------------------------------------
$this->_sendOutputSetUp( 'redirect' );
//-----------------------------------------
// Gather output
//-----------------------------------------
$output = $this->outputFormatClass->fetchOutput( $this->_html, $this->_title, $this->_navigation, $this->_documentHeadItems, $this->_jsLoader, array( 'url' => $url, 'text' => $text, 'seoTitle' => $seoTitle, 'seoTemplate' => $seoTemplate ) );
$output = $this->templateHooks( $output );
//-----------------------------------------
// Check for SQL Debug
//-----------------------------------------
$this->_checkSQLDebug();
//-----------------------------------------
// Print it...
//-----------------------------------------
$this->outputFormatClass->printHeader();
/* Remove unused hook comments */
$output = preg_replace( '#<!--hook\.([^\>]+?)-->#', '', $output );
print $output;
$this->outputFormatClass->finishUp();
}
exit;
}
@@ -657,7 +678,7 @@ class output
* @access public
* @param string Type of data to add: css, js, raw, rss, rsd, etc
* @param string Data to add
* @return void
* @return @e void
*/
public function addToDocumentHead( $type, $data )
{
@@ -675,10 +696,10 @@ class output
{
$remapData = array();
if ( file_exists( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
if ( is_file( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
{
$REMAP = array();
require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );
require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );/*noLibHook*/
if ( is_array( $REMAP ) && count( $REMAP ) )
{
@@ -689,12 +710,9 @@ class output
{
if ( preg_match( "#^[a-zA-Z]#", $id ) )
{
if ( is_array( $REMAP['masterKeys'] ) )
if ( is_array( $REMAP['masterKeys'] ) AND in_array( $id, $REMAP['masterKeys'] ) )
{
if ( in_array( $id, $REMAP['masterKeys'] ) )
{
$_skin = array( 'set_id' => $id );
}
$_skin = array( 'set_id' => $id );
}
else
{
@@ -715,12 +733,9 @@ class output
/* IN DEV default */
if ( preg_match( "#^[a-zA-Z]#", $REMAP['inDevDefault'] ) )
{
if ( is_array( $REMAP['masterKeys'] ) )
if ( is_array( $REMAP['masterKeys'] ) AND in_array( $REMAP['inDevDefault'], $REMAP['masterKeys'] ) )
{
if ( in_array( $REMAP['inDevDefault'], $REMAP['masterKeys'] ) )
{
$_skin = array( 'set_id' => $REMAP['inDevDefault'] );
}
$_skin = array( 'set_id' => $REMAP['inDevDefault'] );
}
else
{
@@ -737,18 +752,18 @@ class output
/* Master keys */
$remapData['masterKeys'] = $REMAP['masterKeys'];
/* Images */
$remapData['images'] = $REMAP['images'];
/* IN DEV export */
foreach( $REMAP['export'] as $id => $key )
{
if ( preg_match( "#^[a-zA-Z]#", $key ) )
{
if ( is_array( $REMAP['masterKeys'] ) )
if ( is_array( $REMAP['masterKeys'] ) AND in_array( $key, $REMAP['masterKeys'] ) )
{
if ( in_array( $key, $REMAP['masterKeys'] ) )
{
$_skin = array( 'set_id' => $key );
}
$_skin = array( 'set_id' => $key );
}
else
{
@@ -767,12 +782,12 @@ class output
}
else
{
$remapData = array( 'templates' => array( 0 => 'master_skin' ),
'css' => array( 0 => 'master_css' ),
'inDevDefault' => 0 );
$remapData = array( 'templates' => array( 'root' => 'master_skin' ),
'css' => array( 'root' => 'master_css' ),
'inDevDefault' => 'root'
);
}
return $remapData;
}
@@ -808,5 +823,13 @@ class output
return array();
}
/**
* Dummy method to prevent error in recache routines
*
* @return void
*/
public function getTemplate( $file )
{
return null;
}
}
upload/admin/setup/sources/classes/session/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>
<a href="http://www.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/sources/classes/session/sessions.php
+6 -6
View File
@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Setup sessions class
* Last Updated: $Date: 2010-07-14 05:39:08 -0400 (Wed, 14 Jul 2010) $
* Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author Matt Mecham
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @link http://hatynka.in
* @since 1st December 2008
* @version $Revision: 6647 $
* @version $Revision: 8644 $
*
*/
@@ -75,7 +75,7 @@ class sessions extends ips_MemberRegistry
* Authorize
*
* @access public
* @return void
* @return @e void
*/
public function __construct()
{