Version 2.2.0 RC-1
This commit is contained in:
Neo committed
1 parent
f73f8bff6d
commit
22f1b963ee
1034 files changed
+178610
-70897
No files matched your search
@@ -2,27 +2,17 @@
|
||||
|
||||
/*
|
||||
+--------------------------------------------------------------------------
|
||||
| Invision Power Board 2.1.7
|
||||
| Invision Power Board
|
||||
| =============================================
|
||||
| by Matthew Mecham
|
||||
| (c) 2001 - 2005 Invision Power Services, Inc.
|
||||
| (c) 2001 - 2006 Invision Power Services, Inc.
|
||||
| http://www.invisionpower.com
|
||||
| =============================================
|
||||
| Web: http://www.invisionboard.com
|
||||
| http://www.ibresource.ru/products/invisionpowerboard/
|
||||
| Time: Tuesday 18th of July 2006 05:56:00 PM
|
||||
| Release: 52f408a29988b02f45b5e6f4ba5af0ae
|
||||
| Licence Info: http://www.invisionboard.com/?license
|
||||
| http://www.ibresource.ru/license
|
||||
+---------------------------------------------------------------------------
|
||||
| INVISION POWER BOARD IS NOT FREE / OPEN SOURCE!
|
||||
+---------------------------------------------------------------------------
|
||||
| INVISION POWER BOARD ÍÅ ßÂËßÅÒÑß ÁÅÑÏËÀÒÍÛÌ ÏÐÎÃÐÀÌÌÍÛÌ ÎÁÅÑÏÅ×ÅÍÈÅÌ!
|
||||
| Ïðàâà íà ÏÎ ïðèíàäëåæàò Invision Power Services
|
||||
| Ïðàâà íà ïåðåâîä IBResource (http://www.ibresource.ru)
|
||||
+---------------------------------------------------------------------------
|
||||
| > $Date: 2005-10-10 14:08:54 +0100 (Mon, 10 Oct 2005) $
|
||||
| > $Revision: 23 $
|
||||
| > $Date: 2006-09-22 11:28:54 +0100 (Fri, 22 Sep 2006) $
|
||||
| > $Revision: 567 $
|
||||
| > $Author: matt $
|
||||
+---------------------------------------------------------------------------
|
||||
|
|
||||
@@ -93,6 +83,12 @@ class func_digest
|
||||
|
||||
$this->ipsclass->DB->load_cache_file( $this->root_path.'sources/sql/'.SQL_DRIVER.'_extra_queries.php', 'sql_extra_queries' );
|
||||
|
||||
//-----------------------------------------
|
||||
// Get some lang bits
|
||||
//-----------------------------------------
|
||||
|
||||
$this->ipsclass->load_language('lang_emails');
|
||||
|
||||
//-----------------------------------------
|
||||
// Load the email libby
|
||||
//-----------------------------------------
|
||||
@@ -194,7 +190,7 @@ class func_digest
|
||||
// Process
|
||||
//-----------------------------------------
|
||||
|
||||
$main_output .= "Topic: $topic_title (Forum: $forum_name)\n"
|
||||
$main_output .= "{$this->ipsclass->lang['topic_langbit']}: $topic_title ({$this->ipsclass->lang['forum_langbit']}: $forum_name)\n"
|
||||
. "=====================================\n"
|
||||
. $post_output
|
||||
. "\n=====================================\n";
|
||||
@@ -203,6 +199,7 @@ class func_digest
|
||||
}
|
||||
else
|
||||
{
|
||||
$others_posted = 1;
|
||||
$main_output = $cached[ $t['tid'] ];
|
||||
}
|
||||
|
||||
@@ -220,7 +217,7 @@ class func_digest
|
||||
'TOPIC_ID' => $t['tid'],
|
||||
'FORUM_ID' => $t['forum_id'],
|
||||
'TITLE' => $topic_title,
|
||||
'NAME' => $t['name'],
|
||||
'NAME' => $t['members_display_name'],
|
||||
'CONTENT' => $main_output,
|
||||
) );
|
||||
|
||||
@@ -238,7 +235,7 @@ class func_digest
|
||||
// Update cache with remaning email count
|
||||
//-----------------------------------------
|
||||
|
||||
$this->ipsclass->DB->do_update( 'cache_store', array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($this->ipsclass->cache['systemvars'])) ), "cs_key='systemvars'" );
|
||||
$this->ipsclass->update_cache( array( 'array' => 1, 'name' => 'systemvars', 'donow' => 1, 'deletefirst' => 0 ) );
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
@@ -270,7 +267,7 @@ class func_digest
|
||||
$main_output = "";
|
||||
$others_posted = 0;
|
||||
|
||||
if ( ! $cached[ $t['forum_id'] ] )
|
||||
if ( !isset($cached[ $t['forum_id'] ]) OR !$cached[ $t['forum_id'] ] )
|
||||
{
|
||||
$forum_name = $this->ipsclass->cache['forum_cache'][ $t['forum_id'] ]['name'];
|
||||
|
||||
@@ -288,22 +285,28 @@ class func_digest
|
||||
|
||||
while( $p = $this->ipsclass->DB->fetch_row( $topic_query ) )
|
||||
{
|
||||
$this->ipsclass->DB->cache_add_query( 'digest_get_forums_topics_posts', array(
|
||||
'tid' => $p['tid'],
|
||||
), 'sql_extra_queries' );
|
||||
$post_query = $this->ipsclass->DB->cache_exec_query();
|
||||
$post = $this->ipsclass->DB->fetch_row();
|
||||
|
||||
//-----------------------------------------
|
||||
// Do we have other posters?
|
||||
//-----------------------------------------
|
||||
|
||||
if ( $t['member_id'] != $p['starter_id'] )
|
||||
if ( $t['member_id'] != $post['author_id'] )
|
||||
{
|
||||
$others_posted = 1;
|
||||
}
|
||||
|
||||
$post_author = $p['author_name'];
|
||||
$post_date = $this->ipsclass->get_date( $p['post_date'], 'SHORT' );
|
||||
$post_content = $p['post'];
|
||||
$post_author = $post['author_name'];
|
||||
$post_date = $this->ipsclass->get_date( $post['post_date'], 'SHORT' );
|
||||
$post_content = $post['post'];
|
||||
$topic_title = $p['title'];
|
||||
|
||||
$post_output .= "\n-------------------------------------------\n"
|
||||
. "Topic: {$topic_title} ({$post_author} -- {$post_date})"
|
||||
. "{$this->ipsclass->lang['topic_langbit']}: {$topic_title} ({$post_author} -- {$post_date})"
|
||||
. "\n............................................\n"
|
||||
. "{$post_content}\n\n";
|
||||
}
|
||||
@@ -312,7 +315,7 @@ class func_digest
|
||||
// Process
|
||||
//-----------------------------------------
|
||||
|
||||
$main_output .= "Forum: $forum_name\n"
|
||||
$main_output .= "{$this->ipsclass->lang['forum_langbit']}: $forum_name\n"
|
||||
. "=====================================\n"
|
||||
. $post_output
|
||||
. "\n=====================================\n";
|
||||
@@ -321,6 +324,7 @@ class func_digest
|
||||
}
|
||||
else
|
||||
{
|
||||
$others_posted = 1;
|
||||
$main_output = $cached[ $t['forum_id'] ];
|
||||
}
|
||||
|
||||
@@ -332,11 +336,11 @@ class func_digest
|
||||
// Send email...
|
||||
//-----------------------------------------
|
||||
|
||||
$this->email->get_template( $subject, $data['language']);
|
||||
$this->email->get_template( $subject, $t['language']);
|
||||
|
||||
$this->email->build_message( array(
|
||||
'FORUM_ID' => $t['forum_id'],
|
||||
'NAME' => $forum_name,
|
||||
'NAME' => $t['members_display_name'],
|
||||
'CONTENT' => $main_output,
|
||||
) );
|
||||
|
||||
@@ -354,7 +358,7 @@ class func_digest
|
||||
// Update cache with remaning email count
|
||||
//-----------------------------------------
|
||||
|
||||
$this->ipsclass->DB->do_update( 'cache_store', array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($this->ipsclass->cache['systemvars'])) ), "cs_key='systemvars'" );
|
||||
$this->ipsclass->update_cache( array( 'array' => 1, 'name' => 'systemvars', 'donow' => 1, 'deletefirst' => 0 ) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user