Changeset 29 for branches

Timestamp:

02/10/09 14:30:19 (3 years ago)

Author:

daris

Message:

download: small fixes

Location:

branches/download

Files:

• admin/download.php (modified) (7 diffs)
• download.php (modified) (5 diffs)
• lang/English/admin_download.php (modified) (3 diffs)
• submit_download.php (modified) (3 diffs)

branches/download/admin/download.php

@@ -213 +213 @@
                         message($lang_admin_download['Must enter download message']);
 
+                if (is_uploaded_file($_FILES['file_upload']['tmp_name']))
+                {
+                        $file_upload = $_FILES['file_upload']['name'];
+                        $file_ext = substr($file_upload, strrpos($file_upload, '.')+1);
+                
+                        if ($file_ext != 'zip')
+                                message($lang_admin_download['Invalid extension']);
+                        
+                        move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$download_id.'.zip');
+                }
+        
 /*              if (isset($_FILES['file_upload']) && is_uploaded_file($_FILES['file_upload']['tmp_name']))
                 {
@@ -247 +258 @@
                 $forum_db->query_build($query) or error(__FILE__, __LINE__);
 
-                move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$download_id.'.zip');
                 
                 ($hook = get_hook('afo_save_forum_pre_redirect')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -350 +360 @@
                                 <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_download['Or upload file'] ?></span></label><br />
+                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_download['Upload new file'] ?></span><small><?php echo $lang_admin_download['Upload new file help'] ?></small></label><br />
                                                 <span class="fld-input"><input type="file" id="fld<?php echo $forum_page['fld_count'] ?>" name="file_upload" size="35" /></span>
                                         </div>
@@ -502 +512 @@
 ?>
                         <div class="content-head">
-                                <h3 class="hn"><span><?php printf($lang_admin_download['Category name'], $cur_download['catname']) ?></span></h3>
+                                <h3 class="hn"><span><?php printf($lang_admin_download['Category name head'], $cur_download['catname']) ?></span></h3>
                         </div>
                         <div class="frm-group frm-hdgroup group<?php echo ++$forum_page['group_count'] ?>">
@@ -514 +524 @@
 ?>
                                 <fieldset class="mf-set set<?php echo ++$forum_page['item_count'] ?><?php echo ($forum_page['item_count'] == 1) ? ' mf-head' : ' mf-extra' ?>">
-                                        <legend><span><?php printf($lang_admin_download['Edit or delete'], sprintf($lang_admin_download['Edit or delete'], '<a href="'.forum_link($forum_url['download_id'], array($cur_download['cat'], sef_friendly($cur_download['catname']), $cur_download['id'], sef_friendly($cur_download['name']))).'">'.$lang_download['Download'].'</a>', '<a href="'.forum_link($forum_url['admin_download']).'?edit_download='.$cur_download['id'].'">'.$lang_admin_download['Edit'].'</a>'), '<a href="'.forum_link($forum_url['admin_download']).'?del_download='.$cur_download['id'].'">'.$lang_admin_download['Delete'].'</a>') ?></span></legend>
+                                        <legend><span><?php printf($lang_admin_download['Edit or delete'], sprintf($lang_admin_download['Edit or delete'], '<a href="'.forum_link($forum_url['download_get'], array($cur_download['cat'], sef_friendly($cur_download['catname']), $cur_download['id'], sef_friendly($cur_download['name']))).'">'.$lang_download['Download'].'</a>', '<a href="'.forum_link($forum_url['admin_download']).'?edit_download='.$cur_download['id'].'">'.$lang_admin_download['Edit'].'</a>'), '<a href="'.forum_link($forum_url['admin_download']).'?del_download='.$cur_download['id'].'">'.$lang_admin_download['Delete'].'</a>') ?></span></legend>
                                         <div class="mf-box">
 <?php ($hook = get_hook('afo_pre_edit_cur_page_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
@@ -588 +598 @@
 ?>
                         <div class="content-head">
-                                <h3 class="hn"><span><?php printf($lang_admin_download['Category name'], $cur_download['catname']) ?></span></h3>
+                                <h3 class="hn"><span><?php printf($lang_admin_download['Category name head'], $cur_download['catname']) ?></span></h3>
                         </div>
                         <div class="frm-group frm-hdgroup group<?php echo ++$forum_page['group_count'] ?>">
@@ -600 +610 @@
 ?>
                                 <fieldset class="mf-set set<?php echo ++$forum_page['item_count'] ?><?php echo ($forum_page['item_count'] == 1) ? ' mf-head' : ' mf-extra' ?>">
-                                        <legend><span><?php printf($lang_admin_download['Edit or delete'], sprintf($lang_admin_download['Edit or delete'], '<a href="'.forum_link($forum_url['download_id'], array($cur_download['cat'], sef_friendly($cur_download['catname']), $cur_download['id'], sef_friendly($cur_download['name']))).'">'.$lang_download['Download'].'</a>', '<a href="'.forum_link($forum_url['admin_download']).'?edit_download='.$cur_download['id'].'">'.$lang_admin_download['Edit'].'</a>'), '<a href="'.forum_link($forum_url['admin_download']).'?del_download='.$cur_download['id'].'">'.$lang_admin_download['Delete'].'</a>') ?></span></legend>
+                                        <legend><span><?php printf($lang_admin_download['Edit or delete'], sprintf($lang_admin_download['Edit or delete'], '<a href="'.forum_link($forum_url['download_get'], array($cur_download['cat'], sef_friendly($cur_download['catname']), $cur_download['id'], sef_friendly($cur_download['name']))).'">'.$lang_download['Download'].'</a>', '<a href="'.forum_link($forum_url['admin_download']).'?edit_download='.$cur_download['id'].'">'.$lang_admin_download['Edit'].'</a>'), '<a href="'.forum_link($forum_url['admin_download']).'?del_download='.$cur_download['id'].'">'.$lang_admin_download['Delete'].'</a>') ?></span></legend>
                                         <div class="mf-box">
 <?php ($hook = get_hook('afo_pre_edit_cur_page_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>

branches/download/download.php

@@ -197 +197 @@
                         $download_url = forum_link($forum_url['download_id'], $download_info_array);
                         
-                        $forum_page['download'] = array();
-                        $forum_page['download']['info'] = array();
-
-                        $forum_page['download']['info'][] = '<a href="'.$download_get_url.'">'.$lang_download['Download'].'</a>';
-                        
-                        $forum_page['download']['info'][] = sprintf($lang_download['Download count'], $cur_download['downloads']);
+                        $forum_page = array();
+                        $forum_page['info'] = array();
+
+                        $forum_page['info'][] = '<a href="'.$download_get_url.'">'.$lang_download['Download'].'</a>';
+                        
+                        $forum_page['info'][] = sprintf($lang_download['Download count'], $cur_download['downloads']);
 
                         if ($cur_download['author'])
-                                $forum_page['download']['info'][] = $lang_download['Author'].' '.forum_htmlencode($cur_download['author']);
+                                $forum_page['info'][] = $lang_download['Author'].' '.forum_htmlencode($cur_download['author']);
 
                         if ($cur_download['user_id'] > 0)
-                        $forum_page['download']['info'][] = $lang_download['Added by'].' <a href="'.forum_link($forum_url['user'], array($cur_download['user_id'])).'">'.forum_htmlencode($cur_download['username']).'</a>';
+                        $forum_page['info'][] = $lang_download['Added by'].' <a href="'.forum_link($forum_url['user'], array($cur_download['user_id'])).'">'.forum_htmlencode($cur_download['username']).'</a>';
 
                         if ($cur_download['added'])
-                                $forum_page['download']['info'][] = $lang_download['Added time'].' '.format_time($cur_download['added']);
-                        
-                        $forum_page['download']['description'] = parse_message($cur_download['description'], true);
+                                $forum_page['info'][] = $lang_download['Added time'].' '.format_time($cur_download['added']);
+                        
+                        $forum_page['description'] = parse_message($cur_download['description'], true);
 
                         
@@ -219 +219 @@
                         <div class="ct-box data-box download entry-content">
                                 <h2 class="hn"><strong><a href="<?php echo $download_url ?>"><?php echo forum_htmlencode($cur_download['name']) ?></a></strong><?php echo $version_string ?></h2>
-                                <?php echo $forum_page['download']['description'] ?>
-                                <p><?php echo implode(' | ', $forum_page['download']['info']) ?></p>
+                                <?php echo $forum_page['description'] ?>
+                                <p><?php echo implode(' | ', $forum_page['info']) ?></p>
                         </div>
 <?php
@@ -308 +308 @@
                 $download_url = forum_link($forum_url['download_id'], $download_info_array);
                 
-                $forum_page['download'] = array();
-                $forum_page['download']['info'] = array();
-
-                $forum_page['download']['info'][] = '<a href="'.$download_get_url.'">'.$lang_download['Download'].'</a>';
-                
-                $forum_page['download']['info'][] = sprintf($lang_download['Download count'], $cur_download['downloads']);
+                $forum_page['info'] = array();
+
+                $forum_page['info'][] = '<a href="'.$download_get_url.'">'.$lang_download['Download'].'</a>';
+                
+                $forum_page['info'][] = sprintf($lang_download['Download count'], $cur_download['downloads']);
 
                 if ($cur_download['author'])
-                        $forum_page['download']['info'][] = $lang_download['Author'].' '.forum_htmlencode($cur_download['author']);
+                        $forum_page['info'][] = $lang_download['Author'].' '.forum_htmlencode($cur_download['author']);
 
                 if ($cur_download['user_id'] > 0)
-                $forum_page['download']['info'][] = $lang_download['Added by'].' <a href="'.forum_link($forum_url['user'], array($cur_download['user_id'])).'">'.forum_htmlencode($cur_download['username']).'</a>';
+                $forum_page['info'][] = $lang_download['Added by'].' <a href="'.forum_link($forum_url['user'], array($cur_download['user_id'])).'">'.forum_htmlencode($cur_download['username']).'</a>';
 
                 if ($cur_download['added'])
-                        $forum_page['download']['info'][] = $lang_download['Added time'].' '.format_time($cur_download['added']);
-                
-                $forum_page['download']['description'] = parse_message($cur_download['description'], true);
+                        $forum_page['info'][] = $lang_download['Added time'].' '.format_time($cur_download['added']);
+                
+                $forum_page['description'] = parse_message($cur_download['description'], true);
 
                 
@@ -330 +329 @@
                         <div class="ct-box data-box download entry-content">
                                 <h2 class="hn"><strong><a href="<?php echo $download_url ?>"><?php echo forum_htmlencode($cur_download['name']) ?></a></strong><?php echo $version_string ?></h2>
-                                <?php echo $forum_page['download']['description'] ?>
-                                <p><?php echo implode(' | ', $forum_page['download']['info']) ?></p>
+                                <?php echo $forum_page['description'] ?>
+                                <p><?php echo implode(' | ', $forum_page['info']) ?></p>
                         </div>
         </div>
@@ -435 +434 @@
                                 'WHERE'         => 'd.cat='.$cur_cat['id'].' AND d.approved=1',
                                 'ORDER BY'      => 'd.added DESC',
-                                'LIMIT'         => 5
+                                'LIMIT'         => 3
                         );
 

branches/download/lang/English/admin_download.php

@@ -34 +34 @@
 
 'Category'                                                      => 'Category:',
-'Category name'                                                 => 'Category: %s',
+'Category name head'                            => 'Category: %s',
 
-'Download file'                                         => 'Select download file:',
-'Or upload file'                                        => 'Or upload new:',
+//'Download file'                                               => 'Select download file:',
+'Upload new file'                                               => 'Upload new file:',
+'Upload new file help'                                  => 'Select new file for upload. If you don\'t want to upload new file leave this field empty.',
 'Download version'                                      => 'Download version:',
 'Download version help'                         => 'You can leave this field empty',
@@ -48 +49 @@
 'Approved'                                                      => 'Approved',
 
+// submit download
 'Submit download'                                       => 'Submit download',
 'Submit download head'                          => 'Add new download',
@@ -55 +57 @@
 
 'Invalid extension'                                     => 'Invalid extension',
+'File upload error'                                     => 'File upload error',
 
 // Categories

branches/download/submit_download.php

@@ -30 +30 @@
         // Start with the forum details
         $name = forum_trim($_POST['name']);
-        $description = forum_linebreaks(forum_trim($_POST['description']));
+        $description = forum_trim($_POST['description']);
         $cat = intval($_POST['cat']);
         $version = forum_trim($_POST['version']);
@@ -38 +38 @@
                 message($lang_admin_download['Must enter download message']);
 
-        if (isset($_FILES['file_upload']) && is_uploaded_file($_FILES['file_upload']['tmp_name']))
-        {
-                $file_upload = $_FILES['file_upload']['name'];
-                $file_ext = substr($file_upload, strrpos($file_upload, '.')+1);
-                
-                if ($file_ext != 'zip')
-                        message($lang_admin_download['Invalid extension']);
+        if (!is_uploaded_file($_FILES['file_upload']['tmp_name']))
+                message($lang_admin_download['File upload error']);
+
+        $file_upload = $_FILES['file_upload']['name'];
+        $file_ext = substr($file_upload, strrpos($file_upload, '.')+1);
+        
+        if ($file_ext != 'zip')
+                message($lang_admin_download['Invalid extension']);
                 
 /*              if (file_exists(DOWNLOAD.'files/'.$file_upload))
@@ -58 +59 @@
                 else
                         $file = $_FILES['file_upload']['name'];*/
-        }
-
+        
         $query = array(
                 'INSERT'        => 'name, description, cat, author, version, user_id, added',