Changeset 13 for branches/download

Timestamp:

02/08/09 17:52:03 (3 years ago)

Author:

daris

Message:

download: some other changes

Location:

branches/download

Files:

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

branches/download/admin/download.php

@@ -179 +179 @@
         // Fetch page info
         $query = array(
-                        'SELECT'        => 'd.name, d.cat, d.file, d.description, d.version, d.approved',
+                        'SELECT'        => 'd.name, d.cat, d.description, d.author, d.version, d.approved',
                         'FROM'          => 'downloads AS d',
                         'WHERE'         => 'd.id='.$download_id
@@ -203 +203 @@
                 $file = isset($_POST['file']) ? basename($_POST['file']) : null;
                 $version = forum_trim($_POST['version']);
+                $author = forum_trim($_POST['author']);
                 $approved = isset($_POST['approved']) ? 1 : 0;
 
@@ -208 +209 @@
                         message($lang_admin_download['Must enter download message']);
 
-                if (isset($_FILES['file_upload']) && is_uploaded_file($_FILES['file_upload']['tmp_name']))
+/*              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, '.'));
+                        $file_ext = substr($file_upload, strrpos($file_upload, '.')+1);
                 
                         if ($file_ext != 'zip')
@@ -231 +232 @@
 
                         move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$file);
-                }
+                }*/
 
                 $query = array(
                         'UPDATE'        => 'downloads',
-                        'SET'           => 'name=\''.$forum_db->escape($name).'\', description=\''.$forum_db->escape($description).'\', cat='.$cat.', file=\''.$forum_db->escape($file).'\', version=\''.$forum_db->escape($version).'\', approved='.$approved,
+                        'SET'           => 'name=\''.$forum_db->escape($name).'\', description=\''.$forum_db->escape($description).'\', cat='.$cat.', file=\''.$forum_db->escape($file).'\', version=\''.$forum_db->escape($version).'\', author=\''.$forum_db->escape($author).'\', approved='.$approved,
                         'WHERE'         => 'id='.$download_id
                 );
@@ -242 +243 @@
                 $forum_db->query_build($query) or error(__FILE__, __LINE__);
 
+                move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$forum_db->insert_id().'.zip');
+                
                 ($hook = get_hook('afo_save_forum_pre_redirect')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -319 +322 @@
                                         </div>
                                 </div>
-<?php ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+<?php ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;/* ?>
                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
                                         <div class="sf-box select">
@@ -340 +343 @@
                                         </div>
                                 </div>
-<?php ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+<?php*/ ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (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">
@@ -347 +350 @@
                                         </div>
                                 </div>
+<?php ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (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_download['Download author'] ?></span></label><br />
+                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="author" size="20" maxlength="80" value="<?php echo forum_htmlencode($cur_download['author']) ?>" /></span>
+                                        </div>
+                                </div>  
 <?php ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                                 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">

branches/download/download.php

@@ -21 +21 @@
         // Fetch list of downloads
         $query = array(
-                'SELECT'        => 'd.name, d.file, d.version',
+                'SELECT'        => 'd.name, d.version',
                 'FROM'          => 'downloads AS d',
                 'WHERE'         => 'd.id=\''.$id.'\'',
@@ -38 +38 @@
         $cur_file = $forum_db->fetch_assoc($result);
 
-        $file = DOWNLOAD.'files/'.$cur_file['file'];
-
-        if (!file_exists($file) || trim($cur_file['file']) == '')
+        $file = DOWNLOAD.'files/'.$id.'.zip';
+
+        if (!file_exists($file))
                 message($lang_download['File not found']);
         
@@ -126 +126 @@
         // Fetch list of downloads
         $query = array(
-                'SELECT'        => 'd.id, d.name, d.description, d.version, d.downloads',
+                'SELECT'        => 'd.id, d.name, d.description, d.version, d.downloads, d.author, d.user_id, d.added, u.username',
                 'FROM'          => 'downloads AS d',
+                'JOINS'         => array(
+                        array(
+                                'LEFT JOIN'             => 'users AS u',
+                                'ON'                    => 'd.user_id=u.id'
+                        ),
+                ),
                 'WHERE'         => 'd.cat='.$cat.' AND d.approved=1',
                 'LIMIT'         => $forum_page['start_from'].', '.$forum_page['disp_downloads'],
@@ -178 +184 @@
                 {
                         $version_string = (trim($cur_download['version']) == '') ? '' : ' v'.forum_htmlencode($cur_download['version']);
+                        $download_url = forum_link($forum_url['download_id'], array($cat, sef_friendly($cur_cat['name']), $cur_download['id'], sef_friendly($cur_download['name'])));
+                        
+                        $forum_page['info'] = array();
+
+                        $forum_page['info'][] = '<a href="'.$download_url.'">'.$lang_download['Download'].'</a>';
+                        
+                        $forum_page['info'][] = sprintf($lang_download['Download count'], $cur_download['downloads']);
+
+                        if ($cur_download['user_id'] > 0)
+                        $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['author'])
+                                $forum_page['info'][] = $lang_download['Author'].' '.forum_htmlencode($cur_download['author']);
+
+                        if ($cur_download['added'])
+                                $forum_page['info'][] = $lang_download['Added time'].' '.format_time($cur_download['added']);
+                        
 ?>              
                         <div class="ct-box data-box download">
-                                <h2 class="hn"><strong><?php echo forum_htmlencode($cur_download['name']) ?></strong><?php echo $version_string ?></h2>
+                                <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 if ($cur_download['description']) : ?>                    <p><?php echo forum_htmlencode($cur_download['description']) ?></p><?php endif; ?>
-                                <p><a href="<?php echo forum_link($forum_url['download_id'], array($cat, sef_friendly($cur_cat['name']), $cur_download['id'], sef_friendly($cur_download['name']))) ?>"><?php echo $lang_download['Download'] ?></a> (<?php printf($lang_download['Download count'], $cur_download['downloads']) ?>)</p>
+                                <p><?php echo implode(' | ', $forum_page['info']) ?></p>
                         </div>
 <?php

branches/download/install.php

@@ -78 +78 @@
                                         'default'       => '1.0'
                                 ),
-                                'file'                  => array(
+                                'author'                        => array(
+                                        'datatype'              => 'VARCHAR(255)',
+                                        'allow_null'    => true,
+                                ),
+/*                              'file'                  => array(
                                         'datatype'              => 'VARCHAR(255)',
                                         'allow_null'    => true
-                                ),
+                                ),*/
                                 'downloads'                     => array(
                                         'datatype'              => 'INT(10) UNSIGNED',
@@ -92 +96 @@
                                         'default'       => 0
                                 ),
+                                'user_id'                       => array(
+                                        'datatype'              => 'INT(10) UNSIGNED',
+                                        'allow_null'    => true,
+                                ),
+                                'added'                 => array(
+                                        'datatype'              => 'INT(10) UNSIGNED',
+                                        'allow_null'    => true,
+                                ),
                         ),
                         'PRIMARY KEY'   => array('id')
@@ -99 +111 @@
                 $forum_db->query('INSERT INTO '.$forum_db->prefix.'downloads (name, description, approved) VALUES (\'Geshi highlight\', \'test\', 1)') or error(__FILE__, __LINE__);
                 
-                for ($i = 1; $i < 20; $i++)
-                        $forum_db->query('INSERT INTO '.$forum_db->prefix.'downloads (name, description, approved) VALUES (\'Extension '.$i.'\', \'test\', 1)') or error(__FILE__, __LINE__);
+/*              for ($i = 1; $i < 20; $i++)
+                        $forum_db->query('INSERT INTO '.$forum_db->prefix.'downloads (name, description, approved) VALUES (\'Extension '.$i.'\', \'test\', 1)') or error(__FILE__, __LINE__);*/
 
         }

branches/download/lang/English/admin_download.php

@@ -40 +40 @@
 'Download version'                                      => 'Download version:',
 'Download version help'                         => 'You can leave this field empty',
+'Download author'                                       => 'Author:',
 
 'Downloads for approve'                         => 'Downloads for approve',
@@ -51 +52 @@
 'Submit download info'                          => 'Your download must be accepted by administrator.',
 'Upload file'                                           => 'Upload file:',
+'Download submited redirect'            => 'Download submited. Redirecting�',
 
 'Invalid extension'                                     => 'Invalid extension',

branches/download/lang/English/download.php

@@ -15 +15 @@
 'Download not found'                    => 'Download not found',
 'File not found'                                => 'File not found',
+
+'Added by'                                              => 'Added by:',
+'Author'                                                => 'Author:',
+'Added time'                                    => 'Added:',
 );

branches/download/submit_download.php

@@ -33 +33 @@
         $cat = intval($_POST['cat']);
         $version = forum_trim($_POST['version']);
+        $author = forum_trim($_POST['author']);
 
         if ($name == '')
@@ -40 +41 @@
         {
                 $file_upload = $_FILES['file_upload']['name'];
-                $file_ext = substr($file_upload, strrpos($file_upload, '.'));
+                $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))
+/*              if (file_exists(DOWNLOAD.'files/'.$file_upload))
                 {
                         // Get new name for file
@@ -56 +57 @@
                 }
                 else
-                        $file = $_FILES['file_upload']['name'];
-
-                move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$file);
+                        $file = $_FILES['file_upload']['name'];*/
         }
 
         $query = array(
-                'INSERT'        => 'name, description, cat, file, version',
+                'INSERT'        => 'name, description, cat, author, version, user_id, added',
                 'INTO'          => 'downloads',
-                'VALUES'        => '\''.$forum_db->escape($name).'\', \''.$forum_db->escape($description).'\', '.$cat.', \''.$forum_db->escape($file).'\', \''.$forum_db->escape($version).'\'',
+                'VALUES'        => '\''.$forum_db->escape($name).'\', \''.$forum_db->escape($description).'\', '.$cat.', \''.$forum_db->escape($author).'\', \''.$forum_db->escape($version).'\', \''.$forum_db->escape($forum_user['id']).'\', '.time(),
         );
         
@@ -76 +75 @@
         $forum_db->query_build($query) or error(__FILE__, __LINE__);
 
+        move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$forum_db->insert_id().'.zip');
+
         ($hook = get_hook('afo_save_forum_pre_redirect')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
-        redirect(forum_link($forum_url['download']), $lang_admin_download['Download submited'].' '.$lang_common['Redirect']);
+        redirect(forum_link($forum_url['download']), $lang_admin_download['Download submited redirect']);
 }
 
@@ -160 +161 @@
                                 <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 author'] ?></span></label><br />
+                                                <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="author" size="20" maxlength="80" value="<?php echo forum_htmlencode($forum_user['username']) ?>" /></span>
+                                        </div>
+                                </div>  
+<?php ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (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_download['Download version'] ?></span><small><?php echo $lang_admin_download['Download version help'] ?></small></label><br />
                                                 <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="version" size="20" maxlength="80" /></span>
                                         </div>
-                                </div>  
+                                </div>
 <?php ($hook = get_hook('afo_edit_forum_pre_forum_name')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                                 <div class="txt-set set<?php echo ++$forum_page['item_count'] ?>">