Changeset 667

Timestamp:

Dec 30, 2004, 9:10:46 AM (20 years ago)

Author:

plg

Message:

• bug fixed on upload : configuration variable $confupload_available has disappeared

• by default, new categories are not "uploadable"

• bug fixed on date displayed from Unix format : trying to find seconds while not provided

• bug fixed on admin/waiting template to center submit button

Location:

trunk

Files:

• include/config.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• template/default/admin/waiting.tpl (modified) (1 diff)
• upload.php (modified) (1 diff)

trunk/include/config.inc.php

@@ -171 +171 @@
 // newcat_default_uploadable : at creation, must a category be uploadable or
 // not ?
-$conf['newcat_default_uploadable'] = 'true';
+$conf['newcat_default_uploadable'] = 'false';
 
 // newcat_default_visible : at creation, must a category be visible or not ?

trunk/include/functions.inc.php

@@ -401 +401 @@
     case 'unix' :
     {
-      list($year,$month,$day,$hour,$minute,$second) =
+      list($year,$month,$day,$hour,$minute) =
         explode('.', date('Y.n.j.G.i', $date));
       break;

trunk/template/default/admin/waiting.tpl

@@ -34 +34 @@
     <!-- END picture -->
     <tr>
-      <td colspan="5" align="center">
+      <td colspan="6" align="center">
           <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
           </td>

trunk/upload.php

@@ -123 +123 @@
   $page['cat_name']       = $result['name'];
   $page['cat_uploadable'] = $result['uploadable'];
-if ( $page['cat_site_id'] != 1
-     or !$conf['upload_available']
-     or !$page['cat_uploadable'] )
-{
-  echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
-  echo '<a href="'.add_session_id( './category.php' ).'">';
-  echo $lang['thumbnails'].'</a></div>';
-  exit();
-}
+  if ($page['cat_site_id'] != 1 or !$page['cat_uploadable'])
+  {
+    echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
+    echo '<a href="'.add_session_id( './category.php' ).'">';
+    echo $lang['thumbnails'].'</a></div>';
+    exit();
+  }
 }