Changeset 825 for trunk/admin/include/functions.php

Timestamp:

Aug 18, 2005, 7:59:00 PM (19 years ago)

Author:

plg

Message:

• improvement : screen admin/picture_modify rewritten. Presentation copied from admin/cat_modify : fieldsets regroup fields. Ability to synchronize metadata for the displayed item.

• bug 110 fixed : "return to element view from element edition fails depending on permissions". If a reachable (for the connected admin) category is available, a "jump to" link is displayed, by default, using the category given in URL.

• bug fixed : in mass_updates function, the first item of $fieldsupdate has not always 0 for id (as in any array).

• modification : get_keywords function understands spaces as separator, allow less than 3 chars keywords, allow quotes.

• new : ability to allow HTML in picture or category description (false by default)

File:

• trunk/admin/include/functions.php (modified) (3 diffs)

trunk/admin/include/functions.php

@@ -583 +583 @@
 }
 
-// get_keywords returns an array with relevant keywords found in the string
-// given in argument. Keywords must be separated by comma in this string.
-// keywords must :
-//   - be longer or equal to 3 characters
-//   - not contain ', " or blank characters
-//   - unique in the string ("test,test" -> "test")
-function get_keywords( $keywords_string )
-{
-  $keywords = array();
-
-  $candidates = explode( ',', $keywords_string );
-  foreach ( $candidates as $candidate ) {
-    if ( strlen($candidate) >= 3 and !preg_match( '/(\'|"|\s)/', $candidate ) )
-      array_push( $keywords, $candidate );
-  }
-
-  return array_unique( $keywords );
+/**
+ * returns an array with relevant keywords found in the given string.
+ *
+ * Keywords must be separated by comma or space characters.
+ *
+ * @param string keywords_string
+ * @return array
+ */
+function get_keywords($keywords_string)
+{
+  return
+    array_unique(
+      preg_split(
+        '/[\s,]+/',
+        $keywords_string
+        )
+      );
 }
 
@@ -743 +743 @@
 UPDATE '.$tablename.'
   SET ';
+      $is_first = true;
       foreach ($dbfields['update'] as $num => $key)
       {
-        if ($num >= 1)
+        if (!$is_first)
         {
           $query.= ",\n      ";
         }
         $query.= $key.' = ';
-        if (isset($data[$key]))
+        if (isset($data[$key]) and $data[$key] != '')
         {
           $query.= '\''.$data[$key].'\'';
@@ -758 +759 @@
           $query.= 'NULL';
         }
+        $is_first = false;
       }
       $query.= '