Skip to content

Commit 159af5d

Browse files
beaver-devbeaver-dev
committed
Complete urlFor in all files
Except in extern.php file : it will probably be moved into the « API » controller, and optionally another for feeds.
1 parent e83d76b commit 159af5d

File tree

12 files changed

+32
-32
lines changed

12 files changed

+32
-32
lines changed

‎style/themes/FeatherBB/view/profile/section_messaging.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="blockform">
2020
<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
2121
<div class="box">
22-
<form id="profile3" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('user/'.$id.'/section/messaging/') ?>">
22+
<form id="profile3" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'messaging']) ?>">
2323
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
2424
<div class="inform">
2525
<fieldset>
@@ -39,4 +39,4 @@
3939
</div>
4040
</div>
4141
<div class="clearer"></div>
42-
</div>
42+
</div>

‎style/themes/FeatherBB/view/profile/section_personal.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="blockform">
2020
<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
2121
<div class="box">
22-
<form id="profile2" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('user/'.$id.'/section/personal/') ?>">
22+
<form id="profile2" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'personal']) ?>">
2323
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
2424
<div class="inform">
2525
<fieldset>
@@ -39,4 +39,4 @@
3939
</div>
4040
</div>
4141
<div class="clearer"></div>
42-
</div>
42+
</div>

‎style/themes/FeatherBB/view/profile/section_personality.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="blockform">
2020
<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
2121
<div class="box">
22-
<form id="profile4" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('user/'.$id.'/section/personality/') ?>">
22+
<form id="profile4" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'personality']) ?>">
2323
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
2424
<div><input type="hidden" name="form_sent" value="1" /></div>
2525
<?php if ($feather->forum_settings['o_avatars'] == '1'): ?> <div class="inform">
@@ -42,10 +42,10 @@
4242
<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
4343
</div>
4444
<ul class="bblinks">
45-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
46-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
47-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
48-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
45+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#bbcode' ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
46+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#url' ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
47+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#img' ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
48+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#smilies' ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
4949
</ul>
5050
<?php echo $signature_preview ?>
5151
</div>

‎style/themes/FeatherBB/view/profile/section_privacy.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="blockform">
2020
<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
2121
<div class="box">
22-
<form id="profile6" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('user/'.$id.'/section/privacy/') ?>">
22+
<form id="profile6" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'privacy']) ?>">
2323
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
2424
<div class="inform">
2525
<fieldset>
@@ -62,4 +62,4 @@
6262
</div>
6363
</div>
6464
<div class="clearer"></div>
65-
</div>
65+
</div>

‎style/themes/FeatherBB/view/profile/upload_avatar.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="blockform">
2020
<h2><span><?php _e('Upload avatar') ?></span></h2>
2121
<div class="box">
22-
<form id="upload_avatar" method="post" enctype="multipart/form-data" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
22+
<form id="upload_avatar" method="post" enctype="multipart/form-data" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('profileAction', ['id' => $id, 'action' => 'upload_avatar2']) ?>" onsubmit="return process_form(this)">
2323
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
2424
<div class="inform">
2525
<fieldset>

‎style/themes/FeatherBB/view/register/rules.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div id="rules" class="blockform">
2020
<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
2121
<div class="box">
22-
<form method="get" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('register/') ?>">
22+
<form method="get" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('register') ?>">
2323
<div class="inform">
2424
<fieldset>
2525
<legend><?php _e('Rules legend') ?></legend>
@@ -31,4 +31,4 @@
3131
<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
3232
</form>
3333
</div>
34-
</div>
34+
</div>

‎style/themes/FeatherBB/view/search/footer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
</div>
3434
<ul class="crumbs">
3535
<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
36-
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
36+
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('search') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
3737
<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
3838
</ul>
3939
<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
4040
<div class="clearer"></div>
4141
</div>
42-
</div>
42+
</div>

‎style/themes/FeatherBB/view/search/header.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="inbox crumbsplus">
2020
<ul class="crumbs">
2121
<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
22-
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
22+
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('search') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
2323
<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
2424
</ul>
2525
<div class="pagepost">

‎style/themes/FeatherBB/view/search/posts.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
} ?>">
2626
<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
2727
_e('Re').' ';
28-
} ?><?php echo $forum ?></span> <span>»&#160;<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
28+
} ?><?php echo $forum ?></span> <span>»&#160;<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('Topic', ['id' => $cur_search['tid'], 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
2929
<div class="box">
3030
<div class="inbox">
3131
<div class="postbody">
@@ -49,7 +49,7 @@
4949
<div class="postfoot clearb">
5050
<div class="postfootright">
5151
<ul>
52-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
52+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('Topic', ['id' => $cur_search['tid'], 'name' => $url_topic]) ?>"><?php _e('Go to topic') ?></a></span></li>
5353
<li><span><a href="<?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php _e('Go to post') ?></a></span></li>
5454
</ul>
5555
</div>

‎style/themes/FeatherBB/view/topic.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<div class="inbox crumbsplus">
2222
<ul class="crumbs">
2323
<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
24-
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
25-
<li><span>»&#160;</span><strong><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
24+
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('Forum', ['id' => $cur_topic['forum_id'], 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
25+
<li><span>»&#160;</span><strong><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('Topic', ['id' => $id, 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
2626
</ul>
2727
<div class="pagepost">
2828
<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -111,8 +111,8 @@
111111
</div>
112112
<ul class="crumbs">
113113
<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
114-
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
115-
<li><span>»&#160;</span><strong><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
114+
<li><span>»&#160;</span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('Forum', ['id' => $cur_topic['forum_id'], 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
115+
<li><span>»&#160;</span><strong><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('Topic', ['id' => $id, 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
116116
</ul>
117117
<?php echo $subscraction ?>
118118
<div class="clearer"></div>
@@ -129,7 +129,7 @@
129129
<div id="quickpost" class="blockform">
130130
<h2><span><?php _e('Quick post') ?></span></h2>
131131
<div class="box">
132-
<form id="quickpostform" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
132+
<form id="quickpostform" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('newReply', ['tid' => $id]) ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
133133
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
134134
<div class="inform">
135135
<fieldset>
@@ -166,13 +166,13 @@
166166

167167
<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
168168
<ul class="bblinks">
169-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
169+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#bbcode' ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
170170
?></span></li>
171-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
171+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#url' ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
172172
?></span></li>
173-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
173+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#img' ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
174174
?></span></li>
175-
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
175+
<li><span><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $feather->urlFor('help').'#smilies' ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
176176
?></span></li>
177177
</ul>
178178
</div>

0 commit comments

Comments
 (0)