"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Upload/admin/inc/functions.php" between
mybb_1821.zip and mybb_1822.zip

About: MyBB is a multilingual, standards-compliant and free forum (discussion board) software.

functions.php  (mybb_1821):functions.php  (mybb_1822)
skipping to change at line 209 skipping to change at line 209
$query = $db->simple_select("forums", "name, fid, pid", "", array ("order_by" => "disporder, pid")); $query = $db->simple_select("forums", "name, fid, pid", "", array ("order_by" => "disporder, pid"));
while($forum = $db->fetch_array($query)) while($forum = $db->fetch_array($query))
{ {
$pforumcache[$forum['fid']][$forum['pid']] = $forum; $pforumcache[$forum['fid']][$forum['pid']] = $forum;
} }
} }
reset($pforumcache); reset($pforumcache);
reset($pforumcache[$fid]); reset($pforumcache[$fid]);
$navigation = '';
foreach($pforumcache[$fid] as $key => $forum) foreach($pforumcache[$fid] as $key => $forum)
{ {
if($fid == $forum['fid']) if($fid == $forum['fid'])
{ {
if($pforumcache[$forum['pid']]) if($pforumcache[$forum['pid']])
{ {
$navigation = make_parent_list($forum['pid'], $na vsep).$navigation; $navigation = make_parent_list($forum['pid'], $na vsep).$navigation;
} }
if($navigation) if($navigation)
skipping to change at line 831 skipping to change at line 833
} }
elseif(is_object($val) && isset($val->$column_key)) elseif(is_object($val) && isset($val->$column_key))
{ {
$values[] = $val->$column_key; $values[] = $val->$column_key;
} }
} }
return $values; return $values;
} }
} }
/**
* Output the auto redirect block.
*
* @param \Form $form An existing form instance to wrap the redirect within.
* @param string $prompt The prompt to show.
*/
function output_auto_redirect($form, $prompt)
{
global $lang;
echo <<<HTML
<div class="confirm_action">
<p>{$prompt}</p>
<br />
<script type="text/javascript">
$(function() {
var button = $("#proceed_button");
if (button.length > 0) {
// create a temporary div element to render the t
ext within, un-escaping HTML entities
var textElement = $('<div/>').html('{$lang->autom
atically_redirecting}');
button.val(textElement.text());
button.attr("disabled", true);
button.css("color", "#aaa");
button.css("borderColor", "#aaa");
var parent_form = button.closest('form');
if (parent_form.length > 0) {
parent_form.submit();
}
}
});
</script>
<p class="buttons">
{$form->generate_submit_button($lang->proceed, array('class' => '
button_yes', 'id' => 'proceed_button'))}
</p>
</div>
HTML;
}
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)