fix admin_images (crash), improve it

[wfpl-cms.git] / admin_images.php

diff --git a/admin_images.php b/admin_images.php
index 2a5ae51..e9d3169 100644 (file)
--- a/admin_images.php
+++ b/admin_images.php
@@ -2,7 +2,7 @@
 
 # This form requires wfpl. See: http://sametwice.com/wfpl
 
-define('ADMIN_IMAGES_DB_FIELDS', 'image,name,caption,sizes');
+define('ADMIN_IMAGES_DB_FIELDS', 'image,name,caption');
 
 require_once(DOCROOT . 'inc/wfpl/format.php');
 require_once(DOCROOT . 'inc/wfpl/upload.php');
@@ -70,11 +70,6 @@ function admin_images_main() {
                return admin_images_main_listing();
        }
 
-       $id = _REQUEST_cut('id');
-       if($id) {
-               return admin_images_main_display($id);
-       }
-
        if(isset($_POST['name'])) {
                return admin_images_main_form();
        }
@@ -83,28 +78,8 @@ function admin_images_main() {
        return admin_images_main_listing();
 }
 
-function admin_images_main_display($id) {
-       $data = db_get_assoc('cms_images', 'id,'.ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id);
-       if(!$data) {
-               message("Error: Broken Link (Image #$id not found)");
-               return './admin_images';
-       }
-
-       # Find pages that have this image on it
-       if($data['image']) {
-               $references = db_get_assocs('cms_pages', 'title,filename', 'where content like "%%%s%%" order by concat(nav_title,title)', substr(enc_image_src($data['image']), 0, -4));
-               if($references) {
-                       $data['references'] = array(
-                               'data' => $references,
-                               'count' => count($references));
-               }
-       }
-
-       tem_set('display', $data);
-}
-
 function admin_images_main_delete($id) {
-       $data = db_get_assoc('cms_images', 'image,sizes', 'where id=%i', $id);
+       $data = db_get_assoc('cms_images', 'image', 'where id=%i', $id);
        if ($data) {
                $src = enc_image_src($data['image']);
                if ($src) {
@@ -162,21 +137,21 @@ function admin_images_main_form($id = false) {
                        db_update_assoc('cms_images', $data, 'where id=%i', $id);
                        message('Image updated.');
                        $saved_id = $id;
+                       return "./admin_images";
                } else {
+                       $data['created_at'] = time();
                        db_insert_assoc('cms_images', $data);
                        message('Image saved. Next time you open a page editor, this image will be availble in the "Insert Image" dialog.');
                        $saved_id = db_auto_id();
+                       return "./admin_images?sort=age";
                }
 
-               # return user to display page where they can see instructions, etc
-               return "./admin_images";
-
        } elseif($id) {
                # we've recieved an edit id, but no data. So we grab the values to be edited from the database
                $data = db_get_assoc('cms_images', ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id);
        } else {
                # form not submitted, set default values:
-               $data = array('sizes' => '275x500');
+               $data = array();
        }
 
        tem_set('upload_max_filesize', upload_max_filesize());