Changeset 15 for branches/download

Timestamp:

02/09/09 17:07:27 (3 years ago)

Author:

daris

Message:

download: some changes

Location:

branches/download

Files:

• admin/download.php (modified) (4 diffs)
• admin/download_cats.php (added)
• download.php (modified) (10 diffs)
• include/url/Folder_based_(fancy)/forum_urls.php (modified) (1 diff)
• include/url/Folder_based_(fancy)/rewrite_rules.php (modified) (1 diff)
• lang/English/admin_download.php (modified) (1 diff)
• lang/English/download.php (modified) (2 diffs)
• submit_download.php (modified) (1 diff)

branches/download/admin/download.php

@@ -29 +29 @@
         require DOWNLOAD.'lang/English/admin_download.php';
 
+if (file_exists(DOWNLOAD.'lang/'.$forum_user['language'].'/download.php'))
+        require DOWNLOAD.'lang/'.$forum_user['language'].'/download.php';
+else
+        require DOWNLOAD.'lang/English/download.php';
 
 // Add a "default" forum
@@ -201 +205 @@
                 $description = forum_linebreaks(forum_trim($_POST['description']));
                 $cat = intval($_POST['cat']);
-                $file = isset($_POST['file']) ? basename($_POST['file']) : null;
+//              $file = isset($_POST['file']) ? basename($_POST['file']) : null;
                 $version = forum_trim($_POST['version']);
                 $author = forum_trim($_POST['author']);
@@ -236 +240 @@
                 $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).'\', author=\''.$forum_db->escape($author).'\', approved='.$approved,
+                        'SET'           => 'name=\''.$forum_db->escape($name).'\', description=\''.$forum_db->escape($description).'\', cat='.$cat.', version=\''.$forum_db->escape($version).'\', author=\''.$forum_db->escape($author).'\', approved='.$approved,
                         'WHERE'         => 'id='.$download_id
                 );
@@ -243 +247 @@
                 $forum_db->query_build($query) or error(__FILE__, __LINE__);
 
-                move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$forum_db->insert_id().'.zip');
+                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;

branches/download/download.php

@@ -14 +14 @@
         require_once DOWNLOAD.'lang/English/download.php';
 
+require_once FORUM_ROOT.'include/parser.php';
+
 $id = isset($_GET['id']) ? intval($_GET['id']) : null;
 $cat = isset($_GET['cat']) ? intval($_GET['cat']) : null;
-
-if (isset($id))
+$get = isset($_GET['get']) ? 1 : 0;
+
+if (isset($id) && $get)
 {
         // Fetch list of downloads
@@ -59 +62 @@
         
         //@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-Transfer-Encoding: binary");
+        header('Accept-Ranges: bytes');*/
         header("Content-Length: ".filesize($file));
         
@@ -136 +138 @@
                 'WHERE'         => 'd.cat='.$cat.' AND d.approved=1',
                 'LIMIT'         => $forum_page['start_from'].', '.$forum_page['disp_downloads'],
-                'ORDER BY'      => 'd.name'
+                'ORDER BY'      => 'd.name AND d.version'
         );
 
@@ -161 +163 @@
         $form_action = DOWNLOAD.'download.php';
 
+        ob_start();
 
 ?>
@@ -167 +170 @@
                 <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>
+                <h2 class="hn"><?php echo forum_htmlencode($cur_cat['description']) ?></h2>
+        </div>
+-->
+        <div class="main-content main-frm">
+
+<?php if (isset($cur_cat['description'])) : ?>  
+                        <div class="ct-box info-box">
+                                <h2 class="hn"><?php echo forum_htmlencode($cur_cat['description']) ?></h2>
+                        </div>
 <?php endif; ?>
-
-        <div class="main-content main-frm">
 
 <?php
@@ -184 +191 @@
                 {
                         $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']);
+                        
+                        $download_info_array = array($cat, sef_friendly($cur_cat['name']), $cur_download['id'], sef_friendly($cur_download['name']));
+                        
+                        $download_get_url = forum_link($forum_url['download_get'], $download_info_array);
+                        $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']);
+
+                        if ($cur_download['author'])
+                                $forum_page['download']['info'][] = $lang_download['Author'].' '.forum_htmlencode($cur_download['author']);
 
                         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']);
+                        $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>';
 
                         if ($cur_download['added'])
-                                $forum_page['info'][] = $lang_download['Added time'].' '.format_time($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);
+
                         
 ?>              
-                        <div class="ct-box data-box download">
+                        <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 if ($cur_download['description']) : ?>                    <p><?php echo forum_htmlencode($cur_download['description']) ?></p><?php endif; ?>
-                                <p><?php echo implode(' | ', $forum_page['info']) ?></p>
+                                <?php echo $forum_page['download']['description'] ?>
+                                <p><?php echo implode(' | ', $forum_page['download']['info']) ?></p>
                         </div>
 <?php
@@ -231 +246 @@
         require FORUM_ROOT.'footer.php';
 }
+elseif (isset($id))
+{
+
+        // Fetch list of downloads
+        $query = array(
+                'SELECT'        => 'd.id, d.name, d.cat, d.description, d.version, d.downloads, d.author, d.user_id, d.added, u.username, c.name as catname',
+                'FROM'          => 'downloads AS d',
+                'JOINS'         => array(
+                        array(
+                                'LEFT JOIN'             => 'users AS u',
+                                'ON'                    => 'd.user_id=u.id'
+                        ),
+                        array(
+                                'LEFT JOIN'             => 'downloads_cats AS c',
+                                'ON'                    => 'd.cat=c.id'
+                        ),
+                ),
+                '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 there are news in selected forums
+        if ($forum_db->num_rows($result) == 0)
+                message('Download not exists');
+
+        $cur_download = $forum_db->fetch_assoc($result);
+        
+        // Setup breadcrumbs
+        $forum_page['crumbs'] = array(
+                array($forum_config['o_board_title'], forum_link($forum_url['index'])),
+                array($lang_download['Downloads'], forum_link($forum_url['download'])),
+                array(forum_htmlencode($cur_download['catname']), forum_link($forum_url['download_cat'], array($cur_download['cat'], sef_friendly($cur_download['catname'])))),
+                array(forum_htmlencode($cur_download['name']), forum_link($forum_url['download_id'], array($cur_download['cat'], sef_friendly($cur_download['catname'], $id, sef_friendly($cur_download['name'])))))
+        );
+
+
+//      define('FORUM_PAGE_SECTION', 'management');
+        define('FORUM_PAGE', 'download');
+        define('FORUM_PAGE_TYPE', 'sectioned');
+        require FORUM_ROOT.'header.php';
+
+        ob_start();
+
+?>
+        <div class="main-head">
+                <h2 class="hn"><span><?php echo forum_htmlencode($cur_download['name']) ?></span></h2>
+        </div>
+
+        <div class="main-content main-frm">
+
+<?php
+
+
+                $version_string = (trim($cur_download['version']) == '') ? '' : ' v'.forum_htmlencode($cur_download['version']);
+                
+                $download_info_array = array($cur_download['cat'], sef_friendly($cur_download['catname']), $cur_download['id'], sef_friendly($cur_download['name']));
+                
+                $download_get_url = forum_link($forum_url['download_get'], $download_info_array);
+                $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']);
+
+                if ($cur_download['author'])
+                        $forum_page['download']['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>';
+
+                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);
+
+                
+?>              
+                        <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>
+                        </div>
+        </div>
+        <div class="main-foot">
+                <h2 class="hn"><span><?php echo forum_htmlencode($cur_download['name']) ?></span></h2>
+        </div>
+<?php
+        $tpl_temp = trim(ob_get_contents());
+        $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);
+        ob_end_clean();
+        // END SUBST - <!-- forum_main -->
+
+        require FORUM_ROOT.'footer.php';
+}
 else
 {
@@ -279 +393 @@
         require FORUM_ROOT.'header.php';
 
+        ob_start();
 
 ?>
@@ -299 +414 @@
                 while ($cur_cat = $forum_db->fetch_assoc($result))
                 {
+                        $forum_page['cat'] = array();
+                        $forum_page['cat']['info'] =  array();
                         
                         // Fetch list of downloads
@@ -311 +428 @@
                         
                         $files_count = $forum_db->result($result_downloads);
+        
+                        // Fetch list of downloads
+                        $query_last_added = array(
+                                'SELECT'        => 'd.id, d.name, d.version',
+                                'FROM'          => 'downloads AS d',
+                                'WHERE'         => 'd.cat='.$cur_cat['id'].' AND d.approved=1',
+                                'ORDER BY'      => 'd.added DESC',
+                                'LIMIT'         => 5
+                        );
+
+                        ($hook = get_hook('xn_portal_by_daris_nw_qr_get_news')) ? eval($hook) : null;
+                        $result_last_added = $forum_db->query_build($query_last_added) or error(__FILE__, __LINE__);
+
+                        $last_added = array();
+                        while ($cur_download = $forum_db->fetch_assoc($result_last_added))
+                                $last_added[] = '<a href="'.forum_link($forum_url['download_id'], array($cur_cat['id'], sef_friendly($cur_cat['name']), $cur_download['id'], sef_friendly($cur_download['name']))).'">'.forum_htmlencode($cur_download['name']).($cur_download['version'] != '' ? ' ('.forum_htmlencode($cur_download['version']).')' : '').'</a>';
+                        
+                        $forum_page['cat']['description'] = parse_message($cur_cat['description'], true);
+                        
+                        if (count($last_added))
+                                $forum_page['cat']['info'][] = $lang_download['Last added'].' '.implode(', ', $last_added);
+
 ?>              
                         <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; ?>
+                                <?php echo $forum_page['cat']['description'] ?>
+<?php if (count($forum_page['cat']['info'])) : ?>                               <p><?php echo implode(' | ', $forum_page['cat']['info']) ?></p><?php endif; ?>
                         </div>
 <?php

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

@@ -16 +16 @@
 
 $forum_url_portal = array(
-        'download'              => 'download/',
-        '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',
+        'download'                              => 'download/',
+        'download_cat'                  => 'download/$1/$2/',
+        'download_id'                   => 'download/$1/$2/$3/$4/',
+        'download_get'                  => 'download/$1/$2/$3/$4/get/',
+        'submit_download'               => 'download/submit/',
+        'submit_download_cat'   => 'download/submit/$1/$2/',
+        'admin_download'                => $portal_dir.'admin/download.php',
+        'admin_download_cats'   => $portal_dir.'admin/download_cats.php',
 
 );

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

@@ -18 +18 @@
         '/^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]+)\/.*?\/get\/$/i'            =>      'index.php?download&id=$2&get',
         '/^download\/([0-9]+)\/.*?\/([0-9]+)\/.*?\/$/i'                         =>      'index.php?download&id=$2',
         '/^download\/([0-9]+)\/.*?\/$/i'                                                        =>      'index.php?download&cat=$1',
         '/^download\/p(age)?\/?([0-9]+)\/$/i'                                           =>      'index.php?download&p=$2',
         '/^download(\.html?|\/)?$/i'                                                            =>      'index.php?download',
-        '/^download\/extensions[\/_-]?(.*?)(\.html?|\/)?$/i'            =>      'index.php?download&extension=$1',
 );
 

branches/download/lang/English/admin_download.php

@@ -55 +55 @@
 
 'Invalid extension'                                     => 'Invalid extension',
+
+// Categories
+'Download cats'                                         => 'Download cats', // menu
+
+'Edit category head'                            =>      'Edit category: %s',
+'Edit or delete'                                =>      '%s or %s',
+'Edit'                                                  =>      'Edit',
+'Delete'                                                =>      'Delete',
+'Category name'                                         =>      'Category name:',
+'Delete category'                                       =>      'Delete category',
+'Delete category warning'                       =>      'After deleting category you have to assign new category for each download in this category.',
+'Edit category'                                         =>      'Edit category',
+'Edit category details legend'          =>      'Category details:',
+'Add to category label'                 =>      'Add to category:',
+'Category description'                          =>      'Category description:',
+'Category description help'                             =>      'You may use BBCode in your description.',
+'Edit categorys head'                           =>      'Edit or delete category',
+'Edit category details head'            =>      'Edit category details',
+'Edit categories head'                          =>      'Edit categories',
+'Confirm delete category'                       =>      'You are deleting the category "%s"',
+'Add category'                                          =>      'Add category',
+'Add category head'                                     =>      'Add a new category',
+'Add category legend'                           =>      'Add category:',
+'Category added'                                        =>      'Category added.',
+'Category deleted'                                      =>      'Category deleted.',
+'Category updated'                                      =>      'Category updated.',
+'Must enter category message'           =>      'You must enter a category name.',
+
+'Categories'                                            =>      'Categories',
+
 );

branches/download/lang/English/download.php

@@ -9 +9 @@
 'No categories'                                 => 'There are no categories.',
 'Category list'                                 => 'Category list',
-'Files count'                                   => 'Files count: %s',
+'Files count'                                   => 'Files: %s',
 
 'New downloads'                                 => 'New downloads [%s]',
+'Submit download'                               => 'Submit download',
 
 'Download not found'                    => 'Download not found',
@@ -19 +20 @@
 'Author'                                                => 'Author:',
 'Added time'                                    => 'Added:',
+
+'Last added'                                    => 'Last added:',
 );

branches/download/submit_download.php

@@ -95 +95 @@
 require FORUM_ROOT.'header.php';
 
-
+ob_start();
 ?>
         <div class="main-head">