Changeset 4 for branches

Timestamp:

02/07/09 07:44:07 (3 years ago)

Author:

daris

Message:

portal: removing position field from pages db

Location:

branches/portal_by_daris

Files:

• admin/pages.php (modified) (7 diffs)
• install.php (modified) (2 diffs)
• lang/English/admin_pages.php (modified) (2 diffs)

branches/portal_by_daris/admin/pages.php

@@ -36 +36 @@
 {
         $page_title = forum_trim($_POST['page_title']);
-        $position = intval($_POST['position']);
 
         ($hook = get_hook('afo_add_forum_form_submitted')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -44 +43 @@
 
         $query = array(
-                'INSERT'        => 'title, position',
+                'INSERT'        => 'title',
                 'INTO'          => 'pages',
-                'VALUES'        => '\''.$forum_db->escape($page_title).'\', '.$position
+                'VALUES'        => '\''.$forum_db->escape($page_title).'\''
         );
 
@@ -152 +151 @@
                 require FORUM_ROOT.'footer.php';
         }
-}
-
-
-// Update forum positions
-else if (isset($_POST['update_positions']))
-{
-        $positions = array_map('intval', $_POST['position']);
-
-        ($hook = get_hook('afo_update_positions_form_submitted')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-
-        $query = array(
-                'SELECT'        => 'f.id, f.disp_position',
-                'FROM'          => 'categories AS c',
-                'JOINS'         => array(
-                        array(
-                                'INNER JOIN'    => 'forums AS f',
-                                'ON'                    => 'c.id=f.cat_id'
-                        )
-                ),
-                'ORDER BY'      => 'c.disp_position, c.id, f.disp_position'
-        );
-
-        ($hook = get_hook('afo_update_positions_qr_get_forums')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
-        while ($cur_page = $forum_db->fetch_assoc($result))
-        {
-                // If these aren't set, we're looking at a forum that was added after
-                // the admin started editing: we don't want to mess with it
-                if (isset($positions[$cur_page['id']]))
-                {
-                        $new_disp_position = $positions[$cur_page['id']];
-
-                        if ($new_disp_position < 0)
-                                message($lang_admin_pages['Must be integer']);
-
-                        // We only want to update if we changed the position
-                        if ($cur_page['disp_position'] != $new_disp_position)
-                        {
-                                $query = array(
-                                        'UPDATE'        => 'forums',
-                                        'SET'           => 'disp_position='.$new_disp_position,
-                                        'WHERE'         => 'id='.$cur_page['id']
-                                );
-
-                                ($hook = get_hook('afo_update_positions_qr_update_forum_position')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-                                $forum_db->query_build($query) or error(__FILE__, __LINE__);
-                        }
-                }
-        }
-
-        // Regenerate the quickjump cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
-                require FORUM_ROOT.'include/cache.php';
-
-        generate_quickjump_cache();
-
-        ($hook = get_hook('afo_update_positions_pre_redirect')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-
-        redirect(forum_link($forum_url['admin_pages']), $lang_admin_pages['Forums updated'].' '.$lang_admin_common['Redirect']);
 }
 
@@ -382 +322 @@
                                         </div>
                                 </div>
-<?php ($hook = get_hook('afo_pre_new_forum_position')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                <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_pages['Position label'] ?></span></label><br />
-                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="position" size="3" maxlength="3" /></span>
-                                        </div>
-                                </div>
 <?php ($hook = get_hook('afo_pre_add_forum_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                         </fieldset>
@@ -402 +335 @@
 // Display all the categories and forums
 $query = array(
-        'SELECT'        => 'pg.id, pg.title, pg.position',
-        'FROM'          => 'pages AS pg',
-        'ORDER BY'      => 'pg.position'
+        'SELECT'        => 'pg.id, pg.title',
+        'FROM'          => 'pages AS pg'
 );
 
@@ -446 +378 @@
 <?php ($hook = get_hook('afo_pre_edit_cur_page_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                                                 <div class="mf-field mf-field1 forum-field">
-                                                        <span class="aslabel">Forum name:</span>
+                                                        <span class="aslabel"><?php echo $lang_admin_pages['Page name'] ?></span>
                                                         <span class="fld-input"><?php echo forum_htmlencode($cur_page['title']) ?></span>
-                                                </div>
-<?php ($hook = get_hook('afo_pre_edit_cur_page_position')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                                <div class="mf-field">
-                                                        <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_pages['Position label'] ?></span></label><br />
-                                                        <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="position[<?php echo $cur_page['id'] ?>]" size="3" maxlength="3" value="<?php echo $cur_page['position'] ?>" /></span>
                                                 </div>
                                         </div>
@@ -466 +393 @@
 ?>
                         </div>
-                        <div class="frm-buttons">
-                                <span class="submit"><input type="submit" class="button" name="update_positions" value="<?php echo $lang_admin_pages['Update positions'] ?>" /></span>
-                        </div>
                 </form>
         </div>

branches/portal_by_daris/install.php

@@ -34 +34 @@
                                         'allow_null'    => false
                                 ),
-                                'position'              => array(
-                                        'datatype'              => 'INT(10) UNSIGNED',
-                                        'allow_null'    => true,
-                                        'default'       => 0
-                                ),
                                 'title'                 => array(
                                         'datatype'              => 'VARCHAR(255)',
@@ -53 +48 @@
                 $forum_db->create_table('pages', $schema);
         
-                $forum_db->query('INSERT INTO '.$forum_db->prefix.'pages VALUES (0, 1, \'Example page\', \'Example content\')') or error(__FILE__, __LINE__);
+                $forum_db->query('INSERT INTO '.$forum_db->prefix.'pages (title, content) VALUES (\'Example page\', \'Example content\')') or error(__FILE__, __LINE__);
 
 

branches/portal_by_daris/lang/English/admin_pages.php

@@ -9 +9 @@
 'Delete'                                                =>      'Delete',
 'Page name'                                     =>      'Page name:',
-'Position label'                                =>      'Position',
 'Delete page'                                   =>      'Delete page',
 'Delete page warning'                   =>      '<strong>WARNING!</strong> Deleting a page will delete all posts (if any) in that page!',
@@ -21 +20 @@
 'Page content'                                  =>      'Page content:',
 'Page content help'                             =>      'You may use HTML in your content.',
-'Edit pages head'                               =>      'Edit, delete or change the position of pages',
+'Edit pages head'                               =>      'Edit or delete page',
 'Edit page details head'                =>      'Edit page details',
 'Confirm delete page'                   =>      'You are deleting the page "%s"',
 'Add page'                                              =>      'Add page',
-'Add page head'                         =>      'Add a new page to the selected category at the specified position',
+'Add page head'                         =>      'Add a new page',
 'Add page legend'                               =>      'Add page:',
-'Update positions'                              =>      'Update positions',
 'Page added'                                    =>      'Page added.',
 'Page deleted'                                  =>      'Page deleted.',