Forums

Unfortunately no one can be told what FluxBB is - you have to see it for yourself.

You are not logged in.

Announcement

FluxBB 1.5.6 and 1.4.12 released

These releases fix a security issue - please update your forums! Download links: v1.5.6 | v1.4.12

#1 2013-01-12 08:09:55

padagrad
Member
Registered: 2013-01-08
Posts: 21

Patch does not apply fully

Hi! big_smile

I realised I had to apply the patch instead of just copying the files, because we have a lot modified there. So I applied the patch and here is what I got:

$ patch -p1 -i fluxbb-1.4.8_to_fluxbb-1.5.0.patch
patching file `README'
patching file `admin_bans.php'
patching file `admin_categories.php'
patching file `admin_censoring.php'
patching file `admin_forums.php'
Hunk #2 FAILED at 159.
1 out of 2 hunks FAILED -- saving rejects to admin_forums.php.rej
patching file `admin_groups.php'
Hunk #2 FAILED at 82.
Hunk #3 succeeded at 268 (offset 7 lines).
Hunk #4 FAILED at 290.
Hunk #5 succeeded at 306 (offset 1 line).
Hunk #6 FAILED at 327.
Hunk #7 FAILED at 341.
Hunk #8 succeeded at 379 (offset 10 lines).
Hunk #9 succeeded at 416 (offset 1 line).
Hunk #10 succeeded at 540 (offset 10 lines).
Hunk #11 succeeded at 562 (offset 1 line).
Hunk #12 succeeded at 607 (offset 10 lines).
4 out of 12 hunks FAILED -- saving rejects to admin_groups.php.rej
patching file `admin_index.php'
patching file `admin_loader.php'
patching file `admin_maintenance.php'
patching file `admin_options.php'
patching file `admin_permissions.php'
patching file `admin_ranks.php'
patching file `admin_reports.php'
patching file `admin_users.php'
patching file `db_update.php'
patching file `delete.php'
patching file `edit.php'
Hunk #1 FAILED at 11.
Hunk #2 succeeded at 43 (offset 1 line).
Hunk #3 succeeded at 109 (offset 1 line).
Hunk #4 succeeded at 234 (offset 8 lines).
1 out of 4 hunks FAILED -- saving rejects to edit.php.rej
patching file `help.php'
patching file `include/cache.php'
patching file `include/common.php'
Hunk #1 succeeded at 10 with fuzz 1.
patching file `include/common_admin.php'
patching file `include/dblayer/mysql.php'
patching file `include/dblayer/mysql_innodb.php'
patching file `include/dblayer/mysqli.php'
patching file `include/dblayer/mysqli_innodb.php'
patching file `include/dblayer/pgsql.php'
patching file `include/dblayer/sqlite.php'
patching file `include/functions.php'
Hunk #1 succeeded at 578 (offset 12 lines).
Hunk #3 succeeded at 814 (offset 15 lines).
Hunk #5 succeeded at 837 (offset 15 lines).
Hunk #7 succeeded at 899 (offset 15 lines).
Hunk #9 succeeded at 956 (offset 15 lines).
Hunk #11 succeeded at 1166 (offset 15 lines).
Hunk #13 succeeded at 1658 (offset 31 lines).
Hunk #15 succeeded at 2005 (offset 31 lines).
patching file `include/parser.php'
patching file `include/search_idx.php'
patching file `include/utf8/strcspn.php'
patching file `include/utf8/strspn.php'
patching file `include/utf8/substr_replace.php'
patching file `index.php'
patching file `install.php'
patching file `lang/English/admin_common.php'
patching file `lang/English/admin_groups.php'
patching file `lang/English/admin_index.php'
patching file `lang/English/admin_options.php'
patching file `lang/English/admin_ranks.php'
patching file `lang/English/common.php'
patching file `lang/English/install.php'
patching file `lang/English/profile.php'
patching file `lang/English/update.php'
patching file `login.php'
patching file `misc.php'
patching file `moderate.php'
patching file `post.php'
Hunk #1 succeeded at 12 (offset 1 line).
Hunk #3 succeeded at 48 with fuzz 2 (offset 1 line).
Hunk #4 succeeded at 109 (offset 18 lines).
Hunk #5 succeeded at 153 (offset 1 line).
Hunk #6 succeeded at 210 (offset 19 lines).
Hunk #7 succeeded at 416 (offset 2 lines).
Hunk #8 succeeded at 466 (offset 19 lines).
Hunk #9 succeeded at 643 (offset 5 lines).
patching file `profile.php'
Hunk #8 succeeded at 516 (offset 20 lines).
Hunk #9 succeeded at 548 (offset 11 lines).
Hunk #10 succeeded at 578 (offset 20 lines).
Hunk #11 succeeded at 691 (offset 12 lines).
Hunk #12 succeeded at 709 (offset 20 lines).
Hunk #13 succeeded at 726 (offset 12 lines).
Hunk #14 succeeded at 770 (offset 20 lines).
Hunk #15 succeeded at 773 (offset 12 lines).
Hunk #16 succeeded at 914 (offset 20 lines).
Hunk #17 succeeded at 968 (offset 31 lines).
Hunk #18 succeeded at 999 (offset 20 lines).
Hunk #19 succeeded at 1024 with fuzz 2 (offset 33 lines).
Hunk #20 succeeded at 1557 (offset 120 lines).
Hunk #21 succeeded at 1568 (offset 33 lines).
Hunk #22 succeeded at 1806 (offset 120 lines).
patching file `register.php'
Hunk #1 succeeded at 80 (offset 7 lines).
patching file `search.php'
patching file `style/Air/base_admin.css'
patching file `style/Earth/base_admin.css'
patching file `style/Fire/base_admin.css'
patching file `style/Technetium.css'
patching file `style/imports/base_admin.css'
patching file `userlist.php'
patching file `viewforum.php'
Hunk #2 succeeded at 29 with fuzz 1 (offset 1 line).
Hunk #3 succeeded at 347 (offset 178 lines).
Hunk #4 succeeded at 204 with fuzz 1 (offset 6 lines).
Hunk #5 succeeded at 439 (offset 194 lines).
patching file `viewtopic.php'
Hunk #1 succeeded at 11 with fuzz 2.
Hunk #2 succeeded at 40 (offset 11 lines).
Hunk #3 succeeded at 95 with fuzz 1 (offset 10 lines).
Hunk #4 succeeded at 467 (offset 32 lines).

Why is this? I'm starting to get desperate. The forum is down for a week already, but I'm no further than I was in the beginning.

Offline

#2 2013-01-13 18:26:25

Franz
Lead developer
From: Germany
Registered: 2008-05-13
Posts: 5,610
Website

Re: Patch does not apply fully

Did I understand this correctly that your forum is modified too much so that you don't want to simply replace all files (or maybe only the changed files)?

As far as I remember, you had updated from 1.4.8 to 1.5.1 and had problems. Then successfully reverted after a while. And now you're trying to upgrade to 1.5.0 again? Why not 1.5.2? And do you still have your backup from 1.5.1? Updating from that one to 1.5.2 should be simple.

And why is your forum still down? As far as I see, it should still work at v1.4.8.

Sorry for all the trouble.
Franz


fluxbb.de | develoPHP

"As code is more often read than written it's really important to write clean code."

Offline

#3 2013-01-13 22:19:09

padagrad
Member
Registered: 2013-01-08
Posts: 21

Re: Patch does not apply fully

Hi Franz!

Yes, our forum is very much modified! Our first admin who created it used to do the upgrades, but he got lost and we don't know what happened to him. He might even be dead. So I had to take over, and I've never done an upgrade before, though I think I have a bit more general knowledge about IT and programming than him (but I'm far from being a coder!). He did a lot of modifications and experimenting, in fact he migrated the whole stuff from PunBB a while ago.

I did the upgrade from 1.4.8 to 1.5.1 by overwriting files. Then reverted (the DB didn't revert, so it's from 1.5.1), because I realised that the modifications I need do not work with 1.5.1. I need Subforums and PMS as a minimum. I locked the forum so that people don't post and interfere with my work. What can I do to make this work?

Offline

#4 2013-01-14 00:16:39

Franz
Lead developer
From: Germany
Registered: 2008-05-13
Posts: 5,610
Website

Re: Patch does not apply fully

So did this error occur when reverting from 1.5.1 to 1.4.8 or when making the upgrade from 1.4.8 to 1.5.0?

The patch output clearly says it logged the errors in *.rej files - do these help you?


fluxbb.de | develoPHP

"As code is more often read than written it's really important to write clean code."

Offline

#5 2013-01-14 12:22:08

padagrad
Member
Registered: 2013-01-08
Posts: 21

Re: Patch does not apply fully

This occurred when doing the upgrade.

This is what the error files say:

admin_forums.php.rej:

***************
*** 159,165 ****
  		$forum_desc = pun_linebreaks(pun_trim($_POST['forum_desc']));
  		$cat_id = intval($_POST['cat_id']);
  		$sort_by = intval($_POST['sort_by']);
- 		$redirect_url = isset($_POST['redirect_url']) ? trim($_POST['redirect_url']) : null;
  
  		if ($forum_name == '')
  			message($lang_admin_forums['Must enter name message']);
--- 159,165 ----
  		$forum_desc = pun_linebreaks(pun_trim($_POST['forum_desc']));
  		$cat_id = intval($_POST['cat_id']);
  		$sort_by = intval($_POST['sort_by']);
+ 		$redirect_url = isset($_POST['redirect_url']) ? pun_trim($_POST['redirect_url']) : null;
  
  		if ($forum_name == '')
  			message($lang_admin_forums['Must enter name message']);

admin_groups.php.rej:

***************
*** 81,226 ****
  									<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
  									<td>
  										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo pun_htmlspecialchars($group['g_user_title']) ?>" tabindex="2" />
- 										<span><?php echo $lang_admin_groups['User title help'] ?></span>
  									</td>
  								</tr>
- <?php if ($group['g_id'] != PUN_ADMIN): if ($group['g_id'] != PUN_GUEST): if ($mode != 'edit' || $pun_config['o_default_user_group'] != $group['g_id']): ?>								<tr>
  									<th scope="row"> <?php echo $lang_admin_groups['Mod privileges label'] ?></th>
  									<td>
- 										<input type="radio" name="moderator" value="1"<?php if ($group['g_moderator'] == '1') echo ' checked="checked"' ?> tabindex="3" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="moderator" value="0"<?php if ($group['g_moderator'] == '0') echo ' checked="checked"' ?> tabindex="4" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Mod privileges help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Edit profile label'] ?></th>
  									<td>
- 										<input type="radio" name="mod_edit_users" value="1"<?php if ($group['g_mod_edit_users'] == '1') echo ' checked="checked"' ?> tabindex="5" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_edit_users" value="0"<?php if ($group['g_mod_edit_users'] == '0') echo ' checked="checked"' ?> tabindex="6" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Edit profile help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Rename users label'] ?></th>
  									<td>
- 										<input type="radio" name="mod_rename_users" value="1"<?php if ($group['g_mod_rename_users'] == '1') echo ' checked="checked"' ?> tabindex="7" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_rename_users" value="0"<?php if ($group['g_mod_rename_users'] == '0') echo ' checked="checked"' ?> tabindex="8" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Rename users help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Change passwords label'] ?></th>
  									<td>
- 										<input type="radio" name="mod_change_passwords" value="1"<?php if ($group['g_mod_change_passwords'] == '1') echo ' checked="checked"' ?> tabindex="9" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_change_passwords" value="0"<?php if ($group['g_mod_change_passwords'] == '0') echo ' checked="checked"' ?> tabindex="10" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Change passwords help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Ban users label'] ?></th>
  									<td>
- 										<input type="radio" name="mod_ban_users" value="1"<?php if ($group['g_mod_ban_users'] == '1') echo ' checked="checked"' ?> tabindex="11" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_ban_users" value="0"<?php if ($group['g_mod_ban_users'] == '0') echo ' checked="checked"' ?> tabindex="12" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Ban users help'] ?></span>
  									</td>
  								</tr>
  <?php endif; endif; ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Read board label'] ?></th>
  									<td>
- 										<input type="radio" name="read_board" value="1"<?php if ($group['g_read_board'] == '1') echo ' checked="checked"' ?> tabindex="13" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="read_board" value="0"<?php if ($group['g_read_board'] == '0') echo ' checked="checked"' ?> tabindex="14" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Read board help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['View user info label'] ?></th>
  									<td>
- 										<input type="radio" name="view_users" value="1"<?php if ($group['g_view_users'] == '1') echo ' checked="checked"' ?> tabindex="15" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="view_users" value="0"<?php if ($group['g_view_users'] == '0') echo ' checked="checked"' ?> tabindex="16" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['View user info help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Post replies label'] ?></th>
  									<td>
- 										<input type="radio" name="post_replies" value="1"<?php if ($group['g_post_replies'] == '1') echo ' checked="checked"' ?> tabindex="17" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="post_replies" value="0"<?php if ($group['g_post_replies'] == '0') echo ' checked="checked"' ?> tabindex="18" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Post replies help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Post topics label'] ?></th>
  									<td>
- 										<input type="radio" name="post_topics" value="1"<?php if ($group['g_post_topics'] == '1') echo ' checked="checked"' ?> tabindex="19" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="post_topics" value="0"<?php if ($group['g_post_topics'] == '0') echo ' checked="checked"' ?> tabindex="20" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Post topics help'] ?></span>
  									</td>
  								</tr>
  <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Edit posts label'] ?></th>
  									<td>
- 										<input type="radio" name="edit_posts" value="1"<?php if ($group['g_edit_posts'] == '1') echo ' checked="checked"' ?> tabindex="21" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="edit_posts" value="0"<?php if ($group['g_edit_posts'] == '0') echo ' checked="checked"' ?> tabindex="22" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Edit posts help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Delete posts label'] ?></th>
  									<td>
- 										<input type="radio" name="delete_posts" value="1"<?php if ($group['g_delete_posts'] == '1') echo ' checked="checked"' ?> tabindex="23" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="delete_posts" value="0"<?php if ($group['g_delete_posts'] == '0') echo ' checked="checked"' ?> tabindex="24" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Delete posts help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Delete topics label'] ?></th>
  									<td>
- 										<input type="radio" name="delete_topics" value="1"<?php if ($group['g_delete_topics'] == '1') echo ' checked="checked"' ?> tabindex="25" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="delete_topics" value="0"<?php if ($group['g_delete_topics'] == '0') echo ' checked="checked"' ?> tabindex="26" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Delete topics help'] ?></span>
  									</td>
  								</tr>
- 								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Set own title label'] ?></th>
  									<td>
- 										<input type="radio" name="set_title" value="1"<?php if ($group['g_set_title'] == '1') echo ' checked="checked"' ?> tabindex="27" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="set_title" value="0"<?php if ($group['g_set_title'] == '0') echo ' checked="checked"' ?> tabindex="28" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Set own title help'] ?></span>
  									</td>
  								</tr>
  <?php endif; ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['User search label'] ?></th>
  									<td>
- 										<input type="radio" name="search" value="1"<?php if ($group['g_search'] == '1') echo ' checked="checked"' ?> tabindex="29" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="search" value="0"<?php if ($group['g_search'] == '0') echo ' checked="checked"' ?> tabindex="30" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['User search help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['User list search label'] ?></th>
  									<td>
- 										<input type="radio" name="search_users" value="1"<?php if ($group['g_search_users'] == '1') echo ' checked="checked"' ?> tabindex="31" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="search_users" value="0"<?php if ($group['g_search_users'] == '0') echo ' checked="checked"' ?> tabindex="32" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['User list search help'] ?></span>
  									</td>
  								</tr>
  <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Send e-mails label'] ?></th>
  									<td>
- 										<input type="radio" name="send_email" value="1"<?php if ($group['g_send_email'] == '1') echo ' checked="checked"' ?> tabindex="33" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="send_email" value="0"<?php if ($group['g_send_email'] == '0') echo ' checked="checked"' ?> tabindex="34" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Send e-mails help'] ?></span>
  									</td>
  								</tr>
  <?php endif; ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Post flood label'] ?></th>
  									<td>
- 										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['g_post_flood'] ?>" tabindex="35" />
  										<span><?php echo $lang_admin_groups['Post flood help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Search flood label'] ?></th>
  									<td>
- 										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['g_search_flood'] ?>" tabindex="36" />
  										<span><?php echo $lang_admin_groups['Search flood help'] ?></span>
  									</td>
  								</tr>
  <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['E-mail flood label'] ?></th>
  									<td>
- 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['g_email_flood'] ?>" tabindex="37" />
  										<span><?php echo $lang_admin_groups['E-mail flood help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Report flood label'] ?></th>
  									<td>
- 										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['g_report_flood'] ?>" tabindex="38" />
  										<span><?php echo $lang_admin_groups['Report flood help'] ?></span>
  									</td>
  								</tr>
--- 82,258 ----
  									<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
  									<td>
  										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo pun_htmlspecialchars($group['g_user_title']) ?>" tabindex="2" />
+ 										<span><?php printf($lang_admin_groups['User title help'], $lang_common['Member']) ?></span>
+ 									</td>
+ 								</tr>
+ <?php if ($group['g_id'] != PUN_ADMIN): if ($group['g_id'] != PUN_GUEST): ?>								<tr>
+ 									<th scope="row"><?php echo $lang_admin_groups['Promote users label'] ?></th>
+ 									<td>
+ 										<select name="promote_next_group" tabindex="3">
+ 											<option value="0"><?php echo $lang_admin_groups['Disable promotion'] ?></option>
+ <?php
+ 
+ foreach ($groups as $cur_group)
+ {
+ 	if (($cur_group['g_id'] != $group['g_id'] || $mode == 'add') && $cur_group['g_id'] != PUN_ADMIN && $cur_group['g_id'] != PUN_GUEST)
+ 	{
+ 		if ($cur_group['g_id'] == $group['g_promote_next_group'])
+ 			echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ 		else
+ 			echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ 	}
+ }
+ 
+ ?>
+ 										</select>
+ 										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo pun_htmlspecialchars($group['g_promote_min_posts']) ?>" tabindex="4" />
+ 										<span><?php printf($lang_admin_groups['Promote users help'], $lang_admin_groups['Disable promotion']) ?></span>
  									</td>
  								</tr>
+ <?php if ($mode != 'edit' || $pun_config['o_default_user_group'] != $group['g_id']): ?>								<tr>
  									<th scope="row"> <?php echo $lang_admin_groups['Mod privileges label'] ?></th>
  									<td>
+ 										<input type="radio" name="moderator" value="1"<?php if ($group['g_moderator'] == '1') echo ' checked="checked"' ?> tabindex="5" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="moderator" value="0"<?php if ($group['g_moderator'] == '0') echo ' checked="checked"' ?> tabindex="6" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Mod privileges help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Edit profile label'] ?></th>
  									<td>
+ 										<input type="radio" name="mod_edit_users" value="1"<?php if ($group['g_mod_edit_users'] == '1') echo ' checked="checked"' ?> tabindex="7" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_edit_users" value="0"<?php if ($group['g_mod_edit_users'] == '0') echo ' checked="checked"' ?> tabindex="8" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Edit profile help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Rename users label'] ?></th>
  									<td>
+ 										<input type="radio" name="mod_rename_users" value="1"<?php if ($group['g_mod_rename_users'] == '1') echo ' checked="checked"' ?> tabindex="9" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_rename_users" value="0"<?php if ($group['g_mod_rename_users'] == '0') echo ' checked="checked"' ?> tabindex="10" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Rename users help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Change passwords label'] ?></th>
  									<td>
+ 										<input type="radio" name="mod_change_passwords" value="1"<?php if ($group['g_mod_change_passwords'] == '1') echo ' checked="checked"' ?> tabindex="11" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_change_passwords" value="0"<?php if ($group['g_mod_change_passwords'] == '0') echo ' checked="checked"' ?> tabindex="12" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Change passwords help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Ban users label'] ?></th>
  									<td>
+ 										<input type="radio" name="mod_ban_users" value="1"<?php if ($group['g_mod_ban_users'] == '1') echo ' checked="checked"' ?> tabindex="13" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="mod_ban_users" value="0"<?php if ($group['g_mod_ban_users'] == '0') echo ' checked="checked"' ?> tabindex="14" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Ban users help'] ?></span>
  									</td>
  								</tr>
  <?php endif; endif; ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Read board label'] ?></th>
  									<td>
+ 										<input type="radio" name="read_board" value="1"<?php if ($group['g_read_board'] == '1') echo ' checked="checked"' ?> tabindex="15" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="read_board" value="0"<?php if ($group['g_read_board'] == '0') echo ' checked="checked"' ?> tabindex="16" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Read board help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['View user info label'] ?></th>
  									<td>
+ 										<input type="radio" name="view_users" value="1"<?php if ($group['g_view_users'] == '1') echo ' checked="checked"' ?> tabindex="17" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="view_users" value="0"<?php if ($group['g_view_users'] == '0') echo ' checked="checked"' ?> tabindex="18" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['View user info help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Post replies label'] ?></th>
  									<td>
+ 										<input type="radio" name="post_replies" value="1"<?php if ($group['g_post_replies'] == '1') echo ' checked="checked"' ?> tabindex="19" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="post_replies" value="0"<?php if ($group['g_post_replies'] == '0') echo ' checked="checked"' ?> tabindex="20" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Post replies help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Post topics label'] ?></th>
  									<td>
+ 										<input type="radio" name="post_topics" value="1"<?php if ($group['g_post_topics'] == '1') echo ' checked="checked"' ?> tabindex="21" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="post_topics" value="0"<?php if ($group['g_post_topics'] == '0') echo ' checked="checked"' ?> tabindex="22" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Post topics help'] ?></span>
  									</td>
  								</tr>
  <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Edit posts label'] ?></th>
  									<td>
+ 										<input type="radio" name="edit_posts" value="1"<?php if ($group['g_edit_posts'] == '1') echo ' checked="checked"' ?> tabindex="23" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="edit_posts" value="0"<?php if ($group['g_edit_posts'] == '0') echo ' checked="checked"' ?> tabindex="24" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Edit posts help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Delete posts label'] ?></th>
  									<td>
+ 										<input type="radio" name="delete_posts" value="1"<?php if ($group['g_delete_posts'] == '1') echo ' checked="checked"' ?> tabindex="25" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="delete_posts" value="0"<?php if ($group['g_delete_posts'] == '0') echo ' checked="checked"' ?> tabindex="26" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Delete posts help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Delete topics label'] ?></th>
  									<td>
+ 										<input type="radio" name="delete_topics" value="1"<?php if ($group['g_delete_topics'] == '1') echo ' checked="checked"' ?> tabindex="27" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="delete_topics" value="0"<?php if ($group['g_delete_topics'] == '0') echo ' checked="checked"' ?> tabindex="28" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Delete topics help'] ?></span>
  									</td>
  								</tr>
+ <?php endif; ?>								<tr>
+ 									<th scope="row"><?php echo $lang_admin_groups['Post links label'] ?></th>
+ 									<td>
+ 										<input type="radio" name="post_links" value="1"<?php if ($group['g_post_links'] == '1') echo ' checked="checked"' ?> tabindex="29" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="post_links" value="0"<?php if ($group['g_post_links'] == '0') echo ' checked="checked"' ?> tabindex="30" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
+ 										<span><?php echo $lang_admin_groups['Post links help'] ?></span>
+ 									</td>
+ 								</tr>
+ <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Set own title label'] ?></th>
  									<td>
+ 										<input type="radio" name="set_title" value="1"<?php if ($group['g_set_title'] == '1') echo ' checked="checked"' ?> tabindex="31" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="set_title" value="0"<?php if ($group['g_set_title'] == '0') echo ' checked="checked"' ?> tabindex="32" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Set own title help'] ?></span>
  									</td>
  								</tr>
  <?php endif; ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['User search label'] ?></th>
  									<td>
+ 										<input type="radio" name="search" value="1"<?php if ($group['g_search'] == '1') echo ' checked="checked"' ?> tabindex="33" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="search" value="0"<?php if ($group['g_search'] == '0') echo ' checked="checked"' ?> tabindex="34" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['User search help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['User list search label'] ?></th>
  									<td>
+ 										<input type="radio" name="search_users" value="1"<?php if ($group['g_search_users'] == '1') echo ' checked="checked"' ?> tabindex="35" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="search_users" value="0"<?php if ($group['g_search_users'] == '0') echo ' checked="checked"' ?> tabindex="36" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['User list search help'] ?></span>
  									</td>
  								</tr>
  <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Send e-mails label'] ?></th>
  									<td>
+ 										<input type="radio" name="send_email" value="1"<?php if ($group['g_send_email'] == '1') echo ' checked="checked"' ?> tabindex="37" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong>&#160;&#160;&#160;<input type="radio" name="send_email" value="0"<?php if ($group['g_send_email'] == '0') echo ' checked="checked"' ?> tabindex="38" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong>
  										<span><?php echo $lang_admin_groups['Send e-mails help'] ?></span>
  									</td>
  								</tr>
  <?php endif; ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Post flood label'] ?></th>
  									<td>
+ 										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['g_post_flood'] ?>" tabindex="39" />
  										<span><?php echo $lang_admin_groups['Post flood help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Search flood label'] ?></th>
  									<td>
+ 										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['g_search_flood'] ?>" tabindex="40" />
  										<span><?php echo $lang_admin_groups['Search flood help'] ?></span>
  									</td>
  								</tr>
  <?php if ($group['g_id'] != PUN_GUEST): ?>								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['E-mail flood label'] ?></th>
  									<td>
+ 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['g_email_flood'] ?>" tabindex="41" />
  										<span><?php echo $lang_admin_groups['E-mail flood help'] ?></span>
  									</td>
  								</tr>
  								<tr>
  									<th scope="row"><?php echo $lang_admin_groups['Report flood label'] ?></th>
  									<td>
+ 										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['g_report_flood'] ?>" tabindex="42" />
  										<span><?php echo $lang_admin_groups['Report flood help'] ?></span>
  									</td>
  								</tr>
***************
*** 258,263 ****
  
  	$title = pun_trim($_POST['req_title']);
  	$user_title = pun_trim($_POST['user_title']);
  	$moderator = isset($_POST['moderator']) && $_POST['moderator'] == '1' ? '1' : '0';
  	$mod_edit_users = $moderator == '1' && isset($_POST['mod_edit_users']) && $_POST['mod_edit_users'] == '1' ? '1' : '0';
  	$mod_rename_users = $moderator == '1' && isset($_POST['mod_rename_users']) && $_POST['mod_rename_users'] == '1' ? '1' : '0';
--- 290,305 ----
  
  	$title = pun_trim($_POST['req_title']);
  	$user_title = pun_trim($_POST['user_title']);
+ 
+ 	$promote_min_posts = isset($_POST['promote_min_posts']) ? intval($_POST['promote_min_posts']) : '0';
+ 	if (isset($_POST['promote_next_group']) &&
+ 			isset($groups[$_POST['promote_next_group']]) &&
+ 			!in_array($_POST['promote_next_group'], array(PUN_ADMIN, PUN_GUEST)) &&
+ 			(!isset($_POST['group_id']) || $_POST['promote_next_group'] != $_POST['group_id']))
+ 		$promote_next_group = $_POST['promote_next_group'];
+ 	else
+ 		$promote_next_group = '0';
+ 
  	$moderator = isset($_POST['moderator']) && $_POST['moderator'] == '1' ? '1' : '0';
  	$mod_edit_users = $moderator == '1' && isset($_POST['mod_edit_users']) && $_POST['mod_edit_users'] == '1' ? '1' : '0';
  	$mod_rename_users = $moderator == '1' && isset($_POST['mod_rename_users']) && $_POST['mod_rename_users'] == '1' ? '1' : '0';
***************
*** 284,290 ****
  		if ($db->num_rows($result))
  			message(sprintf($lang_admin_groups['Title already exists message'], pun_htmlspecialchars($title)));
  
- 		$db->query('INSERT INTO '.$db->prefix.'groups (g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES(\''.$db->escape($title).'\', '.$user_title.', '.$moderator.', '.$mod_edit_users.', '.$mod_rename_users.', '.$mod_change_passwords.', '.$mod_ban_users.', '.$read_board.', '.$view_users.', '.$post_replies.', '.$post_topics.', '.$edit_posts.', '.$delete_posts.', '.$delete_topics.', '.$set_title.', '.$search.', '.$search_users.', '.$send_email.', '.$post_flood.', '.$search_flood.', '.$email_flood.', '.$report_flood.')') or error('Unable to add group', __FILE__, __LINE__, $db->error());
  		$new_group_id = $db->insert_id();
  
  		// Now lets copy the forum specific permissions from the group which this group is based on
--- 327,333 ----
  		if ($db->num_rows($result))
  			message(sprintf($lang_admin_groups['Title already exists message'], pun_htmlspecialchars($title)));
  
+ 		$db->query('INSERT INTO '.$db->prefix.'groups (g_title, g_user_title, g_promote_min_posts, g_promote_next_group, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_post_links, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES(\''.$db->escape($title).'\', '.$user_title.', '.$promote_min_posts.', '.$promote_next_group.', '.$moderator.', '.$mod_edit_users.', '.$mod_rename_users.', '.$mod_change_passwords.', '.$mod_ban_users.', '.$read_board.', '.$view_users.', '.$post_replies.', '.$post_topics.', '.$edit_posts.', '.$delete_posts.', '.$delete_topics.', '.$post_links.', '.$set_title.', '.$search.', '.$search_users.', '.$send_email.', '.$post_flood.', '.$search_flood.', '.$email_flood.', '.$report_flood.')') or error('Unable to add group', __FILE__, __LINE__, $db->error());
  		$new_group_id = $db->insert_id();
  
  		// Now lets copy the forum specific permissions from the group which this group is based on
***************
*** 298,304 ****
  		if ($db->num_rows($result))
  			message(sprintf($lang_admin_groups['Title already exists message'], pun_htmlspecialchars($title)));
  
- 		$db->query('UPDATE '.$db->prefix.'groups SET g_title=\''.$db->escape($title).'\', g_user_title='.$user_title.', g_moderator='.$moderator.', g_mod_edit_users='.$mod_edit_users.', g_mod_rename_users='.$mod_rename_users.', g_mod_change_passwords='.$mod_change_passwords.', g_mod_ban_users='.$mod_ban_users.', g_read_board='.$read_board.', g_view_users='.$view_users.', g_post_replies='.$post_replies.', g_post_topics='.$post_topics.', g_edit_posts='.$edit_posts.', g_delete_posts='.$delete_posts.', g_delete_topics='.$delete_topics.', g_set_title='.$set_title.', g_search='.$search.', g_search_users='.$search_users.', g_send_email='.$send_email.', g_post_flood='.$post_flood.', g_search_flood='.$search_flood.', g_email_flood='.$email_flood.', g_report_flood='.$report_flood.' WHERE g_id='.intval($_POST['group_id'])) or error('Unable to update group', __FILE__, __LINE__, $db->error());
  	}
  
  	// Regenerate the quick jump cache
--- 341,347 ----
  		if ($db->num_rows($result))
  			message(sprintf($lang_admin_groups['Title already exists message'], pun_htmlspecialchars($title)));
  
+ 		$db->query('UPDATE '.$db->prefix.'groups SET g_title=\''.$db->escape($title).'\', g_user_title='.$user_title.', g_promote_min_posts='.$promote_min_posts.', g_promote_next_group='.$promote_next_group.', g_moderator='.$moderator.', g_mod_edit_users='.$mod_edit_users.', g_mod_rename_users='.$mod_rename_users.', g_mod_change_passwords='.$mod_change_passwords.', g_mod_ban_users='.$mod_ban_users.', g_read_board='.$read_board.', g_view_users='.$view_users.', g_post_replies='.$post_replies.', g_post_topics='.$post_topics.', g_edit_posts='.$edit_posts.', g_delete_posts='.$delete_posts.', g_delete_topics='.$delete_topics.', g_post_links='.$post_links.', g_set_title='.$set_title.', g_search='.$search.', g_search_users='.$search_users.', g_send_email='.$send_email.', g_post_flood='.$post_flood.', g_search_flood='.$search_flood.', g_email_flood='.$email_flood.', g_report_flood='.$report_flood.' WHERE g_id='.intval($_POST['group_id'])) or error('Unable to update group', __FILE__, __LINE__, $db->error());
  	}
  
  	// Regenerate the quick jump cache

edit.php.rej:

***************
*** 11,27 ****
  
  
  if ($pun_user['g_read_board'] == '0')
- 	message($lang_common['No view']);
  
  
  $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
  if ($id < 1)
- 	message($lang_common['Bad request']);
  
  // Fetch some info about the post, the topic and the forum
  $result = $db->query('SELECT f.id AS fid, f.forum_name, f.moderators, f.redirect_url, fp.post_replies, fp.post_topics, t.id AS tid, t.subject, t.posted, t.first_post_id, t.sticky, t.closed, p.poster, p.poster_id, p.message, p.hide_smilies FROM '.$db->prefix.'posts AS p INNER JOIN '.$db->prefix.'topics AS t ON t.id=p.topic_id INNER JOIN '.$db->prefix.'forums AS f ON f.id=t.forum_id LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND p.id='.$id) or error('Unable to fetch post info', __FILE__, __LINE__, $db->error());
  if (!$db->num_rows($result))
- 	message($lang_common['Bad request']);
  
  $cur_post = $db->fetch_assoc($result);
  
--- 11,27 ----
  
  
  if ($pun_user['g_read_board'] == '0')
+ 	message($lang_common['No view'], false, '403 Forbidden');
  
  
  $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
  if ($id < 1)
+ 	message($lang_common['Bad request'], false, '404 Not Found');
  
  // Fetch some info about the post, the topic and the forum
  $result = $db->query('SELECT f.id AS fid, f.forum_name, f.moderators, f.redirect_url, fp.post_replies, fp.post_topics, t.id AS tid, t.subject, t.posted, t.first_post_id, t.sticky, t.closed, p.poster, p.poster_id, p.message, p.hide_smilies FROM '.$db->prefix.'posts AS p INNER JOIN '.$db->prefix.'topics AS t ON t.id=p.topic_id INNER JOIN '.$db->prefix.'forums AS f ON f.id=t.forum_id LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND p.id='.$id) or error('Unable to fetch post info', __FILE__, __LINE__, $db->error());
  if (!$db->num_rows($result))
+ 	message($lang_common['Bad request'], false, '404 Not Found');
  
  $cur_post = $db->fetch_assoc($result);
  

Offline

#6 2013-01-16 15:21:23

padagrad
Member
Registered: 2013-01-08
Posts: 21

Re: Patch does not apply fully

No one knows?

Offline

#7 2013-01-17 12:46:55

seven
Member
From: Torino, Italy
Registered: 2010-08-19
Posts: 138
Website

Re: Patch does not apply fully

Check if the files are writable by the user you're using to patch them.

If you don't have an idea of what's going on, you can patch manually the files that didn't succeed.

The first section of those files (beginning with *** number, number ***) is the old code.

The second section (beginning with --- number, number ---) is the new code.

You olny have to replace the lines marked with a minus (-) in the old code with the lines marked with a plus (+) in the new code.

Don't make any mistakes smile

Cheers,

7


gamezoo.org - serious gaming services for serious gamers.

Offline

#8 2013-01-18 18:26:59

padagrad
Member
Registered: 2013-01-08
Posts: 21

Re: Patch does not apply fully

Thanks, seven.

So what do I do with *** 258,263 **** in admin_groups? There's neither - nor + before.

Offline

#9 2013-01-19 16:39:48

padagrad
Member
Registered: 2013-01-08
Posts: 21

Re: Patch does not apply fully

Ok, I patched them manually. Now when I uploaded the files and try to open my forum, I get the db update script telling me this:

Error: Your forum is already as up-to-date as this script can make it.

This is probably because the DB was made with 1.5.1, but the files are 1.5.0.

Is there a way to get around this?

Last edited by padagrad (2013-01-19 16:41:10)

Offline

#10 2013-01-19 22:08:05

seven
Member
From: Torino, Italy
Registered: 2010-08-19
Posts: 138
Website

Re: Patch does not apply fully

That's strange a database later than the files... anyways the database holds its revision in the configuration table. Check the number with the one in the update script. If they are the same, clear the cache directory.

Another thing. Testing changes in a virtual machine with a database dump before going into production helps a lot!

Last edited by seven (2013-01-19 22:11:23)


gamezoo.org - serious gaming services for serious gamers.

Offline

#11 2013-01-20 11:27:31

padagrad
Member
Registered: 2013-01-08
Posts: 21

Re: Patch does not apply fully

Thanks, seven, it worked big_smile

It's so nice when someone tells you what to do smile

Offline

Board footer

Powered by FluxBB 1.5.6