Version 3.1.4

This commit is contained in:
Neo committed 2025-12-19 00:32:22 -08:00
1 parent 1d4720f3e2
commit ae5c01cc78
2563 files changed
+283048 -240689

No files matched your search

@@ -1,17 +1,19 @@
<?php
/**
* <pre>
* Invision Power Services
* IP.Board v3.0.5
* IP.Board v3.1.4
* Installer output methods
* Last Updated: $Date: 2009-11-19 11:58:45 -0500 (Thu, 19 Nov 2009) $
* Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
* </pre>
*
* @author Matt Mecham
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.iinvisionpower.com/community/board/license.html
* @package Invision Power Board
* @link http://www.iinvisionpower.com
* @license http://www.invisionpower.com/community/board/license.html
* @package IP.Board
* @link http://www.invisionpower.com
* @since 1st December 2008
* @version $Revision: 5443 $
* @version $Revision: 6881 $
*
*/
@@ -27,8 +29,9 @@ if ( ! defined( 'IN_IPB' ) )
* Class for managing skins, templates and printing output
*
* @author Matt Mecham
* @package Invision Power Board
* @package IP.Board
* @version 3.0.0
* @ignore
*/
class output
{
@@ -44,6 +47,7 @@ class output
public $request;
public $member;
public $cache;
/**#@-*/
/**
* URLs array
@@ -523,7 +527,7 @@ class output
* Main output function
*
* @access public
* @access boolean TRUE - freeze data, FALSE, do not.
* @param boolean TRUE - freeze data, FALSE, do not.
* @return void Nothin'
*/
public function sendOutput( $saveData=TRUE )
@@ -561,9 +565,15 @@ class output
// Header
//-----------------------------------------
if ( isset( $_SERVER['SERVER_PROTOCOL'] ) AND strstr( $_SERVER['SERVER_PROTOCOL'], '/1.0' ) )
{
header( "HTTP/1.0 200 OK" );
}
else
{
header( "HTTP/1.1 200 OK" );
//header( "Content-type: text/html;charset={$this->settings['gb_char_set']}" );
}
header( "Content-type: text/html;charset=utf-8" );
header( "Cache-Control: no-cache, must-revalidate, max-age=0" );
header( "Expires: 0" );
@@ -665,11 +675,12 @@ class output
{
$remapData = array();
if ( IN_DEV and file_exists( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
if ( file_exists( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
{
$REMAP = array();
require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );
if ( is_array( $REMAP ) )
if ( is_array( $REMAP ) && count( $REMAP ) )
{
/* Master skins */
foreach( array( 'templates', 'css' ) as $type )
@@ -678,9 +689,19 @@ class output
{
if ( preg_match( "#^[a-zA-Z]#", $id ) )
{
/* we're using a key */
$_skin = $this->_fetchSkinByKey( $id );
if ( is_array( $REMAP['masterKeys'] ) )
{
if ( in_array( $id, $REMAP['masterKeys'] ) )
{
$_skin = array( 'set_id' => $id );
}
}
else
{
/* we're using a key */
$_skin = $this->_fetchSkinByKey( $id );
}
$remapData[ $type ][ $_skin['set_id'] ] = $dir;
}
else
@@ -690,26 +711,51 @@ class output
}
}
}
/* IN DEV default */
if ( preg_match( "#^[a-zA-Z]#", $REMAP['inDevDefault'] ) )
{
$_skin = $this->_fetchSkinByKey( $REMAP['inDevDefault'] );
if ( is_array( $REMAP['masterKeys'] ) )
{
if ( in_array( $REMAP['inDevDefault'], $REMAP['masterKeys'] ) )
{
$_skin = array( 'set_id' => $REMAP['inDevDefault'] );
}
}
else
{
/* we're using a key */
$_skin = $this->_fetchSkinByKey( $REMAP['inDevDefault'] );
}
$remapData['inDevDefault'] = $_skin['set_id'];
}
else
{
$remapData['inDevDefault'] = $REMAP['inDevDefault'];
}
/* Master keys */
$remapData['masterKeys'] = $REMAP['masterKeys'];
/* IN DEV export */
foreach( $REMAP['export'] as $id => $key )
{
if ( preg_match( "#^[a-zA-Z]#", $key ) )
{
$_skin = $this->_fetchSkinByKey( $key );
if ( is_array( $REMAP['masterKeys'] ) )
{
if ( in_array( $key, $REMAP['masterKeys'] ) )
{
$_skin = array( 'set_id' => $key );
}
}
else
{
/* we're using a key */
$_skin = $this->_fetchSkinByKey( $id );
}
$remapData['export'][ $id ] = $_skin['set_id'];
}
else
@@ -726,6 +772,7 @@ class output
'inDevDefault' => 0 );
}
return $remapData;
}