diff -crN phpBB2/includes/usercp_register.php spritmonitor/includes/usercp_register.php
*** phpBB2/includes/usercp_register.php 2005-06-26 21:25:24.000000000 +0200
--- spritmonitor/includes/usercp_register.php 2005-09-01 13:41:22.000000000 +0200
***************
*** 132,137 ****
--- 132,146 ----
$signature = str_replace('<br />', "\n", $signature);
+ // Spritmonitor MOD
+ if (isset($HTTP_POST_VARS['spritmonid']) )
+ {
+ $spritmonid = intval ($HTTP_POST_VARS['spritmonid']);
+ } else {
+ $spritmonid = 0;
+ }
+ // /Spritmonitor MOD
+
// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to
// empty strings if they fail.
validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
***************
*** 516,523 ****
$user_actkey = '';
}
$sql = "UPDATE " . USERS_TABLE . "
! SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popup_pm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . "
WHERE user_id = $user_id";
if ( !($result = $db->sql_query($sql)) )
{
--- 525,533 ----
$user_actkey = '';
}
+ // Spritmon MOD, appended: , user_spritmonid = '" . str_replace("\'", "''", $spritmonid) . "'
$sql = "UPDATE " . USERS_TABLE . "
! SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popup_pm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . ", user_spritmonid = $spritmonid
WHERE user_id = $user_id";
if ( !($result = $db->sql_query($sql)) )
{
***************
*** 580,587 ****
//
// Get current date
//
! $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popup_pm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )
{
$user_actkey = gen_rand_string(true);
--- 590,599 ----
//
// Get current date
//
! // Spritmonitor MOD, appended: , user_spritmonid
! // Spritmonitor MOD, appended: $spritmonid,
! $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey, user_spritmonid)
! VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popup_pm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, $spritmonid, ";
if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )
{
$user_actkey = gen_rand_string(true);
***************
*** 788,793 ****
--- 800,809 ----
$user_lang = $userdata['user_lang'];
$user_timezone = $userdata['user_timezone'];
$user_dateformat = $userdata['user_dateformat'];
+
+ // Spritmonitor MOD
+ $spritmonid = $userdata['user_spritmonid'];
+ // /Spritmonitor MOD
}
//
***************
*** 1089,1094 ****
--- 1105,1115 ----
'L_CONFIRM_CODE' => $lang['Confirm_code'],
'L_CONFIRM_CODE_EXPLAIN' => $lang['Confirm_code_explain'],
+ // Spritmonitor MOD
+ 'L_SPRITMON' => $lang['spritmon_id'],
+ 'L_SPRITMON_EXPLAIN' => $lang['spritmon_id_explain'],
+ 'S_SPRITMON' => $spritmonid,
+ // /Spritmonitor MOD
'S_ALLOW_AVATAR_UPLOAD' => $board_config['allow_avatar_upload'],
'S_ALLOW_AVATAR_LOCAL' => $board_config['allow_avatar_local'],
'S_ALLOW_AVATAR_REMOTE' => $board_config['allow_avatar_remote'],
***************
*** 1134,1137 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 1155,1158 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
diff -crN phpBB2/includes/usercp_viewprofile.php spritmonitor/includes/usercp_viewprofile.php
*** phpBB2/includes/usercp_viewprofile.php 2005-07-20 00:40:40.000000000 +0200
--- spritmonitor/includes/usercp_viewprofile.php 2005-09-01 19:19:48.000000000 +0200
***************
*** 168,173 ****
--- 168,181 ----
$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . sprintf($lang['Search_user_posts'], $profiledata['username']) . '" border="0" /></a>';
$search = '<a href="' . $temp_url . '">' . sprintf($lang['Search_user_posts'], $profiledata['username']) . '</a>';
+ // Spritmonitor MOD
+ $sprintmon_img = '';
+ $spritmonid = intval($profiledata['user_spritmonid']);
+ if ($spritmonid > 0){
+ $sprintmon_img = '<a href="
http://www.spritmonitor.de/detail.php?vid=' . $spritmonid .'"><img src="
http://www.spritmonitor.de/image.php?vid=' . $spritmonid . '&type=5" border="0"></a>';
+ }
+ // /Spritmonitor MOD
+
//
// Generate page
//
***************
*** 212,217 ****
--- 220,229 ----
'YIM_IMG' => $yim_img,
'YIM' => $yim,
+ // Spritmonitor MOD
+ 'SPRITMON_IMG' => $sprintmon_img,
+ // /Spritmonitor MOD
+
'LOCATION' => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : ' ',
'OCCUPATION' => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : ' ',
'INTERESTS' => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : ' ',
***************
*** 246,249 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 258,261 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
diff -crN phpBB2/language/lang_german/lang_main.php spritmonitor/language/lang_german/lang_main.php
*** phpBB2/language/lang_german/lang_main.php 2005-05-16 15:40:10.000000000 +0200
--- spritmonitor/language/lang_german/lang_main.php 2005-09-01 11:38:02.000000000 +0200
***************
*** 659,664 ****
--- 659,669 ----
$lang['Empty_subject_email'] = 'Du musst einen Titel für diese E-Mail angeben.';
$lang['Empty_message_email'] = 'Du musst einen Text zur E-Mail angeben.';
+ // Spritmonitor MOD
+ $lang['spritmon_id'] = 'Fahrzeug-ID auf spritmonitor.de';
+ $lang['spritmon_id_explain'] = 'Die eigene ID findet sich im Spritmonitor-Fahrzeug-Account unter Menü "Verbrauchsanzeige".';
+ $lang['spritmon_consum'] = 'Verbrauch von %s lt. spritmonitor.de';
+ // /Spritmonitor MOD
//
// Visual confirmation system strings
diff -crN phpBB2/spritmonitor_db_update.php spritmonitor/spritmonitor_db_update.php
*** phpBB2/spritmonitor_db_update.php 1970-01-01 01:00:00.000000000 +0100
--- spritmonitor/spritmonitor_db_update.php 2005-09-01 11:45:41.000000000 +0200
***************
*** 0 ****
--- 1,56 ----
+ <?php
+ #########################################################
+ ## SQL commands to phpBB2
+ ## Author: undisclosed
+ ## Nickname: CoreForce
+ ## Email:
greygry@netscape.net
+ ##
+ ## Spritmonitor MOD
+ ## Ver 1.0.0
+ ## Integrate spritmonitor.de icon into user avatar. german only (since the website is).
+ ## This SQL adds a spritmonitor id field to the user table.
+ ## Additional patch file required to make change effective on the user interface.
+ ## @see: phpBB-2.0.17_spritmonitor.patch
+ ##
+ #########################################################
+
+ define('IN_PHPBB', true);
+ $phpbb_root_path = './';
+ include($phpbb_root_path . 'extension.inc');
+ include($phpbb_root_path . 'common.'.$phpEx);
+ include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
+ define('SITE_HISTORY_TABLE', $table_prefix.'site_history');
+
+ $sql=array(
+ 'ALTER TABLE '.USERS_TABLE.' ADD user_spritmonid INT DEFAULT "0" not null'
+ );
+
+ $mods = array (
+ 'Spritmonitor Mod',
+ );
+
+ ############################################### Do not change anything below this line #######################################
+
+ //
+ // Start session management
+ //
+ $userdata = session_pagestart($user_ip, PAGE_INDEX);
+ init_userprefs($userdata);
+ //
+ // End session management
+ //
+
+ if ($userdata['user_level']!=ADMIN)
+ message_die(GENERAL_ERROR, "You are not Authorised to do this");
+ $n=0;
+ $message="<b>This list is a result of the SQL queries needed for the additional mods in the pre-moded pack</b><br/><br/>";
+ while($sql[$n])
+ {
+ $message .= ($mods[$n-1] != $mods[$n]) ? '<p><b><font size=3>'.$mods[$n].'</font></b><br/>' : '';
+ if(!$result = $db->sql_query($sql[$n]))
+ $message .= '<b><font color=#FF0000>[Already added]</font></b> line: '.($n+1).' , '.$sql[$n].'<br />';
+ else $message .='<b><font color=#0000fF>[Added/Updated]</font></b> line: '.($n+1).' , '.$sql[$n].'<br />';
+ $n++;
+ }
+ message_die(GENERAL_MESSAGE, $message);
+ ?>
diff -crN phpBB2/templates/subSilver/profile_add_body.tpl spritmonitor/templates/subSilver/profile_add_body.tpl
*** phpBB2/templates/subSilver/profile_add_body.tpl 2005-05-07 14:15:54.000000000 +0200
--- spritmonitor/templates/subSilver/profile_add_body.tpl 2005-09-01 11:49:14.000000000 +0200
***************
*** 122,127 ****
--- 122,133 ----
<input type="text" class="post"style="width: 200px" name="interests" size="35" maxlength="150" value="{INTERESTS}" />
</td>
</tr>
+ <!-- Spritmonitor MOD -->
+ <tr>
+ <td class="row1"><span class="gen">{L_SPRITMON}:{SPRITMON_REQUIRED}</span><br /><span class="gensmall">{L_SPRITMON_EXPLAIN}</td>
+ <td class="row2"><input type="text" class="post"style="width: 200px" name="spritmonid" size="8" maxlength="6" value="{S_SPRITMON}" /></td>
+ </tr>
+ <!-- /Spritmonitor MOD -->
<tr>
<td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td>
<td class="row2">
diff -crN phpBB2/templates/subSilver/profile_view_body.tpl spritmonitor/templates/subSilver/profile_view_body.tpl
*** phpBB2/templates/subSilver/profile_view_body.tpl 2005-05-07 14:15:54.000000000 +0200
--- spritmonitor/templates/subSilver/profile_view_body.tpl 2005-09-01 19:20:35.000000000 +0200
***************
*** 14,20 ****
<td class="catRight" width="60%"><b><span class="gen">{L_ABOUT_USER}</span></b></td>
</tr>
<tr>
! <td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}<br /><span class="postdetails">{POSTER_RANK}</span></td>
<td class="row1" rowspan="3" valign="top"><table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr>
<td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_JOINED}: </span></td>
--- 14,24 ----
<td class="catRight" width="60%"><b><span class="gen">{L_ABOUT_USER}</span></b></td>
</tr>
<tr>
! <td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}<br /><span class="postdetails">{POSTER_RANK}</span>
! <!-- Spritmonitor MOD-->
! <br/><br/>{SPRITMON_IMG}
! <!-- /Spritmonitor MOD-->
! </td>
<td class="row1" rowspan="3" valign="top"><table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr>
<td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_JOINED}: </span></td>
diff -crN phpBB2/templates/subSilver/viewtopic_body.tpl spritmonitor/templates/subSilver/viewtopic_body.tpl
*** phpBB2/templates/subSilver/viewtopic_body.tpl 2005-05-07 14:15:54.000000000 +0200
--- spritmonitor/templates/subSilver/viewtopic_body.tpl 2005-09-01 11:51:58.000000000 +0200
***************
*** 26,32 ****
</tr>
<!-- BEGIN postrow -->
<tr>
! <td width="150" align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span><br /><span class="postdetails">{postrow.POSTER_RANK}<br />{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /><br />{postrow.POSTER_JOINED}<br />{postrow.POSTER_POSTS}<br />{postrow.POSTER_FROM}</span><br /></td>
<td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="100%"><a href="{postrow.U_MINI_POST}"><img src="{postrow.MINI_POST_IMG}" width="12" height="9" alt="{postrow.L_MINI_POST_ALT}" title="{postrow.L_MINI_POST_ALT}" border="0" /></a><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
--- 26,36 ----
</tr>
<!-- BEGIN postrow -->
<tr>
! <td width="150" align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span><br /><span class="postdetails">{postrow.POSTER_RANK}<br />{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /><br />{postrow.POSTER_JOINED}<br />{postrow.POSTER_POSTS}<br />{postrow.POSTER_FROM}</span><br />
! <!-- Spritmonitor MOD -->
! {postrow.POSTER_SPRITMONIMG}
! <!-- /Spritmonitor MOD -->
! </td>
<td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="100%"><a href="{postrow.U_MINI_POST}"><img src="{postrow.MINI_POST_IMG}" width="12" height="9" alt="{postrow.L_MINI_POST_ALT}" title="{postrow.L_MINI_POST_ALT}" border="0" /></a><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
diff -crN phpBB2/viewtopic.php spritmonitor/viewtopic.php
*** phpBB2/viewtopic.php 2005-07-20 00:45:14.000000000 +0200
--- spritmonitor/viewtopic.php 2005-09-01 11:58:42.000000000 +0200
***************
*** 385,391 ****
//
// Go ahead and pull all data for this topic
//
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, u.user_allowsmile, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
WHERE p.topic_id = $topic_id
$limit_posts_time
--- 385,392 ----
//
// Go ahead and pull all data for this topic
//
! // Spritmonitor MOD, appended to line: , u.user_spritmonid
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, u.user_allowsmile, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid, u.user_spritmonid
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
WHERE p.topic_id = $topic_id
$limit_posts_time
***************
*** 856,861 ****
--- 857,873 ----
}
}
+ // Spritmonitor MOD
+
+ $poster_spritmonid = '';
+ $poster_spritmonimg = '';
+ if ( $postrow[$i]['user_spritmonid'] != 0)
+ {
+ $poster_spritmonid = $postrow[$i]['user_spritmonid'];
+ $poster_spritmonimg = '<a href="
http://www.spritmonitor.de/detail.php?vid=' . $poster_spritmonid . '" target="_blank" ><img src="
http://www.spritmonitor.de/image.php?vid=' . $poster_spritmonid . '&type=5" border="0" alt="Verbrauchswerte von ' . $poster . ' lt. spritmonitor.de" /></a>';
+ }
+ // /Spritmonitor MOD
+
//
// Define the little post icon
//
***************
*** 1202,1207 ****
--- 1214,1224 ----
'DELETE_IMG' => $delpost_img,
'DELETE' => $delpost,
+ // Spritmonitor MOD
+ 'POSTER_SPRITMONID' => $poster_spritmonid,
+ 'POSTER_SPRITMONIMG' => $poster_spritmonimg,
+ // /Spritmonitor MOD
+
'L_MINI_POST_ALT' => $mini_post_alt,
'U_MINI_POST' => $mini_post_url,
