Changeset 8651 for trunk/include

Timestamp:

Jan 13, 2011, 4:24:18 PM (13 years ago)

Author:

plg

Message:

feature 2108 added: user upload removed from core. It will come back as a
"new generation" user upload in the Community plugin.

Location:

trunk/include

Files:

• config_default.inc.php (modified) (2 diffs)
• constants.php (modified) (1 diff)
• functions_notification.inc.php (modified) (7 diffs)

trunk/include/config_default.inc.php

@@ -121 +121 @@
 // or not ?
 $conf['newcat_default_commentable'] = true;
-
-// newcat_default_uploadable : at creation, must a category be uploadable or
-// not ?
-$conf['newcat_default_uploadable'] = false;
 
 // newcat_default_visible : at creation, must a category be visible or not ?
@@ -556 +552 @@
 // If false it'll be redirected from index.php to identification.php
 $conf['guest_access'] = true;
-
-// +-----------------------------------------------------------------------+
-// |                                upload                                 |
-// +-----------------------------------------------------------------------+
-
-// upload_maxfilesize: maximum filesize for the uploaded pictures. In
-// kilobytes.
-$conf['upload_maxfilesize'] = 200;
-
-// upload_maxheight: maximum height authorized for the uploaded images. In
-// pixels.
-$conf['upload_maxheight'] = 800;
-
-// upload_maxwidth: maximum width authorized for the uploaded images. In
-// pixels.
-$conf['upload_maxwidth'] = 800;
-
-// upload_maxheight_thumbnail: maximum height authorized for the uploaded
-// thumbnails
-$conf['upload_maxheight_thumbnail'] = 128;
-
-// upload_maxwidth_thumbnail: maximum width authorized for the uploaded
-// thumbnails
-$conf['upload_maxwidth_thumbnail'] = 128;
 
 // +-----------------------------------------------------------------------+

trunk/include/constants.php

@@ -78 +78 @@
 if (!defined('USER_FEED_TABLE'))
   define('USER_FEED_TABLE', $prefixeTable.'user_feed');
-if (!defined('WAITING_TABLE'))
-  define('WAITING_TABLE', $prefixeTable.'waiting');
 if (!defined('RATE_TABLE'))
   define('RATE_TABLE', $prefixeTable.'rate');

trunk/include/functions_notification.inc.php

@@ -55 +55 @@
  *
  * @param string action ('count' or 'info')
- * @param string type of query ('new_comments', 'unvalidated_comments', 'new_elements', 'updated_categories', 'new_users', 'waiting_elements')
+ * @param string type of query ('new_comments', 'unvalidated_comments', 'new_elements', 'updated_categories', 'new_users')
  * @param string start (mysql datetime format)
  * @param string end (mysql datetime format)
@@ -146 +146 @@
 ;';
       break;
-    case 'waiting_elements':
-      $query = '
-  FROM '.WAITING_TABLE.'
-  WHERE validated = \'false\'
-;';
-      break;
     default:
       // stop this function and return nothing
@@ -177 +171 @@
         case 'new_users':
           $field_id = 'user_id';
-          break;
-        case 'waiting_elements':
-          $field_id = 'id';
           break;
     }
@@ -206 +197 @@
           $fields = array('user_id');
           break;
-        case 'waiting_elements':
-          $fields = array('id');
-          break;
       }
 
@@ -345 +333 @@
 {
   return custom_notification_query('info', 'new_users', $start, $end);
-}
-
-/**
- * currently waiting pictures
- *
- * @return count waiting ids
- */
-function nb_waiting_elements()
-{
-  return custom_notification_query('count', 'waiting_elements', '', '');
-}
-
-/**
- * currently waiting pictures
- *
- * @return array waiting ids
- */
-function waiting_elements()
-{
-  return custom_notification_query('info', 'waiting_elements', $start, $end);
 }
 
@@ -387 +355 @@
           (nb_updated_categories($start, $end) > 0) or
           ((is_admin()) and (nb_unvalidated_comments($start, $end) > 0)) or
-          ((is_admin()) and (nb_new_users($start, $end) > 0)) or
-          ((is_admin()) and (nb_waiting_elements() > 0))
+          ((is_admin()) and (nb_new_users($start, $end) > 0)))
         );
 }
@@ -454 +421 @@
         nb_new_users($start, $end), '%d new user', '%d new users',
         get_root_url().'admin.php?page=user_list', $add_url );
-
-    add_news_line( $news,
-        nb_waiting_elements(), '%d waiting element', '%d waiting elements',
-        get_root_url().'admin.php?page=upload', $add_url );
   }