Changeset 1509 in ExiteCMS for branches/PLi-Fusion/administration/site_links.php

Timestamp:

07/02/08 18:27:06 (4 years ago)

Author:

hverton

Message:

Merged trunk revisions 1408:1508 into the PLi-Fusion branch

File:

• branches/PLi-Fusion/administration/site_links.php (modified) (4 diffs)

branches/PLi-Fusion/administration/site_links.php

@@ -128 +128 @@
 +----------------------------------------------------*/
 
+// display a status panel
+if (isset($status)) {
+    if ($status == "del") {
+        $variables['message'] = $locale['401'];
+    } else {
+        $variables['message'] = "UNKNOWN STATUS PASSED!";
+    }
+    // define the message panel variables
+    $variables['bold'] = true;
+    $template_panels[] = array('type' => 'body', 'name' => 'admin.site_links.status', 'title' => $locale['400'], 'template' => '_message_table_panel.tpl');
+    $template_variables['admin.site_links.status'] = $variables;
+    $variables = array();
+}
+
 // generate the list of installed menu panels
 $variables['panel_list'] = array();
@@ -137 +151 @@
 }
 sort($variables['panel_list']);
-
-// display a status panel
-if (isset($status)) {
-    if ($status == "del") {
-        $variables['message'] = $locale['401'];
-    } else {
-        $variables['message'] = "UNKNOWN STATUS PASSED!";
-    }
-    // define the message panel variables
-    $variables['bold'] = true;
-    $template_panels[] = array('type' => 'body', 'name' => 'admin.site_links.status', 'title' => $locale['400'], 'template' => '_message_table_panel.tpl');
-    $template_variables['admin.site_links.status'] = $variables;
-    $variables = array();
-}
 
 // default panel title
@@ -209 +209 @@
             // if the parent has changed, calculate a new link order
             if ($data['link_parent'] != $link_parent) {
-                $link_order = dbresult(dbquery("SELECT MAX(link_order) FROM ".$db_prefix."site_links WHERE panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where)).""),0)+1;
+                $link_order = dbfunction("MAX(link_order)", "site_links", "panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where))."")+1;
             } else {
                 // link changed?
@@ -222 +222 @@
             // get a linkorder if none given
             if (!$link_order) {
-                $link_order = dbresult(dbquery("SELECT MAX(link_order) FROM ".$db_prefix."site_links WHERE panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where)).""),0)+1;
+                $link_order = dbfunction("MAX(link_order)","site_links","panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where))."")+1;
             }
             $result = dbquery("UPDATE ".$db_prefix."site_links SET link_order=link_order+1 WHERE panel_name = '$panel_filename' AND link_parent='$link_parent' AND link_order >= '$link_order'".($where==""?"":(" AND ".$where))."");