Changeset 1158 in ExiteCMS for trunk/downloads.php

Timestamp:

12/03/07 21:40:54 (4 years ago)

Author:

hverton

Message:

added a locale type selection per module
fixed typo from 404handler.php
updated English language pack
fixed not being able to move a post to a thread in the same forum.post.move.tpl
getusergroups() now returns the array ordered by name
upgraded tiny_mce to version 2.1.3

File:

• trunk/downloads.php (modified) (3 diffs)

trunk/downloads.php

@@ -44 +44 @@
 
 // compose the query where clause based on the localisation method choosen
-switch ($settings['localisation_method']) {
+switch ($settings['download_localisation']) {
     case "none":
         $where = "";
@@ -91 +91 @@
 }
 
+if (isset($cat_id)) {
+    // get the selected category, and all sub-categories of the requested download category
+    $variables['subcats'] = true;
+    $result = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_cat_id='$cat_id'");
+    if (dbrows($result) == 0) {
+        // not found. pretend none was given
+        unset($cat_id);
+    } else {
+        $variables['parent'] = dbarray($result);
+        $result = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_parent='$cat_id' AND ".groupaccess('download_cat_access')." ORDER BY ".$variables['parent']['download_cat_cat_sorting']);
+    }
+}
+
 if (!isset($cat_id)) {
     // get all root categories
@@ -99 +112 @@
         $variables['parent'] = array('download_cat_access' => 0, 'download_cat_sorting' => 'download_id DESC'); 
         $cat_id = 0;
+    } else {
+        die('oops');
     }
-} else {
-    // get the selected category, and all sub-categories of the requested download category
-    $variables['subcats'] = true;
-    $result = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_cat_id='$cat_id'");
-    if (dbrows($result) == 0) {
-        redirect("downloads.php");
-        exit;
-    }
-    $variables['parent'] = dbarray($result);
-    $result = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_parent='$cat_id' AND ".groupaccess('download_cat_access')." ORDER BY ".$variables['parent']['download_cat_cat_sorting']);
 }
 // fill the download_cats array with the result
 $variables['cats_count'] = dbrows($result);
 $variables['download_cats'] = array();
-while ($result && $data = dbarray($result)) {
-    $data['download_count'] = countdownloads($data['download_cat_id']);
-    $variables['download_cats'][] = $data;
+if ($variables['cats_count'] != 0) {
+    while ($data = dbarray($result)) {
+        $data['download_count'] = countdownloads($data['download_cat_id']);
+        $variables['download_cats'][] = $data;
+    }
 }