Version 3.4.8
This commit is contained in:
1 parent
b45ea0dffb
commit
c603205a25
1398 files changed
+36675
-31023
No files matched your search
@@ -7,7 +7,7 @@
|
||||
* $Author: bfarber $
|
||||
* @since -
|
||||
* $LastChangedDate: 2011-07-20 20:19:22 -0400 (Wed, 20 Jul 2011) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 9296 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Member property updater (AJAX)
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -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>
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Core Sessions
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
@@ -28,7 +28,7 @@ if ( ! defined( 'IN_IPB' ) )
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Item Marking
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Core registered caches, redirect resets and bitwise settings
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Dashboard Notifications
|
||||
* Last Updated: $Date
|
||||
*
|
||||
@@ -51,6 +51,94 @@ class dashboardNotifications__core
|
||||
/* INIT */
|
||||
$entries = array();
|
||||
|
||||
if( ! $this->settings['ipb_reg_number'] )
|
||||
{
|
||||
$entries[] = array( $this->lang->words['lc_title_nokey'], sprintf( $this->lang->words['lc_msg_nokey'], "{$this->settings['base_url']}module=tools&section=licensekey" ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Is the Spam Service Working? */
|
||||
if ( $this->settings['spam_service_enabled'] )
|
||||
{
|
||||
$GOT_SPAM_ERROR = false;
|
||||
|
||||
/* Are we entitled to it? */
|
||||
$licenseData = $this->cache->getCache( 'licenseData' );
|
||||
|
||||
if ( is_array( $licenseData['ipbMain'] ) && count( $licenseData['ipbMain'] ) )
|
||||
{
|
||||
foreach ( $licenseData['ipbMain'] as $data )
|
||||
{
|
||||
if ( $data['name'] == 'Spam Monitoring Service' && $data['status'] != 'Ok' )
|
||||
{
|
||||
$disableLink = $this->settings['base_url'] . "app=core&module=settings&section=settings&do=findsetting&key=spamservice";
|
||||
|
||||
if ( is_numeric( $data['_expires'] ) && time() > $data['_expires'] )
|
||||
{
|
||||
$entries[] = array( $this->lang->words['spam_service_error'], sprintf( $this->lang->words['spam_service_expired'], $disableLink ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
$entries[] = array( $this->lang->words['spam_service_error'], sprintf( $this->lang->words['spam_service_unavailable'], $disableLink ) );
|
||||
}
|
||||
|
||||
$GOT_SPAM_ERROR = true;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( ! $GOT_SPAM_ERROR )
|
||||
{
|
||||
/* Get last 5 logs, and if all 5 are errors, show message */
|
||||
$_errors = 0;
|
||||
$_entries = 0;
|
||||
$_lastError = '';
|
||||
|
||||
$this->DB->build( array( 'select' => 'log_code, log_msg', 'from' => 'spam_service_log', 'order' => 'id DESC', 'limit' => 5 ) );
|
||||
$this->DB->execute();
|
||||
|
||||
while( $_r = $this->DB->fetch() )
|
||||
{
|
||||
$_entries++;
|
||||
|
||||
if( $_r['log_code'] === '0' )
|
||||
{
|
||||
$_errors++;
|
||||
|
||||
if( !$_lastError )
|
||||
{
|
||||
$_lastError = $_r['log_msg'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if( $_entries > 0 && $_errors == $_entries )
|
||||
{
|
||||
$entries[] = array( $this->lang->words['spam_service_error'], sprintf( $this->lang->words['spam_service_error_msg'], $_lastError ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
/* If it's disabled, are we entitiled to it? */
|
||||
else
|
||||
{
|
||||
$licenseData = $this->cache->getCache( 'licenseData' );
|
||||
|
||||
if ( is_array( $licenseData['ipbMain'] ) && count( $licenseData['ipbMain'] ) )
|
||||
{
|
||||
foreach ( $licenseData['ipbMain'] as $data )
|
||||
{
|
||||
if ( $data['name'] == 'Spam Monitoring Service' && $data['status'] == 'Ok' )
|
||||
{
|
||||
$entries[] = array( $this->lang->words['spam_service_disabled'], $this->lang->words['spam_service_disabled_msg'] );
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* FURL cache OOD? */
|
||||
if ( is_file( FURL_CACHE_PATH ) )
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* BBCode Management : Determines if bbcode can be used in this section
|
||||
* Last Updated: $LastChangedDate: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: mark $
|
||||
* @since 24 July 2012
|
||||
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 10952 $
|
||||
*/
|
||||
|
||||
@@ -33,6 +33,6 @@ class enhancements_core_facebook
|
||||
$this->title = $registry->getClass('class_localization')->words['enhancements_facebook'];
|
||||
$this->description = $registry->getClass('class_localization')->words['enhancements_facebook_desc'];
|
||||
$this->enabled = ipsRegistry::$settings['fbc_enable'];
|
||||
$this->message = '<a href="http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=facebook" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_facebook_help'] . '</a>';
|
||||
$this->message = '<a href="http://external.ipslink.com/ipboard30/landing/?p=facebook" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_facebook_help'] . '</a>';
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: mark $
|
||||
* @since 24 July 2012
|
||||
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 10952 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: mark $
|
||||
* @since 24 July 2012
|
||||
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 10952 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: mark $
|
||||
* @since 24 July 2012
|
||||
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 10952 $
|
||||
*/
|
||||
|
||||
@@ -90,9 +90,9 @@ class enhancements_core_ipscdn
|
||||
ipsRegistry::getClass('output')->showError( sprintf( ipsRegistry::getClass('class_localization')->words['enhancements_ipscdn_error_nokey'], ipsRegistry::getClass('output')->buildUrl('app=core&module=tools§ion=licensekey', 'admin') ) );
|
||||
}
|
||||
|
||||
/* $classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
|
||||
$file = new $classToLoad();
|
||||
$ping = $file->getFileContents( "http://license.invisionpower.com/?a=cdn&key=" . ipsRegistry::$settings['ipb_reg_number'] ); */
|
||||
$ping = NULL;
|
||||
|
||||
if ( $json = @json_decode( $ping, TRUE ) )
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: mark $
|
||||
* @since 24 July 2012
|
||||
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 10952 $
|
||||
*/
|
||||
|
||||
@@ -33,6 +33,6 @@ class enhancements_core_twitter
|
||||
$this->title = $registry->getClass('class_localization')->words['enhancements_twitter'];
|
||||
$this->description = $registry->getClass('class_localization')->words['enhancements_twitter_desc'];
|
||||
$this->enabled = ipsRegistry::$settings['tc_enabled'];
|
||||
$this->message = '<a href="http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=twitter" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_twitter_help'] . '</a>';
|
||||
$this->message = '<a href="http://external.ipslink.com/ipboard30/landing/?p=twitter" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_twitter_help'] . '</a>';
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: mark $
|
||||
* @since 24 July 2012
|
||||
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 10952 $
|
||||
*/
|
||||
|
||||
@@ -99,9 +99,9 @@ class enhancements_core_viglink
|
||||
}
|
||||
}
|
||||
|
||||
/* require_once IPS_KERNEL_PATH . 'classFileManagement.php';
|
||||
require_once IPS_KERNEL_PATH . 'classFileManagement.php';
|
||||
$cfm = new classFileManagement();
|
||||
$return = $cfm->getFileContents( "http://license.invisionpower.com/viglink/?subId=" . urlencode( $subId ) ); */
|
||||
$return = NULL;
|
||||
if ( $return and $json = @json_decode( $return, TRUE ) and $json['SUCCESS'] == TRUE )
|
||||
{
|
||||
return $json;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: mark $
|
||||
* @since 24 July 2012
|
||||
* $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 10952 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Sets up SEO templates
|
||||
* Last Updated: $Date: 2013-03-12 09:54:04 -0400 (Tue, 12 Mar 2013) $
|
||||
* </pre>
|
||||
|
||||
@@ -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>
|
||||
@@ -6,7 +6,7 @@
|
||||
* $License: http://www.invisionpower.com/company/standards.php#license$
|
||||
* $Author: mark $
|
||||
* $LastChangedDate: 2011-12-08 16:43:34 +0000 (Thu, 08 Dec 2011) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 9971 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: AndyMillne $
|
||||
* @since 3/8/2011
|
||||
* $LastChangedDate: 2013-10-14 15:30:19 -0400 (Mon, 14 Oct 2013) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 12376 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Define the core notification types
|
||||
* Last Updated: $Date: 2013-05-21 20:51:17 -0400 (Tue, 21 May 2013) $
|
||||
* </pre>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Report Center :: Default plugin
|
||||
* Last Updated: $LastChangedDate: 2012-12-10 11:06:25 -0500 (Mon, 10 Dec 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -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>
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* RSS output plugin :: report center
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Config file
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -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>
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Basic Forum Search
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Returns HTML for the form (optional class, not required)
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Formats forum search results
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -6,7 +6,7 @@
|
||||
* $Author: mmecham $
|
||||
* @since 3/8/2011
|
||||
* $LastChangedDate: 2013-04-03 08:07:11 -0400 (Wed, 03 Apr 2013) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 12145 $
|
||||
*/
|
||||
|
||||
|
||||
+2
-3
@@ -55,7 +55,7 @@ class sitemap_core_content_database_records extends ipseoSitemapPlugin
|
||||
({$permCheck3})",
|
||||
'order' => 'category_id DESC',
|
||||
));
|
||||
|
||||
|
||||
$result = $this->DB->execute();
|
||||
|
||||
$categories = array();
|
||||
@@ -77,7 +77,7 @@ class sitemap_core_content_database_records extends ipseoSitemapPlugin
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( ipsRegistry::getClass('permissions')->check( 'view', $_db, explode( ',', $this->caches['group_cache'][ $this->settings['guest_group'] ]['g_perm_id'] ) ) != TRUE )
|
||||
if ( ipsRegistry::getClass('permissions')->check( 'view', $_db, explode( ',', $this->caches['group_cache'][ $this->settings['guest_group'] ]['g_perm_id'] ) ) == TRUE )
|
||||
{
|
||||
$databases[ $_db['database_id'] ] = $_db;
|
||||
$databases[ $_db['database_id'] ]['base_link'] = $ccsFunctions->returnDatabaseUrl( $_db['database_id'] );
|
||||
@@ -92,7 +92,6 @@ class sitemap_core_content_database_records extends ipseoSitemapPlugin
|
||||
$_cats = ( count($categories) ) ? implode( ',', $categories ) : 0;
|
||||
$_hardLimit = !ipSeo_SitemapGenerator::isCronJob() ? 10000 : 500000000;
|
||||
$addedCount = 0;
|
||||
|
||||
foreach($databases as $database)
|
||||
{
|
||||
if(ipSeo_SitemapGenerator::isCronJob())
|
||||
|
||||
@@ -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>
|
||||
@@ -3,7 +3,7 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Sphinx template file
|
||||
* Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
|
||||
* </pre>
|
||||
|
||||
@@ -3,19 +3,19 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Core user control panel plugin
|
||||
* Last Updated: $Date: 2013-10-24 08:12:23 -0400 (Thu, 24 Oct 2013) $
|
||||
* Last Updated: $Date: 2015-05-03 10:31:01 -0400 (Sun, 03 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
|
||||
* @subpackage Core
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 20th February 2002
|
||||
* @version $Rev: 12391 $
|
||||
* @version $Rev: 12633 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -300,6 +300,17 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
*/
|
||||
public function customEvent_updateAttachments()
|
||||
{
|
||||
//-----------------------------------------
|
||||
// Secure Key
|
||||
//-----------------------------------------
|
||||
|
||||
$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['authKey'];
|
||||
|
||||
if( $this->request['secure_key'] != $this->member->form_hash )
|
||||
{
|
||||
$this->registry->output->showError( 'warn_bad_key', '1021523.1' );
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Get the ID's to delete
|
||||
//-----------------------------------------
|
||||
@@ -377,11 +388,11 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
// Check form hash
|
||||
//-----------------------------------------
|
||||
|
||||
$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['md5check'];
|
||||
$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['authKey'];
|
||||
|
||||
if( $this->request['secure_key'] != $this->member->form_hash )
|
||||
{
|
||||
$this->registry->output->showError( 'usercp_forums_bad_key', 1021523 );
|
||||
$this->registry->output->showError( 'warn_bad_key', 1021523 );
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
@@ -428,6 +439,14 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
*/
|
||||
public function customEvent_markNotification()
|
||||
{
|
||||
//-----------------------------------------
|
||||
// CSRF Check
|
||||
//-----------------------------------------
|
||||
if ( $this->request['k'] != $this->member->form_hash )
|
||||
{
|
||||
$this->registry->getClass('output')->showError( 'no_permission', 1021523 );
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Notifications library
|
||||
//-----------------------------------------
|
||||
@@ -738,6 +757,17 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
*/
|
||||
public function customEvent_toggleIgnoredUser()
|
||||
{
|
||||
//-----------------------------------------
|
||||
// Secure Key
|
||||
//-----------------------------------------
|
||||
|
||||
$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['authKey'];
|
||||
|
||||
if( $this->request['secure_key'] != $this->member->form_hash )
|
||||
{
|
||||
$this->registry->output->showError( 'warn_bad_key', '1021523.2' );
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// INIT
|
||||
//-----------------------------------------
|
||||
@@ -798,6 +828,17 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
*/
|
||||
public function customEvent_removeIgnoredUser()
|
||||
{
|
||||
//-----------------------------------------
|
||||
// Secure Key
|
||||
//-----------------------------------------
|
||||
|
||||
$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['authKey'];
|
||||
|
||||
if( $this->request['secure_key'] != $this->member->form_hash )
|
||||
{
|
||||
$this->registry->output->showError( 'warn_bad_key', '1021523.3' );
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// INIT
|
||||
//-----------------------------------------
|
||||
@@ -1027,14 +1068,23 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
$perms['email'] = $facebook->fetchHasAppPermission( 'email' );
|
||||
|
||||
/* Publish Stream */
|
||||
$perms['publish_stream'] = $facebook->fetchHasAppPermission( 'publish_stream' );
|
||||
$perms['publish_actions'] = $facebook->fetchHasAppPermission( 'publish_actions' );
|
||||
|
||||
/* Read stream */
|
||||
$perms['read_stream'] = $facebook->fetchHasAppPermission( 'read_stream' );
|
||||
$perms['user_status'] = $facebook->fetchHasAppPermission( 'user_status' );
|
||||
|
||||
/* Offline access */
|
||||
$perms['offline_access'] = $facebook->fetchHasAppPermission( 'offline_access' );
|
||||
//var_dump( $perms ); exit;
|
||||
|
||||
/* Check our perms and see if any aren't allowed */
|
||||
$missingPerms = FALSE;
|
||||
foreach( $perms AS $k => $perm )
|
||||
{
|
||||
if ( $perm['data'][0]['status'] != 'granted' )
|
||||
{
|
||||
$missingPerms = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Thaw bitfield options
|
||||
@@ -1086,7 +1136,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
$userData['status']['message'] = str_replace( array( '<', '>' ), array( '<', '>' ), $userData['status']['message'] );
|
||||
}
|
||||
|
||||
return $this->registry->getClass('output')->getTemplate('ucp')->membersFacebookConnect( trim($this->memberData['fb_uid']), $userData, $linkedMemberData, $perms );
|
||||
return $this->registry->getClass('output')->getTemplate('ucp')->membersFacebookConnect( trim($this->memberData['fb_uid']), $userData, $linkedMemberData, $perms, $missingPerms );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1173,7 +1223,10 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
|
||||
$this->request['newbox_1'] = $this->request['newbox_1'] ? $this->request['newbox_1'] : '';
|
||||
|
||||
return $this->registry->getClass('output')->getTemplate('ucp')->membersIgnoredUsersForm( $final_users, $pagination );
|
||||
$result = $this->registry->getClass('output')->getTemplate('ucp')->membersIgnoredUsersForm( $final_users, $pagination );
|
||||
$result = str_replace( "area=toggleIgnoredUser", "area=toggleIgnoredUser&authKey=" . $this->member->form_hash, $result );
|
||||
$result = str_replace( "area=removeIgnoredUser", "area=removeIgnoredUser&authKey=" . $this->member->form_hash, $result );
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
@@ -1405,7 +1458,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
$notifyLibrary->setMember( $this->memberData );
|
||||
|
||||
/* Clear them? - used in mobile skin */
|
||||
if ( isset($this->request['clear']) && trim($this->request['clear']) == 'true' )
|
||||
if ( isset($this->request['clear']) && trim($this->request['clear']) == 'true' AND $this->request['k'] == $this->member->form_hash )
|
||||
{
|
||||
$this->DB->update( 'inline_notifications', array( 'notify_read' => 1 ), 'notify_to_id=' . $this->memberData['member_id'] );
|
||||
|
||||
@@ -2310,7 +2363,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
{
|
||||
$this->lang->loadLanguageFile( array( 'public_post' ), 'forums' );
|
||||
|
||||
$_errors = $parser->getErrors();
|
||||
$_errors = $parser->getErrors();
|
||||
$_error = array_pop( $_errors );
|
||||
$this->registry->getClass('output')->showError( $_error, 10210 );
|
||||
}
|
||||
@@ -2549,6 +2602,12 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
|
||||
{
|
||||
$fields->out_fields[ 'field_' . $website_field ] = 'http://' . $fields->out_fields[ 'field_' . $website_field ];
|
||||
}
|
||||
|
||||
if ( IPSText::xssCheckUrl( $fields->out_fields[ 'field_' . $website_field ] ) === FALSE )
|
||||
{
|
||||
$fields->error_fields['invalid'][] = $fields->cache_data[ $website_field ];
|
||||
$fields->out_fields[ 'field_' . $website_field ] = '';
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: bfarber $ (Original: Mark)
|
||||
* @since -
|
||||
* $LastChangedDate: 2013-05-01 17:35:09 -0400 (Wed, 01 May 2013) $
|
||||
* @version v3.4.6
|
||||
* @version v3.4.8
|
||||
* $Revision: 12211 $
|
||||
*/
|
||||
|
||||
|
||||
Reference in new issue
Block a user