Changeset 345 for trunk/admin/cat_modify.php

Timestamp:

Feb 2, 2004, 1:55:18 AM (20 years ago)

Author:

gweltas

Message:

Merge of the 1.3.1 release
Creation of an unique include file (common.php)
Creation of an unique define file (include/constants.php)
Modification of the installation procedure

File:

• trunk/admin/cat_modify.php (modified) (5 diffs)

trunk/admin/cat_modify.php

@@ -41 +41 @@
   $query.= ';';
   $row = mysql_fetch_array( mysql_query( $query ) );
+  
+  $query = 'UPDATE '.PREFIX_TABLE.'categories';
+
+  $query.= ' SET name = ';
+  if ( $_POST['name'] == '' )
+    $query.= 'NULL';
+  else
+    $query.= "'".htmlentities( $_POST['name'], ENT_QUOTES)."'";
+
+  $query.= ', comment = ';
+  if ( $_POST['comment'] == '' )
+    $query.= 'NULL';
+  else
+    $query.= "'".htmlentities( $_POST['comment'], ENT_QUOTES )."'";
+
+  $query.= ", status = '".$_POST['status']."'";
+  $query.= ", visible = '".$_POST['visible']."'";
+
+  if ( isset( $_POST['uploadable'] ) )
+    $query.= ", uploadable = '".$_POST['uploadable']."'";
+
+  if ( isset( $_POST['associate'] ) )
+  {
+    $query.= ', id_uppercat = ';
+    if ( $_POST['associate'] == -1 or $_POST['associate'] == '' )
+      $query.= 'NULL';
+    else
+      $query.= $_POST['associate'];
+  }
+  $query.= ' WHERE id = '.$_GET['cat'];
+  $query.= ';';
+  mysql_query( $query );
 
   if ( $_POST['status'] != $row['status'] )
@@ -54 +86 @@
     $query.= ' WHERE cat_id = '.$_GET['cat'];
     mysql_query( $query );
-  }
-  
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-
-  $query.= ' SET name = ';
-  if ( $_POST['name'] == '' )
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities( $_POST['name'], ENT_QUOTES)."'";
-
-  $query.= ', comment = ';
-  if ( $_POST['comment'] == '' )
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities( $_POST['comment'], ENT_QUOTES )."'";
-
-  $query.= ", status = '".$_POST['status']."'";
-  $query.= ", visible = '".$_POST['visible']."'";
-
-  if ( isset( $_POST['uploadable'] ) )
-    $query.= ", uploadable = '".$_POST['uploadable']."'";
-
-  if ( isset( $_POST['associate'] ) )
-  {
-    $query.= ', id_uppercat = ';
-    if ( $_POST['associate'] == -1 ) $query.= 'NULL';
-    else                             $query.= $_POST['associate'];
-  }
-  $query.= ' WHERE id = '.$_GET['cat'];
-  $query.= ';';
-  mysql_query( $query );
+    // resynchronize all users
+    synchronize_all_users();
+  }
 
   // checking users favorites
@@ -112 +116 @@
 $query.= ';';
 $row = mysql_fetch_array( mysql_query( $query ) );
+
+if ( !isset( $row['dir'] ) ) $row['dir'] = '';
+if ( !isset( $row['id_uppercat'] ) ) $row['id_uppercat'] = '';
+
 $result = get_cat_info( $row['id'] );
 // cat name
@@ -136 +144 @@
 }
 $vtp->setVar( $sub, 'name',    $row['name'] );
+if ( !isset( $row['comment'] ) ) $row['comment'] = '';
 $vtp->setVar( $sub, 'comment', $row['comment'] );
 // status : public, private...
@@ -204 +213 @@
 {
   $vtp->addSession( $sub, 'parent' );
-  $vtp->addSession( $sub, 'associate_cat' );
-  $vtp->setVar( $sub, 'associate_cat.value', '-1' );
-  $vtp->setVar( $sub, 'associate_cat.content', '' );
-  $vtp->closeSession( $sub, 'associate_cat' );
-  $structure = create_structure( '', array() );
-  display_categories( $structure, ' ', $row['id_uppercat'], $row['id'] );
+  // We only show a List Of Values if the number of categories is less than
+  // $conf['max_LOV_categories']
+  $query = 'SELECT COUNT(id) AS nb_total_categories';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ';';
+  $countrow = mysql_fetch_array( mysql_query( $query ) );
+  if ( $countrow['nb_total_categories'] < $conf['max_LOV_categories'] )
+  {
+    $vtp->addSession( $sub, 'associate_LOV' );
+    $vtp->addSession( $sub, 'associate_cat' );
+    $vtp->setVar( $sub, 'associate_cat.value', '-1' );
+    $vtp->setVar( $sub, 'associate_cat.content', '' );
+    $vtp->closeSession( $sub, 'associate_cat' );
+    $page['plain_structure'] = get_plain_structure( true );
+    $structure = create_structure( '', array() );
+    display_categories( $structure, '&nbsp;', $row['id_uppercat'],$row['id'] );
+    $vtp->closeSession( $sub, 'associate_LOV' );
+  }
+  // else, we only display a small text field, we suppose the administrator
+  // knows the id of its category
+  else
+  {
+    $vtp->addSession( $sub, 'associate_text' );
+    $vtp->setVar( $sub, 'associate_text.value', $row['id_uppercat'] );
+    $vtp->closeSession( $sub, 'associate_text' );
+  }
   $vtp->closeSession( $sub, 'parent' );
 }