Changeset 5 for branches/portal_by_daris/admin

Timestamp:

02/07/09 08:33:30 (3 years ago)

Author:

daris

Message:

portal: language files review

Location:

branches/portal_by_daris/admin

Files:

• pages.php (modified) (1 diff)
• panels.php (modified) (22 diffs)
• portal.php (modified) (1 diff)

branches/portal_by_daris/admin/pages.php

@@ -1 +1 @@
 <?php
-/**
- * Forum management page
- *
- * Allows administrators to add, modify, and remove forums.
- *
- * @copyright Copyright (C) 2008 FluxBB.org, based on code copyright (C) 2002-2008 PunBB.org
- * @license http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- * @package FluxBB
- */
+/***********************************************************************
+
+        PunBB extension
+        Portal
+        Daris <daris91@gmail.com>
+
+************************************************************************/
 
 

branches/portal_by_daris/admin/panels.php

@@ -1 +1 @@
 <?php
-/**
- * Forum management page.
- *
- * Allows administrators to add, modify, and remove forums.
- *
- * @copyright Copyright (C) 2008 PunBB, partially based on code copyright (C) 2008 FluxBB.org
- * @license http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- * @package PunBB
- */
+/***********************************************************************
+
+        PunBB extension
+        Portal
+        Daris <daris91@gmail.com>
+
+************************************************************************/
 
 
 if (!defined('FORUM_ROOT'))
-        define('FORUM_ROOT', '../../..//');
+        define('FORUM_ROOT', '../../../');
 require FORUM_ROOT.'include/common.php';
 require FORUM_ROOT.'include/common_admin.php';
@@ -33 +31 @@
 require PORTAL_ROOT.'include/functions.php';
 
-$side_names = array(
+$location_names = array(
         0 => 'Left side',
         1 => 'Center top',
@@ -43 +41 @@
 if (isset($_POST['add_panel']))
 {
-        $panel_title = forum_trim($_POST['title']);
-        $side = intval($_POST['side']);
+        $panel_name = forum_trim($_POST['name']);
+        $location = intval($_POST['location']);
         $file = $_POST['file'];
         $position = intval($_POST['position']);
@@ -50 +48 @@
         ($hook = get_hook('afo_add_forum_form_submitted')) ? eval($hook) : null;
 
-        if ($panel_title == '')
+        if ($panel_name == '')
                 message($lang_admin_panels['Must enter forum message']);
 
         $query = array(
-                'INSERT'        => 'title, side, file, position',
+                'INSERT'        => 'name, location, file, position',
                 'INTO'          => 'panels',
-                'VALUES'        => '\''.$forum_db->escape($panel_title).'\', '.$side.', \''.$forum_db->escape($file).'\', '.$position
+                'VALUES'        => '\''.$forum_db->escape($panel_name).'\', '.$location.', \''.$forum_db->escape($file).'\', '.$position
         );
 
@@ -112 +110 @@
         {
                 $query = array(
-                        'SELECT'        => 'pn.title',
+                        'SELECT'        => 'pn.name',
                         'FROM'          => 'panels AS pn',
                         'WHERE'         => 'pn.id='.$panel_to_delete
@@ -122 +120 @@
                         message($lang_common['Bad request']);
 
-                $panel_title = $forum_db->result($result);
+                $panel_name = $forum_db->result($result);
 
 
@@ -130 +128 @@
                         array($lang_admin_common['Forum administration'], forum_link($forum_url['admin_index'])),
                         array($lang_admin_common['Start'], forum_link($forum_url['admin_index'])),
-                        array($lang_admin_common['Forums'], forum_link($forum_url['admin_panels'])),
+                        array($lang_admin_panels['Panels'], forum_link($forum_url['admin_panels'])),
                         $lang_admin_panels['Delete panel']
                 );
@@ -147 +145 @@
 ?>
         <div class="main-subhead">
-                <h2 class="hn"><span><?php printf($lang_admin_panels['Confirm delete panel'], forum_htmlencode($panel_title)) ?></span></h2>
+                <h2 class="hn"><span><?php printf($lang_admin_panels['Confirm delete panel'], forum_htmlencode($panel_name)) ?></span></h2>
         </div>
         <div class="main-content main-frm">
@@ -242 +240 @@
                 ($hook = get_hook('xn_portal_by_daris_apn_save_panel_form_submitted')) ? eval($hook) : null;
 
-                $title = trim($_POST['title']);
+                $name = trim($_POST['name']);
                 $content = forum_linebreaks(trim($_POST['content']));
-                $side = intval($_POST['side']);
+                $location = intval($_POST['location']);
                 $file = trim($_POST['file']);
 
@@ -253 +251 @@
                 $query = array(
                         'UPDATE'        => 'panels',
-                        'SET'           => 'title=\''.$forum_db->escape($title).'\', content=\''.$forum_db->escape($content).'\', file=\''.$forum_db->escape($file).'\', side='.$side,
+                        'SET'           => 'name=\''.$forum_db->escape($name).'\', content=\''.$forum_db->escape($content).'\', file=\''.$forum_db->escape($file).'\', location='.$location,
                         'WHERE'         => 'id='.$panel_id
                 );
@@ -269 +267 @@
         // Fetch panel info
         $query = array(
-                'SELECT'        => 'pn.id, pn.title, pn.content, pn.file, pn.side',
+                'SELECT'        => 'pn.id, pn.name, pn.content, pn.file, pn.location',
                 'FROM'          => 'panels AS pn',
                 'WHERE'         => 'pn.id='.$panel_id
@@ -306 +304 @@
 ?>
         <div class="main-subhead">
-                <h2 class="hn"><span><?php printf($lang_admin_panels['Edit panel head'], forum_htmlencode($cur_panel['title'])) ?></span></h2>
+                <h2 class="hn"><span><?php printf($lang_admin_panels['Edit panel head'], forum_htmlencode($cur_panel['name'])) ?></span></h2>
         </div>
         <div class="main-content main-frm">
@@ -322 +320 @@
                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
                                         <div class="sf-box text">
-                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_panels['Panel name'] ?></span></label><br />
-                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="title" size="35" value="<?php echo forum_htmlencode($cur_panel['title']) ?>" /></span>
+                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_panels['Panel name'] ?></span> <small><?php echo $lang_admin_panels['Panel name help'] ?></small></label><br />
+                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="name" size="50" value="<?php echo forum_htmlencode($cur_panel['name']) ?>" /></span>
                                         </div>
                                 </div>
@@ -338 +336 @@
                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
                                         <div class="sf-box select">
-                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_panels['Panel side'] ?></span></label><br />
-                                                <span class="fld-input"><select id="fld<?php echo $forum_page['fld_count'] ?>" name="side">
-<?php
-        foreach ($side_names as $side => $name)
-                echo '<option value="'.$side.'"'.($cur_panel['side'] == $side ? ' selected="selected"' : '').'>'.$lang_admin_panels[$name].'</option>';
+                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_panels['Panel location'] ?></span></label><br />
+                                                <span class="fld-input"><select id="fld<?php echo $forum_page['fld_count'] ?>" name="location">
+<?php
+        foreach ($location_names as $location => $name)
+                echo '<option value="'.$location.'"'.($cur_panel['location'] == $location ? ' selected="selected"' : '').'>'.$lang_admin_panels[$name].'</option>';
 ?>
                                                 </select></span>
@@ -382 +380 @@
         array($lang_admin_common['Forum administration'], forum_link($forum_url['admin_index'])),
         array($lang_admin_common['Start'], forum_link($forum_url['admin_index'])),
-        array($lang_admin_common['Forums'], forum_link($forum_url['admin_panels']))
+        array($lang_admin_panels['Panels'], forum_link($forum_url['admin_panels']))
 );
 
@@ -412 +410 @@
                                         <div class="sf-box text">
                                                 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_panels['Panel name'] ?></span></label><br />
-                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="title" size="35" maxlength="80" /></span>
+                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="name" size="50" /></span>
                                         </div>
                                 </div>
@@ -418 +416 @@
                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
                                         <div class="sf-box select">
-                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_panels['Panel side'] ?></span></label><br />
-                                                <span class="fld-input"><select id="fld<?php echo $forum_page['fld_count'] ?>" name="side">
-<?php
-        foreach ($side_names as $side => $name)
-                echo '<option value="'.$side.'">'.$lang_admin_panels[$name].'</option>';
+                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_panels['Panel location'] ?></span></label><br />
+                                                <span class="fld-input"><select id="fld<?php echo $forum_page['fld_count'] ?>" name="location">
+<?php
+        foreach ($location_names as $location => $name)
+                echo '<option value="'.$location.'">'.$lang_admin_panels[$name].'</option>';
 ?>
                                                 </select></span>
@@ -449 +447 @@
 // Display all the panels
 $query = array(
-        'SELECT'        => 'pn.id, pn.title, pn.content, pn.position, pn.side, pn.enable, pn.file',
+        'SELECT'        => 'pn.id, pn.name, pn.content, pn.position, pn.location, pn.enable, pn.file',
         'FROM'          => 'panels AS pn',
-        'ORDER BY'      => 'pn.side, pn.position'
+        'ORDER BY'      => 'pn.location, pn.position'
 );
 
@@ -481 +479 @@
         {
 
-                if ($cur_panel['side'] != $cur_category)        // A new category since last iteration?
+                if ($cur_panel['location'] != $cur_category)    // A new category since last iteration?
                 {
                         if ($i > 2) echo "\t\t\t".'</div>'."\n";
@@ -488 +486 @@
 ?>
                         <div class="content-head">
-                                <h3 class="hn"><span><?php printf($lang_admin_panels['Panels for'], $lang_admin_panels[$side_names[$cur_panel['side']]]) ?></span></h3>
+                                <h3 class="hn"><span><?php printf($lang_admin_panels['Panels for'], $lang_admin_panels[$location_names[$cur_panel['location']]]) ?></span></h3>
                         </div>
                         <div class="frm-group frm-hdgroup group<?php echo ++$forum_page['group_count'] ?>">
@@ -494 +492 @@
 <?php
 
-                        $cur_category = $cur_panel['side'];
+                        $cur_category = $cur_panel['location'];
                 }
 
@@ -506 +504 @@
                                                 <div class="mf-field mf-field1 forum-field">
                                                         <span class="aslabel"><?php echo $lang_admin_panels['Panel name'] ?></span>
-                                                        <span class="fld-input"><?php echo forum_htmlencode($cur_panel['title']) ?></span>
+                                                        <span class="fld-input"><?php echo forum_htmlencode($cur_panel['name']) ?></span>
                                                 </div>
 <?php ($hook = get_hook('afo_pre_edit_cur_forum_position')) ? eval($hook) : null; ?>

branches/portal_by_daris/admin/portal.php

@@ -2 +2 @@
 /***********************************************************************
 
-        FluxBB extension
+        PunBB extension
         Portal
         Daris <daris91@gmail.com>