Changeset 1167 in ExiteCMS

Timestamp:

12/11/07 23:51:14 (4 years ago)

Author:

hverton

Message:

fixed an error displaying the forum rules
added the locale code to the image buttons in site_links

Location:

trunk

Files:

• forum/viewforum.php (modified) (2 diffs)
• includes/templates/admin.site_links.tpl (modified) (1 diff)
• includes/templates/forum.viewforum.tpl (modified) (1 diff)

trunk/forum/viewforum.php

@@ -63 +63 @@
 $variables['forum'] = $data;
 
-// if a forum rules custompage is given, check if it exists
-$result2 = dbquery("SELECT page_title FROM ".$db_prefix."custom_pages WHERE page_id = '".$data['forum_rulespage']."'");
-if (!$result2) {
-    $data['rulespage_defined'] = false;
-} else {
-    $data['rulespage_defined'] = true;
-    $data2 = dbarray($result2);
-    $data['forum_rulestitle'] = $data2['page_title'];
-}
-
 // bail out if the user doesn't have access to this forum, or requested a forum category ID
 if (!checkgroup($data['forum_access']) || !$data['forum_cat']) {
@@ -78 +68 @@
 }
 
+// if a forum rules custompage is given, check if it exists
+$variables['rulespage_defined'] = false;
+if ($data['forum_rulespage']) {
+    $result2 = dbquery("SELECT page_title FROM ".$db_prefix."custom_pages WHERE page_id = '".$data['forum_rulespage']."'");
+    if (dbrows($result2)) {
+        $variables['rulespage_defined'] = true;
+        $data2 = dbarray($result2);
+        $variables['forum_rulestitle'] = $data2['page_title'];
+    }
+}
 // check if the user is allowed to post in this forum
 $can_post = checkgroup($data['forum_posting']);

trunk/includes/templates/admin.site_links.tpl

@@ -182 +182 @@
                 {if $panels[id].panel_count != 1}
                     {if !$panels[id].links[id2].menu_first}
-                        {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&action=move&swap="|cat:$panels[id].links[id2].up|cat:"&with="|cat:$panels[id].links[id2].link_id|cat:"&panel="|cat:$panels[id].panel image="up.gif" alt=$locale.440 title=$locale.440}
+                        {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&action=move&swap="|cat:$panels[id].links[id2].up|cat:"&with="|cat:$panels[id].links[id2].link_id|cat:"&panel="|cat:$panels[id].panel|cat:$url_locale image="up.gif" alt=$locale.440 title=$locale.440}
                     {/if}
                     {if !$panels[id].links[id2].menu_last}
-                        {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&action=move&swap="|cat:$panels[id].links[id2].down|cat:"&with="|cat:$panels[id].links[id2].link_id|cat:"&panel="|cat:$panels[id].panel image="down.gif" alt=$locale.443 title=$locale.443}
+                        {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&action=move&swap="|cat:$panels[id].links[id2].down|cat:"&with="|cat:$panels[id].links[id2].link_id|cat:"&panel="|cat:$panels[id].panel|cat:$url_locale image="down.gif" alt=$locale.443 title=$locale.443}
                     {/if}
                 {/if}
                 </td>
                 <td align='center' width='1%' class='tbl1' style='white-space:nowrap'>
-                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;action=edit&amp;link_id="|cat:$panels[id].links[id2].link_id|cat:"&amp;panel="|cat:$panels[id].panel image="page_edit.gif" alt=$locale.434 title=$locale.434}
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;action=edit&amp;link_id="|cat:$panels[id].links[id2].link_id|cat:"&amp;panel="|cat:$panels[id].panel|cat:$url_locale image="page_edit.gif" alt=$locale.434 title=$locale.434}
                     &nbsp;
-                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;action=delete&amp;link_id="|cat:$panels[id].links[id2].link_id|cat:"&amp;panel="|cat:$panels[id].panel image="page_delete.gif" alt=$locale.435 title=$locale.435}
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;action=delete&amp;link_id="|cat:$panels[id].links[id2].link_id|cat:"&amp;panel="|cat:$panels[id].panel|cat:$url_locale image="page_delete.gif" alt=$locale.435 title=$locale.435}
                 </td>
             </tr>

trunk/includes/templates/forum.viewforum.tpl

@@ -53 +53 @@
                 <tr>
                     <td colspan='7' class='tbl2' align='center'>
-                        <img src='{$smarty.const.THEME}images/bullet.gif' alt='' />&nbsp;<a class='tbl_top_mid' href='/viewpage.php?page_id={$forum.forum_rulespage}'>{$forum.forum_rulestitle}</a>&nbsp;<img src='{$smarty.const.THEME}images/bulletb.gif' alt='' />
+                        <img src='{$smarty.const.THEME}images/bullet.gif' alt='' />&nbsp;<a class='tbl_top_mid' href='/viewpage.php?page_id={$forum.forum_rulespage}'>{$forum_rulestitle}</a>&nbsp;<img src='{$smarty.const.THEME}images/bulletb.gif' alt='' />
                     </td>
                 </tr>