Changeset 10 for branches

Timestamp:

02/08/09 15:10:33 (3 years ago)

Author:

daris

Message:

lots of changes

Location:

branches/download

Files:

• download.php (modified) (12 diffs)
• include/url/Folder_based_(fancy)/forum_urls.php (modified) (1 diff)
• include/url/Folder_based_(fancy)/rewrite_rules.php (modified) (1 diff)

branches/download/download.php

@@ -21 +21 @@
         // Fetch list of downloads
         $query = array(
-                'SELECT'        => 'd.file',
+                'SELECT'        => 'd.name, d.file, d.version',
                 'FROM'          => 'downloads AS d',
-                'WHERE'         => 'd.id=\''.$id.'\'',
-        );
-
-        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
-        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
-
-
-        // If there are news in selected forums
-        if ($forum_db->num_rows($result))
-        {
-                $cur_file = $forum_db->fetch_assoc($result);
-
-                $file = DOWNLOAD.'files/'.$cur_file['file'];
-
-                if (file_exists($file) && !$file)
+                'WHERE'         => 'd.id=\''.$id.'\' AND d.approved=1',
+        );
+
+        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
+        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
+
+        if (!$forum_db->num_rows($result))
+                message('Download not found');
+
+        $cur_file = $forum_db->fetch_assoc($result);
+
+        $file = DOWNLOAD.'files/'.$cur_file['file'];
+
+        if (!file_exists($file) || trim($cur_file['file']) == '')
+                message('File not found');
+        
+        // Fetch list of downloads
+        $query = array(
+                'UPDATE'        => 'downloads',
+                'SET'           => 'downloads=downloads+1',
+                'WHERE'         => 'id=\''.$id.'\'',
+        );
+
+        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
+        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
+        
+        $version = ($cur_file['version'] != '' ? '_'.$cur_file['version'] : '');
+        $url = strtolower($cur_file['name'].$version.'.zip');
+        $url = str_replace(' ', '_', $url);
+        $url = preg_replace('/[^0-9a-z\._]/', '', $url);
+        
+        //@ob_end_clean(); //turn off output buffering to decrease cpu usage
+        
+        header('Content-Type: application/zip');
+        header('Content-Disposition: attachment; filename="'.rawurldecode($url).'"');
+        header("Content-Transfer-Encoding: binary");
+        header('Accept-Ranges: bytes');
+        header("Content-Length: ".filesize($file));
+        
+        // The three lines below basically make the download non-cacheable 
+        header("Cache-control: private");
+        header('Pragma: private');
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        
+        $chunksize = 1*(1024*1024); //you may want to change this
+        if ($file = fopen($file, 'r'))
+        {
+                if(isset($_SERVER['HTTP_RANGE']))
+                        fseek($file, $range);
+                 
+                while(!feof($file))
                 {
-                        // Fetch list of downloads
-                        $query = array(
-                                'UPDATE'        => 'downloads',
-                                'SET'           => 'downloads=downloads+1',
-                                'WHERE'         => 'id=\''.$id.'\'',
-                        );
-
-                        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
-                        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
-                        
-                        //@ob_end_clean(); //turn off output buffering to decrease cpu usage
-                        
-                        header('Content-Type: application/zip');
-                        header('Content-Disposition: attachment; filename="'.rawurldecode($cur_file['file']).'"');
-                        header("Content-Transfer-Encoding: binary");
-                        header('Accept-Ranges: bytes');
-                        header("Content-Length: ".filesize($file));
-                        
-                        // The three lines below basically make the download non-cacheable 
-                        header("Cache-control: private");
-                        header('Pragma: private');
-                        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-                        
-                        $chunksize = 1*(1024*1024); //you may want to change this
-                        if ($file = fopen($file, 'r'))
-                        {
-                                if(isset($_SERVER['HTTP_RANGE']))
-                                        fseek($file, $range);
-                                 
-                                while(!feof($file))
-                                {
-                                        $buffer = fread($file, $chunksize);
-                                        print($buffer); //echo($buffer); // is also possible
-                                        flush();
-                                        $bytes_send += strlen($buffer);
-                                }
-                                fclose($file);
-                        } 
-                        else die('Error - can not open file.');
+                        $buffer = fread($file, $chunksize);
+                        print($buffer); //echo($buffer); // is also possible
+                        flush();
+                        $bytes_send += strlen($buffer);
                 }
-                else
-                        message('File not found');
-        }
+                fclose($file);
+        } 
         else
-                message('Download not found');
-                
+                message('Error - can not open file.');
+
         exit;
 }
@@ -93 +93 @@
                 'SELECT'        => 'count(d.id)',
                 'FROM'          => 'downloads AS d',
-                'WHERE'         => 'd.cat='.$cat
-        );
-
-        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
-        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
-
-        $forum_page['disp_extensions'] = 7;
-        $forum_page['num_extensions'] = $forum_db->result($result);
-        
-        // Fetch list of downloads
+                'WHERE'         => 'd.cat='.$cat.' AND d.approved=1'
+        );
+
+        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
+        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
+
+        $forum_page['disp_downloads'] = 10;
+        $forum_page['num_downloads'] = $forum_db->result($result);
+        
+        // Fetch current category
         $query = array(
                 'SELECT'        => 'c.name, c.description',
@@ -114 +114 @@
 
         // Determine the topic offset (based on $_GET['p'])
-        $forum_page['num_pages'] = ceil($forum_page['num_extensions'] / $forum_page['disp_extensions']);
+        $forum_page['num_pages'] = ceil($forum_page['num_downloads'] / $forum_page['disp_downloads']);
         $forum_page['page'] = (!isset($_GET['p']) || $_GET['p'] <= 1 || $_GET['p'] > $forum_page['num_pages']) ? 1 : $_GET['p'];
-        $forum_page['start_from'] = $forum_page['disp_extensions'] * ($forum_page['page'] - 1);
-        $forum_page['finish_at'] = min(($forum_page['start_from'] + $forum_page['disp_extensions']), ($forum_page['num_extensions']));
-        $forum_page['items_info'] = generate_items_info($cur_cat['name'], ($forum_page['start_from'] + 1), $forum_page['num_extensions']);
+        $forum_page['start_from'] = $forum_page['disp_downloads'] * ($forum_page['page'] - 1);
+        $forum_page['finish_at'] = min(($forum_page['start_from'] + $forum_page['disp_downloads']), ($forum_page['num_downloads']));
+        $forum_page['items_info'] = generate_items_info($cur_cat['name'], ($forum_page['start_from'] + 1), $forum_page['num_downloads']);
 
         // Fetch list of downloads
@@ -124 +124 @@
                 'SELECT'        => 'd.id, d.name, d.description, d.version, d.downloads',
                 'FROM'          => 'downloads AS d',
-                'WHERE'         => 'd.cat='.$cat,
-                'LIMIT'         => $forum_page['start_from'].', '.$forum_page['disp_extensions']
+                'WHERE'         => 'd.cat='.$cat.' AND d.approved=1',
+                'LIMIT'         => $forum_page['start_from'].', '.$forum_page['disp_downloads'],
+                'ORDER BY'      => 'd.name'
         );
 
@@ -153 +154 @@
 ?>
         <div class="main-head">
-<?php
-
-        if (!empty($forum_page['main_head_options']))
-                echo "\n\t\t".'<p class="options">'.implode(' ', $forum_page['main_head_options']).'</p>';
-
-?>
+                <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>
                 <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
 
+<?php if (isset($cur_cat['description'])) : ?>
+        <div class="main-subhead">
+                <h2 class="hn"><span><?php echo forum_htmlencode($cur_cat['description']) ?></span></h2>
+        </div>
+<?php endif; ?>
 
         <div class="main-content main-frm">
-        
-                        <div class="ct-box info-box">
-                                <h2 class="hn"><strong><?php echo forum_htmlencode($cur_cat['name']) ?></strong></h2>
-<?php if ($cur_cat['description']) : ?>                 <p><?php echo forum_htmlencode($cur_cat['description']) ?></p><?php endif; ?>
-                        </div>
+
 <?php
 
@@ -176 +173 @@
                 while ($cur_download = $forum_db->fetch_assoc($result))
                 {
-        
+                        $version_string = (trim($cur_download['version']) == '') ? '' : ' v'.forum_htmlencode($cur_download['version']);
 ?>              
-                        <div class="ct-box data-box">
-                                <h2 class="hn"><strong><?php echo forum_htmlencode($cur_download['name']) ?></strong> v<?php echo forum_htmlencode($cur_download['version']) ?></h2>
+                        <div class="ct-box data-box download">
+                                <h2 class="hn"><strong><?php echo forum_htmlencode($cur_download['name']) ?></strong><?php echo $version_string ?></h2>
 <?php if ($cur_download['description']) : ?>                    <p><?php echo forum_htmlencode($cur_download['description']) ?></p><?php endif; ?>
-                                <p><?php printf($lang_download['Download count'], $cur_download['downloads']) ?></p>
-                                <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></p>
+                                <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>
                         </div>
 <?php
@@ -198 +194 @@
         </div>
         <div class="main-foot">
-<?php
-
-        if (!empty($forum_page['main_foot_options']))
-                echo "\n\t\t\t".'<p class="options">'.implode(' ', $forum_page['main_foot_options']).'</p>';
-
-?>
                 <p><?php echo $forum_page['items_info'] ?></p>
         </div>
@@ -225 +215 @@
         $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
 
-        $forum_page['disp_extensions'] = 7;
-        $forum_page['num_extensions'] = $forum_db->result($result);
+        $forum_page['disp_downloads'] = 10;
+        $forum_page['num_downloads'] = $forum_db->result($result);
 
         // Determine the topic offset (based on $_GET['p'])
-        $forum_page['num_pages'] = ceil($forum_page['num_extensions'] / $forum_page['disp_extensions']);
+        $forum_page['num_pages'] = ceil($forum_page['num_downloads'] / $forum_page['disp_downloads']);
         $forum_page['page'] = (!isset($_GET['p']) || $_GET['p'] <= 1 || $_GET['p'] > $forum_page['num_pages']) ? 1 : $_GET['p'];
-        $forum_page['start_from'] = $forum_page['disp_extensions'] * ($forum_page['page'] - 1);
-        $forum_page['finish_at'] = min(($forum_page['start_from'] + $forum_page['disp_extensions']), ($forum_page['num_extensions']));
-        $forum_page['items_info'] = generate_items_info($lang_download['Downloads'], ($forum_page['start_from'] + 1), $forum_page['num_extensions']);
+        $forum_page['start_from'] = $forum_page['disp_downloads'] * ($forum_page['page'] - 1);
+        $forum_page['finish_at'] = min(($forum_page['start_from'] + $forum_page['disp_downloads']), ($forum_page['num_downloads']));
+        $forum_page['items_info'] = generate_items_info($lang_download['Downloads'], ($forum_page['start_from'] + 1), $forum_page['num_downloads']);
 
         // Fetch list of cats
@@ -239 +229 @@
                 'SELECT'        => 'c.id, c.name, c.description',
                 'FROM'          => 'downloads_cats AS c',
-                'LIMIT'         => $forum_page['start_from'].', '.$forum_page['disp_extensions']
+                'LIMIT'         => $forum_page['start_from'].', '.$forum_page['disp_downloads'],
+                'ORDER BY'      => 'c.name'
         );
 
@@ -264 +255 @@
 ?>
         <div class="main-head">
-<?php
-
-        if (!empty($forum_page['main_head_options']))
-                echo "\n\t\t".'<p class="options">'.implode(' ', $forum_page['main_head_options']).'</p>';
-
-?>
+                <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>
                 <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
+        </div>
+        
+        <div class="main-subhead">
+                <h2 class="hn"><span><?php echo $lang_download['Category list'] ?></span></h2>
         </div>
 
@@ -282 +272 @@
                 while ($cur_cat = $forum_db->fetch_assoc($result))
                 {
-        
+                        
+                        // Fetch list of downloads
+                        $query_downloads = array(
+                                'SELECT'        => 'count(d.id)',
+                                'FROM'          => 'downloads AS d',
+                                'WHERE'         => 'd.cat='.$cur_cat['id'].' AND d.approved=1'
+                        );
+
+                        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
+                        $result_downloads = $forum_db->query_build($query_downloads) or error(__FILE__, __LINE__);
+                        
+                        $files_count = $forum_db->result($result_downloads);
 ?>              
-                        <div class="ct-box data-box">
-                                <h2 class="hn"><a href="<?php echo forum_link($forum_url['download_cat'], array($cur_cat['id'], sef_friendly($cur_cat['name']))) ?>"><strong><?php echo forum_htmlencode($cur_cat['name']) ?></strong></a></h2>
+                        <div class="ct-box data-box download">
+                                <h2 class="hn"><a href="<?php echo forum_link($forum_url['download_cat'], array($cur_cat['id'], sef_friendly($cur_cat['name']))) ?>"><strong><?php echo forum_htmlencode($cur_cat['name']) ?></strong></a> (<?php printf($lang_download['Files count'], $files_count) ?>)</h2>
 <?php if ($cur_cat['description']) : ?>                 <p><?php echo forum_htmlencode($cur_cat['description']) ?></p><?php endif; ?>
                         </div>
@@ -302 +303 @@
         </div>
         <div class="main-foot">
-<?php
-
-        if (!empty($forum_page['main_foot_options']))
-                echo "\n\t\t\t".'<p class="options">'.implode(' ', $forum_page['main_foot_options']).'</p>';
-
-?>
                 <p><?php echo $forum_page['items_info'] ?></p>
         </div>

branches/download/include/url/Folder_based_(fancy)/forum_urls.php

@@ -19 +19 @@
         'download_cat'          => 'download/$1/$2/',
         'download_id'           => 'download/$1/$2/$3/$4/',
+        'submit_download'       => 'download/submit/',
+        'submit_download_cat'=> 'download/submit/$1/$2/',
+        'admin_download'        => $portal_dir.'admin/download.php',
 
 );

branches/download/include/url/Folder_based_(fancy)/rewrite_rules.php

@@ -15 +15 @@
 
 $forum_rewrite_rules_portal = array(
+        '/^download\/submit\/([0-9]+)?\/.*?(\.html?|\/)?$/i'            =>      $ext_info['path'].'/submit_download.php?cat=$1',
+        '/^download\/submit(\.html?|\/)?$/i'                                            =>      $ext_info['path'].'/submit_download.php',
         '/^download\/([0-9]+)?\/.*?\/p(age)?\/?([0-9]+)\/$/i'           =>      'index.php?download&cat=$1&p=$3',
         '/^download\/([0-9]+)\/.*?\/([0-9]+)\/.*?\/$/i'                         =>      'index.php?download&id=$2',