Changeset 12 for branches

Timestamp:

02/08/09 16:00:37 (3 years ago)

Author:

daris

Message:

download: next fixes

Location:

branches/download

Files:

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

branches/download/admin/download.php

@@ -211 +211 @@
                 {
                         $file_upload = $_FILES['file_upload']['name'];
+                        $file_ext = substr($file_upload, strrpos($file_upload, '.'));
+                
+                        if ($file_ext != 'zip')
+                                message($lang_admin_download['Invalid extension']);
                         
+
                         if (file_exists(DOWNLOAD.'files/'.$file_upload))
                         {
@@ -285 +290 @@
                                 <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['Download title'] ?></span></label><br />
+                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_download['Download name'] ?></span></label><br />
                                                 <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="name" size="35" maxlength="80" value="<?php echo forum_htmlencode($cur_download['name']) ?>" /></span>
                                         </div>
@@ -495 +500 @@
 ?>
                                 <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'], '<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_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>
                                         <div class="mf-box">
 <?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"><?php echo $lang_admin_download['Download name'] ?></span>
-                                                        <span class="fld-input"><a href="<?php echo forum_link($forum_url['admin_download']).'?approve_download='.$cur_download['id'] ?>"><?php echo forum_htmlencode($cur_download['name']) ?></a><?php echo ($cur_download['version'] ? ' v'.$cur_download['version'] : '') ?></span>
+                                                        <span class="fld-input"><a href="<?php echo forum_link($forum_url['admin_download']).'?approve_download='.$cur_download['id'] ?>"><?php echo forum_htmlencode($cur_download['name']) ?><?php echo ($cur_download['version'] ? ' v'.$cur_download['version'] : '') ?></a></span>
                                                 </div>
                                         </div>
@@ -581 +586 @@
 ?>
                                 <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'], '<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_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>
                                         <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

@@ -23 +23 @@
                 'SELECT'        => 'd.name, d.file, d.version',
                 'FROM'          => 'downloads AS d',
-                'WHERE'         => 'd.id=\''.$id.'\' AND d.approved=1',
-        );
+                'WHERE'         => 'd.id=\''.$id.'\'',
+        );
+
+        // Allow downloading unapproved files for administrators
+        if ($forum_user['g_id'] != FORUM_ADMIN)
+                $query['WHERE'] .= ' AND d.approved=1';
 
         ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
@@ -30 +34 @@
 
         if (!$forum_db->num_rows($result))
-                message('Download not found');
+                message($lang_download['Download not found']);
 
         $cur_file = $forum_db->fetch_assoc($result);
@@ -37 +41 @@
 
         if (!file_exists($file) || trim($cur_file['file']) == '')
-                message('File not found');
+                message($lang_download['File not found']);
         
         // Fetch list of downloads
@@ -154 +158 @@
 ?>
         <div class="main-head">
-                <p class="options"><span class="first-item"><a href="<?php echo forum_link($forum_url['submit_download_cat'], array($cat, sef_friendly($cur_cat['name']))) ?>"><?php echo $lang_download['Submit download'] ?></a></span></p>
+<?php if (!$forum_user['is_guest']) : ?>                <p class="options"><span class="first-item"><a href="<?php echo forum_link($forum_url['submit_download_cat'], array($cat, sef_friendly($cur_cat['name']))) ?>"><?php echo $lang_download['Submit download'] ?></a></span></p><?php endif; ?>
                 <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
@@ -255 +259 @@
 ?>
         <div class="main-head">
-                <p class="options"><span class="first-item"><a href="<?php echo forum_link($forum_url['submit_download']) ?>"><?php echo $lang_download['Submit download'] ?></a></span></p>
+<?php if (!$forum_user['is_guest']) : ?>                <p class="options"><span class="first-item"><a href="<?php echo forum_link($forum_url['submit_download']) ?>"><?php echo $lang_download['Submit download'] ?></a></span></p><?php endif; ?>
                 <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>

branches/download/lang/English/admin_download.php

@@ -14 +14 @@
 'Edit download details legend'          =>      'Download details:',
 'Add to category label'                 =>      'Add to category:',
-'Download content'                                      =>      'Download content:',
-'Download content help'                         =>      'You may use HTML in your content.',
 'Edit downloads head'                           =>      'Edit or delete download',
 'Edit download details head'            =>      'Edit download details',
@@ -28 +26 @@
 
 'Downloads'                                                     =>      'Downloads',
-'Download title label'                          =>      'Download title:',
-'Download title'                                        =>      'Download title',
-'Download description'                          =>      'Download description',
-'Download description help'                     =>      'Download description',
+/*'Download title label'                                =>      'Download title:',
+'Download title'                                        =>      'Download title',*/
+'Download description'                          =>      'Download description:',
+'Download description help'                     =>      'Short description of download',
 
 'Downloads'     => 'Downloads',
@@ -52 +50 @@
 'Submit download head'                          => 'Add new download',
 'Submit download info'                          => 'Your download must be accepted by administrator.',
-'Upload file'                                           => 'Upload file',
+'Upload file'                                           => 'Upload file:',
+
+'Invalid extension'                                     => 'Invalid extension',
 );

branches/download/lang/English/download.php

@@ -12 +12 @@
 
 'New downloads'                                 => 'New downloads [%s]',
+
+'Download not found'                    => 'Download not found',
+'File not found'                                => 'File not found',
 );

branches/download/submit_download.php

@@ -7 +7 @@
 ($hook = get_hook('vt_start')) ? eval($hook) : null;
 
-if ($forum_user['g_read_board'] == '0')
+if ($forum_user['g_read_board'] == '0' || $forum_user['is_guest'])
         message($lang_common['No view']);
 
@@ -40 +40 @@
         {
                 $file_upload = $_FILES['file_upload']['name'];
+                $file_ext = substr($file_upload, strrpos($file_upload, '.'));
+                
+                if ($file_ext != 'zip')
+                        message($lang_admin_download['Invalid extension']);
                 
                 if (file_exists(DOWNLOAD.'files/'.$file_upload))
@@ -106 +110 @@
                         </div>
                         
+<?php if ($forum_user['g_id'] != FORUM_ADMIN) : ?>
                         <div class="ct-box info-box">
                                 <p><?php echo $lang_admin_download['Submit download info'] ?></p>
-                        </div>                  
+                        </div>
+<?php endif; ?>
                         
 <?php ($hook = get_hook('afo_edit_forum_pre_details_fieldset')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
@@ -116 +122 @@
                                 <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['Download title'] ?></span></label><br />
+                                                <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_admin_download['Download name'] ?></span></label><br />
                                                 <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="name" size="35" maxlength="80" /></span>
                                         </div>