Changeset 129

Timestamp:

07/20/10 03:25:54 (7 weeks ago)

Author:

admin

Message:

The latest and greatest development snapshot.

Location:

mediamosa_snapshot_2-x/sites/all/modules

Files:

• mediamosa/CHANGELOG.txt (modified) (1 diff)
• mediamosa/core/user/mediamosa_user.inc (modified) (1 diff)
• mediamosa/maintenance/browse/mediamosa_maintenance_browse_restcalls.inc (modified) (2 diffs)
• mediamosa/mediamosa.inc (modified) (1 diff)
• mediamosa/mediamosa.info (modified) (1 diff)
• mediamosa/mediamosa.version.inc (modified) (1 diff)
• mediamosa/modules/collection/mediamosa_collection.rest.inc (modified) (1 diff)
• mediamosa/modules/user/mediamosa_user.module (modified) (1 diff)
• mediamosa_connector/mediamosa_connector.class.inc (modified) (2 diffs)

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/CHANGELOG.txt

@@ -39 +39 @@
   user.
 - Added extra tests for search on metadata dates.
+- /user/user_id will now return quota even if user_id has no quota information.
+  Old behavour would return invalid user Id error when no quota was available.
+  But then you can never get quota information when you haven't uploaded
+  anything yet.
+- Fixed maxlength on title for collection creation, was unlimited.
+- Max length is now shown correctly in REST calls browser.
 - Fixed bug in mediamosa.profile where output of error messages was not 
   complete.

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/core/user/mediamosa_user.inc

@@ -300 +300 @@
     )->fetchField();
 
-    if (!$total) {
-      throw new mediamosa_exception_error_userman_invalid_user(array('@user_id' => $user_id));
-    }
+    // Removed: new users that havent created anything will not be able to see
+    // its quota.
+    //if (!$total) {
+    //  throw new mediamosa_exception_error_userman_invalid_user(array('@user_id' => $user_id));
+    //}
 
     // Get the user.

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/maintenance/browse/mediamosa_maintenance_browse_restcalls.inc

@@ -271 +271 @@
         t('Required'),
         isset($item[mediamosa_rest_call::VAR_DEFAULT_VALUE]) ? $item[mediamosa_rest_call::VAR_DEFAULT_VALUE] : '',
-        '-',
+        isset($item[mediamosa_rest_call::VAR_RANGE_END]) ? $item[mediamosa_rest_call::VAR_RANGE_END] : '-',
       );
     }
@@ -290 +290 @@
         t('Optional'),
         isset($item[mediamosa_rest_call::VAR_DEFAULT_VALUE]) ? $item[mediamosa_rest_call::VAR_DEFAULT_VALUE] : '',
-        '-',
+        isset($item[mediamosa_rest_call::VAR_RANGE_END]) ? $item[mediamosa_rest_call::VAR_RANGE_END] : '-',
       );
     }

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/mediamosa.inc

@@ -85 +85 @@
 
   // ------------------------------------------------------------------ Static Functions.
-    /**
+  /**
    * Retrieve the main response object.
    * Must overridden in any child class.

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/mediamosa.info

@@ -3 +3 @@
 description = "Open source media management and distribution platform."
 package = "MediaMosa - Core"
-version = "2.2.0.699:75eaea4a823a"
+version = "2.2.0.702:643ad72d7874"
 core = 7.x
 

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/mediamosa.version.inc

@@ -48 +48 @@
   const MEDIAMOSA_VERSION_2_2_0 = '2.2.0';
 
-  const MEDIAMOSA_VERSION = '2.2.0.699:75eaea4a823a';
+  const MEDIAMOSA_VERSION = '2.2.0.702:643ad72d7874';
 
   // Used for APPs.

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/modules/collection/mediamosa_collection.rest.inc

@@ -480 +480 @@
           self::VAR_TYPE => mediamosa_type::TYPE_STRING,
           self::VAR_DESCRIPTION => 'The title of the new collection.',
+          self::VAR_RANGE_END => mediamosa_collection_db::TITLE_LENGTH,
         ),
         self::DESCRIPTION => array(

mediamosa_snapshot_2-x/sites/all/modules/mediamosa/modules/user/mediamosa_user.module

@@ -36 +36 @@
     mediamosa_rest_call::TITLE => 'Get a list of users.',
     mediamosa_rest_call::EXAMPLE_REQUEST => '/user?limit=10&offset=0 [GET] ',
-    mediamosa_rest_call::DESCRIPTION => 'With this call you get a list of all known users. User integrity is not forced in Mediamosa, but rather left to the application builder. There is however some basic knowledge of users. The /user... restcalls can be used to store basic user data. So if you create an asset whit a user, this will succeed regardless the user exists in the userlist. The main purpose for the user lists in MediaMosa is the storage of the quotum per user/group.
+    mediamosa_rest_call::DESCRIPTION => 'With this call you get a list of all known users. User integrity is not forced in Mediamosa, but rather left to the application builder. There is however some basic knowledge of users. The /user... restcalls can be used to store basic user data. So if you create an asset with a user, this will succeed regardless the user exists in the userlist. The main purpose for the user lists in MediaMosa is the storage of the quotum per user/group.
 
 This call returns all users which are created with /user/create and searches for all users who created objects (assets, mediafiles, collections). If the user has some quota information, this is added to the output.',

mediamosa_snapshot_2-x/sites/all/modules/mediamosa_connector/mediamosa_connector.class.inc

@@ -354 +354 @@
 
   public function check_result($response, $ok = NULL, $error = NULL) {
-    $result_id = (int)$response->xml->header->request_result_id;
+    $result_id = $response ? (int)$response->xml->header->request_result_id : 0;
 
     if ($result_id != self::ERRORCODE_OKAY && $result_id != self::ERRORCODE_EMPTY_RESULT) {
@@ -371 +371 @@
     return TRUE;
   }
+
+  /**
+   * Simple function to correctly convert simplexml to array.
+   *
+   * @param object $xml
+   */
+  private static function _simplexml2array($xml) {
+    $xml_copy = $xml;
+    if (get_class($xml) == 'SimpleXMLElement') {
+      foreach($xml->attributes() as $key => $value) {
+        if ($value) {
+          $attributes[$key] = (string)$value;
+        }
+      }
+
+      $xml = get_object_vars($xml);
+    }
+
+    if (is_array($xml)) {
+      if (empty($xml)) {
+        return (string)$xml_copy;
+      }
+
+      $result = array();
+      foreach($xml as $key => $value) {
+        $result[$key] = self::_simplexml2array($value);
+      }
+
+      return $result;
+    }
+
+    return (string)$xml;
+  }
+
+  /**
+   * Basicly the same as simplexml2array, with the exception that it will fix
+   * the problem with single and multi items where a single item will end up
+   * in a non-indexed array and multi items will.
+   *
+   * @param object $xml
+   */
+  public static function responsexml2array($xml) {
+
+    // Convert to nice array.
+    $a_xml = self::_simplexml2array($xml);
+
+    if (!isset($a_xml['items']['item'])) {
+      return $a_xml;
+    }
+
+    // Fix the problem with 1 or 2+ items in array.
+    $a_tmp = isset($a_xml['items']['item'][0]) ? $a_xml['items']['item'] : array(0 => $a_xml['items']['item']);
+    unset($a_xml['items']);
+    $a_xml['items']['item'] = $a_tmp;
+
+    return $a_xml;
+  }
+
+  /**
+   * Correctly convert to array and return the items object from the mediamosa
+   * response as array.
+   *
+   * @param object $response
+   */
+  public static function response2array($response) {
+    return self::responsexml2array($response->xml);
+  }
 }