github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 06:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r56

Browse source 
исправление недочетов и осуществление идей от пользователей git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@56 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2011-07-01 19:09:01 +00:00
commit d4afc2caf1
6 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
upload/attach_mod/displaying_torrent.php
View file

@ -81,8 +81,8 @@ $description = ($comment) ? $comment : preg_replace("#.torrent$#i", '', $displ
if ($tor_auth_reg || $tor_auth_del)
{
$reg_tor_url = '<a class="genmed" href="#" onclick="ajax.exec({ action: \'change_torrent\', attach_id : '. $attach_id .', type: \'reg\'}); return false;">'. $lang['BT_REG_ON_TRACKER'] .'</a>';
$unreg_tor_url = '<a class="genmed" href="#" onclick="ajax.exec({ action: \'change_torrent\', attach_id : '. $attach_id .', type: \'unreg\'}); return false;">'. $lang['BT_UNREG_FROM_TRACKER'] .'</a>';
$reg_tor_url = '<a class="txtb" href="#" onclick="ajax.exec({ action: \'change_torrent\', attach_id : '. $attach_id .', type: \'reg\'}); return false;">'. $lang['BT_REG_ON_TRACKER'] .'</a>';
$unreg_tor_url = '<a class="txtb" href="#" onclick="ajax.exec({ action: \'change_torrent\', attach_id : '. $attach_id .', type: \'unreg\'}); return false;">'. $lang['BT_UNREG_FROM_TRACKER'] .'</a>';
$tracker_link = ($tor_reged) ? $unreg_tor_url : $reg_tor_url;
}
@ -224,7 +224,7 @@ if ($tor_reged && $tor_info)
// torrent status mod
'TOR_STATUS_TEXT' => $lang['tor_status'][$tor_info['tor_status']],
'TOR_STATUS_ICON' => $bb_cfg['tor_icons'][$tor_info['tor_status']],
'TOR_STATUS_BY' => $cuid ? ('&nbsp;&middot;&nbsp; <a href='. PROFILE_URL . $cuid . '>' . get_username($cuid) . '</a>&nbsp; &middot;&nbsp; <i>'. delta_time($tor_info['checked_time']) .' назад</i>') : '',
'TOR_STATUS_BY' => ($cuid && $is_auth['auth_mod']) ? ('&nbsp;&middot;&nbsp; <a href='. PROFILE_URL . $cuid . '>' . get_username($cuid) . '</a>&nbsp; &middot;&nbsp; <i>'. delta_time($tor_info['checked_time']) .' назад</i>') : '',
'TOR_STATUS_SELECT' => build_select('', array_flip($bb_cfg['change_tor_status_select']), TOR_APPROVED),
//end torrent status mod

4
upload/config.php
View file

@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.0.2';
$bb_cfg['tp_release_state'] = 'TP II r49';
$bb_cfg['tp_release_date'] = '30-06-2011';
$bb_cfg['tp_release_state'] = 'TP II r56';
$bb_cfg['tp_release_date'] = '02-07-2011';
$bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
$bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";

6
upload/includes/page_footer.php
View file

@ -62,6 +62,12 @@ if ($show_dbg_info)
}
$stat .= ' &nbsp;]';
$stat .= '
<label><input type="checkbox" onclick="setCookie(\'sql_log\', this.checked ? 1 : 0); window.location.reload();" '. (!empty($_COOKIE['sql_log']) ? HTML_CHECKED : '') .' />show log </label>
<label title="dont truncate long queries"><input type="checkbox" onclick="setCookie(\'sql_log_full\', this.checked ? 1 : 0); window.location.reload();" '. (!empty($_COOKIE['sql_log_full']) ? HTML_CHECKED : '') .' />full </label>
<label><input type="checkbox" onclick="setCookie(\'explain\', this.checked ? 1 : 0); window.location.reload();" '. (!empty($_COOKIE['explain']) ? HTML_CHECKED : '') .' />explain </label>
[ <a href="#" class="med" onclick="$p(\'sqlLog\').className=\'sqlLog sqlLogWrapped\'; return false;">wrap</a> &middot; <a href="#sqlLog" class="med" onclick="$(\'#sqlLog\').css({ height: $(window).height()-50 }); return false;">max</a> ]
';
echo '<div style="margin: 6px; font-size:10px; color: #444444; letter-spacing: -1px; text-align: center;">'. $stat .'</div>';
}

16
upload/includes/page_footer_dev.php
View file

@ -92,18 +92,9 @@ if (DEBUG) {
</fieldset>
';
}
echo '
<fieldset class="med" style="padding: 2px 4px 6px;">
<legend>SQL</legend>
<label><input type="checkbox" onclick="setCookie(\'sql_log\', this.checked ? 1 : 0); window.location.reload();" '. (!empty($_COOKIE['sql_log']) ? HTML_CHECKED : '') .' />show log </label>
<label title="dont truncate long queries"><input type="checkbox" onclick="setCookie(\'sql_log_full\', this.checked ? 1 : 0); window.location.reload();" '. (!empty($_COOKIE['sql_log_full']) ? HTML_CHECKED : '') .' />full </label>
<label><input type="checkbox" onclick="setCookie(\'explain\', this.checked ? 1 : 0); window.location.reload();" '. (!empty($_COOKIE['explain']) ? HTML_CHECKED : '') .' />explain </label>
[
<a href="#" class="med" onclick="$p(\'sqlLog\').className=\'sqlLog sqlLogWrapped\'; return false;">wrap</a> &middot;
<a href="#sqlLog" class="med" onclick="$(\'#sqlLog\').css({ height: $(window).height()-50 });">max</a>
]
</fieldset>
';
if ($sql_log)
{
echo '
</div><!-- / sqlLogHead -->
@ -133,6 +124,7 @@ function fixSqlLog() {
<br clear="all" />
';
}
if (PROFILER && !empty($_COOKIE['prof_enabled']))
{

4
upload/includes/ucp/usercp_register.php
View file

@ -526,7 +526,7 @@ foreach ($profile_fields as $field => $can_edit)
$s_categories .= '</select>';
$s_colspan = 0;
for($i = 0; $i < count($avatar_images[$category]); $i++)
for($i = 0; $i < @count($avatar_images[$category]); $i++)
{
$template->assign_block_vars("avatar_row", array());
@ -729,7 +729,7 @@ $template->assign_vars($tp_data);
$template->assign_vars(array(
'PAGE_TITLE' => ($mode == 'editprofile') ? $lang['EDIT_PROFILE'] . ($adm_edit ? " :: {$pr_data['username']}" : '') : $lang['REGISTER'],
'SHOW_REG_AGREEMENT' => ($mode == 'register' && !IS_ADMIN),
'ERROR_MESSAGE' => ($errors) ? join('<br />', $errors) : '',
'ERROR_MESSAGE' => ($errors) ? join('<br />', array_unique($errors)) : '',
'MODE' => $mode,
'EDIT_PROFILE' => ($mode == 'editprofile'),
'ADM_EDIT' => $adm_edit,

5
upload/templates/default/viewtopic_attach.tpl
View file

@ -262,12 +262,11 @@
</tr>
<tr class="row1">
<td>{L_TOR_STATUS}:</td>
<td<!-- IF AUTH_MOD --> style="padding: 6px 4px;"<!-- ENDIF -->>
<td>
<span id="tor-{postrow.attach.tor_reged.ATTACH_ID}-status">{postrow.attach.tor_reged.TOR_STATUS_ICON} <b>{postrow.attach.tor_reged.TOR_STATUS_TEXT}</b>
<!-- IF postrow.attach.tor_reged.TOR_STATUS_BY -->{postrow.attach.tor_reged.TOR_STATUS_BY}<!-- ENDIF -->
</span>
<!-- IF AUTH_MOD -->
<div class="spacer_6"></div>
<script type="text/javascript">
ajax.change_tor_status = function(status) {
ajax.exec({
@ -283,7 +282,7 @@
<span id="tor-{postrow.attach.tor_reged.ATTACH_ID}">{postrow.attach.tor_reged.TOR_STATUS_SELECT}</span>
[ <a href="#" onclick="ajax.change_tor_status($('#tor-{postrow.attach.tor_reged.ATTACH_ID} select').val()); return false;" class="med bold nowrap">Изменить</a> ]
<a href="#" onclick="ajax.change_tor_status($('#tor-{postrow.attach.tor_reged.ATTACH_ID} select').val()); return false;" class="txtb">[Изменить]</a>
<!-- ENDIF -->
</td>