Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -3,19 +3,19 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Ouput format: HTML
|
||||
* (Matt Mecham)
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2013-03-12 16:14:42 -0400 (Tue, 12 Mar 2013) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @author $Author: mmecham $
|
||||
* @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: 10914 $
|
||||
* @version $Revision: 12075 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -230,6 +230,10 @@ class coreOutput
|
||||
$this->_headerStatus = 'Moved Temporarily';
|
||||
break;
|
||||
|
||||
case 401:
|
||||
$this->_headerStatus = 'Unauthorized';
|
||||
break;
|
||||
|
||||
case 403:
|
||||
$this->_headerStatus = 'Forbidden';
|
||||
break;
|
||||
@@ -308,7 +312,7 @@ class coreOutput
|
||||
{
|
||||
$encode = ( $encode === FALSE ) ? FALSE : TRUE;
|
||||
$trimLen = ( $trimLen - 3 );
|
||||
$tag = strtolower($tag); // 'ROBOTS' should overwrite 'robots'
|
||||
$tag = trim( strtolower( $tag ) ); // 'ROBOTS' should overwrite 'robots'
|
||||
|
||||
switch( $tag )
|
||||
{
|
||||
@@ -330,13 +334,17 @@ class coreOutput
|
||||
$content = IPSText::truncate( $content, $trimLen );
|
||||
break;
|
||||
case 'keywords':
|
||||
/* @link http://community.invisionpower.com/resources/bugs.html/_/ip-board/seo-meta-keyworks-doesnt-work-correctly-r38420
|
||||
@link http://community.invisionpower.com/resources/bugs.html/_/ip-board/meta-issues-r39358
|
||||
When encode is passed as true, we should assume the block of text has not been formatted, and that we need to convert spaces to commas basically.
|
||||
When encode is passed as false, we should assume that the keywords coming in have been explicitly set (with commas) and not change that */
|
||||
if ( $encode === TRUE )
|
||||
{
|
||||
$content = IPSText::stripAttachTag( $content );
|
||||
|
||||
|
||||
//Bug #15323 breaks accented characters, etc
|
||||
//$content = strtolower( preg_replace( "/[^0-9a-zA-Z ]/", "", preg_replace( "/&([^;]+?);/", "", $content ) ) );
|
||||
$content = str_replace( array( '.', ',', '!', ':', ';', "'", '"', '@', '%', '*', '(', ')' ), '', preg_replace( "/&([^;]+?);/", "", $content ) );
|
||||
$content = str_replace( array( '.', '!', ':', ';', ',', '"', '@', '%', '*', '(', ')' ), '', preg_replace( "/&([^;]+?);/", "", $content ) );
|
||||
//Also breaks accented characters
|
||||
//$_vals = preg_split( '/\s+?/', $content, -1, PREG_SPLIT_NO_EMPTY );
|
||||
$_vals = explode( ' ', $content );
|
||||
@@ -367,15 +375,15 @@ class coreOutput
|
||||
}
|
||||
else
|
||||
{
|
||||
$content = str_replace( array( '.', ',', '!', ':', ';', "'", '"', '@', '%', '*', '(', ')' ), '', preg_replace( "/&([^;]+?);/", "", $content ) );
|
||||
$content = str_replace( array( '.', '!', ':', ';', "'", '"', '@', '%', '*', '(', ')' ), '', preg_replace( "/&([^;]+?);/", "", $content ) );
|
||||
}
|
||||
|
||||
$content = IPSText::truncate( $content, $trimLen );
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
$this->_metaTags[ $tag ] = ( $encode === TRUE ) ? $this->encodeMetaTagContent( preg_replace( '/&#(\d+?);/', "&#\\1;", htmlspecialchars( $content ) ) ) : $content;
|
||||
|
||||
$this->_metaTags[ $tag ][0] = ( $encode === TRUE ) ? preg_replace( '#&(amp|gt|lt|quot);#', '&\1;', $this->encodeMetaTagContent(preg_replace( '/&#(\d+?);/', "&#\\1;", htmlspecialchars( $content ) ) ) ) : preg_replace( '#&(amp|gt|lt|quot);#', '&\1;', $content );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -529,6 +537,13 @@ class coreOutput
|
||||
{
|
||||
$link .= "&module={$tab['module']}";
|
||||
}
|
||||
|
||||
/* http://community.invisionpower.com/resources/bugs.html/_/ip-board/ips-default-public-app-and-navigation-r41028 */
|
||||
if ( $tab['app'] == IPS_DEFAULT_PUBLIC_APP )
|
||||
{
|
||||
$link = "";
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Ouput format: HTML
|
||||
* (Matt Mecham)
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
@@ -15,7 +15,7 @@
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 9th March 2005 11:03
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 10721 $
|
||||
*
|
||||
*/
|
||||
$config = array();
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -3,10 +3,10 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Ouput format: XML
|
||||
* (Matt Mecham)
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
@@ -15,7 +15,7 @@
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 9th March 2005 11:03
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 10721 $
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Ouput format: HTML
|
||||
* (Matt Mecham)
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
@@ -15,7 +15,7 @@
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 9th March 2005 11:03
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 10721 $
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
Reference in new issue
Block a user