Changeset 2585

Timestamp:

Sep 25, 2008, 2:30:42 AM (16 years ago)

Author:

rvelices

Message:

• some checks for admins that are advisers (no write access)
• send the charset in http header for web services
• tag name becomes an xml attribute instead of content for tags.getList and related tags in images.getInfo (more logical and coherent with tags.getAdminList)

Location:

trunk

Files:

• admin/menubar.php (modified) (2 diffs)
• admin/template/goto/menubar.tpl (modified) (1 diff)
• include/ws_core.inc.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (10 diffs)

trunk/admin/menubar.php

@@ -65 +65 @@
 }
 
-if ( isset($_POST['reset']) )
+if ( isset($_POST['reset']) and !is_adviser())
 {
   $mb_conf = array();
@@ -86 +86 @@
 
 
-if ( isset($_POST['submit']) )
+if ( isset($_POST['submit']) and !is_adviser() )
 {
   foreach ( $mb_conf as $id => $pos )

trunk/admin/template/goto/menubar.tpl

@@ -25 +25 @@
 </table>
 <p>
-        <input type="submit" name="submit" value="{'Submit'|@translate}" >
-        <input type="submit" name="reset" value="{'Reset'|@translate}" >
+        <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/>
+        <input type="submit" name="reset" value="{'Reset'|@translate}" {$TAG_INPUT_ENABLED}/>
 </p>
 </form>

trunk/include/ws_core.inc.php

@@ -370 +370 @@
     $contentType = $this->_responseEncoder->getContentType();
 
-    @header('Content-Type: '.$contentType);
+    @header('Content-Type: '.$contentType.'; charset='.get_pwg_charset());
     print_r($encodedResponse);
   }

trunk/include/ws_functions.inc.php

@@ -476 +476 @@
     $row['nb_images'] = isset($nb_images_of[$id]) ? $nb_images_of[$id] : 0;
     array_push($cats, $row);
-  }   
-  
+  }
+
   usort($cats, 'global_rank_compare');
   return array(
@@ -722 +722 @@
   $ret['rates'] = array( WS_XML_ATTRIBUTES => $rating );
   $ret['categories'] = new PwgNamedArray($related_categories, 'category', array('id','url', 'page_url') );
-  $ret['tags'] = new PwgNamedArray($related_tags, 'tag', array('id','url_name','url','page_url') );
+  $ret['tags'] = new PwgNamedArray($related_tags, 'tag', array('id','url_name','url','name','page_url') );
   if ( isset($comment_post_data) )
   {
@@ -976 +976 @@
 
   list($width, $height) = getimagesize($file_path);
-  
+
   // database registration
   $insert = array(
@@ -1026 +1026 @@
     $rank_on_category = array();
     $search_current_ranks = false;
-    
+
     $tokens = explode(';', $params['categories']);
     foreach ($tokens as $token)
@@ -1033 +1033 @@
 
       array_push($cat_ids, $cat_id);
-      
+
       if (!isset($rank))
       {
@@ -1106 +1106 @@
       );
   }
-  
+
   invalidate_user_cache();
 
@@ -1190 +1190 @@
       );
   }
-  return array('tags' => new PwgNamedArray($tags, 'tag', array('id','url_name','url', 'counter' )) );
+  return array('tags' => new PwgNamedArray($tags, 'tag', array('id','url_name','url', 'name', 'counter' )) );
 }
 
@@ -1206 +1206 @@
     return new PwgError(401, 'Access denied');
   }
-  
+
   $tags = get_all_tags();
   return array(
@@ -1366 +1366 @@
 function ws_categories_add($params, &$service)
 {
-  if (!is_admin())
+  if (!is_admin() or is_adviser())
   {
     return new PwgError(401, 'Access denied');
@@ -1382 +1382 @@
     return new PwgError(500, $creation_output['error']);
   }
-  
+
   return $creation_output;
 }