Changeset 11063

Timestamp:

Mar 19, 2009, 4:51:47 PM (13 years ago)

Author:

ShogoKawahara

Message:

#3409:fixed ApplicationPeer::addApplication() for the internationalization

Location:

OpenPNE3/plugins/opOpenSocialPlugin/trunk

Files:

• apps/pc_backend/modules/opOpenSocialPlugin/actions/actions.class.php (modified) (1 diff)
• apps/pc_frontend/modules/application/actions/actions.class.php (modified) (1 diff)
• apps/pc_frontend/modules/application/actions/components.class.php (modified) (1 diff)
• lib/model/Application.php (modified) (3 diffs)
• lib/model/ApplicationPeer.php (modified) (6 diffs)
• lib/user/opJsonDbOpensocialService.class.php (modified) (1 diff)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_backend/modules/opOpenSocialPlugin/actions/actions.class.php

@@ -93 +93 @@
         try
         {
-          $application = ApplicationPeer::addApplication($contact['application_url'], $this->getUser()->getCulture(),true);
+          $application = ApplicationPeer::addApplication($contact['application_url'], true);
         }
         catch (Exception $e)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/actions/actions.class.php

@@ -89 +89 @@
       try
       {
-        $application = ApplicationPeer::addApplication($contact['application_url'],$this->getUser()->getCulture());
+        $application = ApplicationPeer::addApplication($contact['application_url']);
       }
       catch (Exception $e)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/actions/components.class.php

@@ -113 +113 @@
     try
     {
-      $application = ApplicationPeer::addApplication($url, $this->getUser()->getCulture());
+      $application = ApplicationPeer::addApplication($url);
       if (!$application)
       {

OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/model/Application.php

@@ -18 +18 @@
 class Application extends BaseApplication
 {
- /**
-  * hasSetting
-  *
-  * @return boolean
-  */
+  public function hydrate($row, $startcol = 0, $rehydrate = false)
+  {
+    $result = parent::hydrate($row, $startcol, $rehydrate);
+
+    if ($this->getCurrentApplicationI18n()->isNew())
+    {
+      $this->setCulture(sfConfig::get('sf_default_culture'));
+    }
+
+    return $result;
+  }
+
+  /**
+   * hasSetting
+   *
+   * @return boolean
+   */
   public function hasSetting()
   {
@@ -40 +52 @@
   }
 
- /**
-  * getSettings 
-  * 
-  * @param  string $culture
-  * @return array
-  */
+  /**
+   * getSettings 
+   * 
+   * @param  string $culture
+   * @return array
+   */
   public function getSettings($culture = null)
   {
@@ -51 +63 @@
   }
 
- /**
-  * count installed member 
-  *
-  * @return integer
-  */
+  /**
+   * count installed member 
+   *
+   * @return integer
+   */
   public function countInstalledMember()
   {
     $criteria = new Criteria();
-    $criteria->add(MemberApplicationPeer::APPLICATION_ID, parent::getId());
     $criteria->add(MemberApplicationPeer::IS_GADGET, false);
-    return MemberApplicationPeer::doCount($criteria);
+    return $this->countMemberApplications($criteria);
   }
 }
+

OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/model/ApplicationPeer.php

@@ -40 +40 @@
    *
    * @param string $url     gadget url
+   * @param bool   $update
    * @param string $culture culture 
-   * @param bool   $update
    * @return Application application object  
    */
-  public static function addApplication($url, $culture = 'en_US', $update = false)
+  public static function addApplication($url, $update = false, $culture = null)
   {
+    if (is_null($culture))
+    {
+      $culture = sfContext::getInstance()->getUser()->getCulture();
+    }
+
+    if ($culture != sfConfig::get('sf_default_culture'))
+    { 
+      self::addApplication($url, $update, sfConfig::get('sf_default_culture'));
+    }
+
     $app = self::retrieveByUrl($url);
-    if (!empty($app) && !$update)
+    if (!$app)
+    {
+      $app = new Application();
+    }
+    $app->setCulture($culture);
+
+    if (!($app->getCurrentApplicationI18n()->isNew() || $update))
     {
       $ua = $app->getUpdatedAt('U');
@@ -58 +74 @@
     $req = self::arrayToObject(array(
       'context' => array(
-        'country' => isset($cul[1]) ? $cul[1] : 'US',
+        'country' => isset($cul[1]) ? $cul[1] : 'All',
         'language' => $cul[0],
         'view' => 'default',
@@ -77 +93 @@
     }
     $gadget = $response[0];
-    if (empty($app))
-    {
-      $app = new Application();
-    }
     $app->setUrl($gadget['url']);
-
     $app->setTitle($gadget['title']);
     $app->setTitleUrl($gadget['titleUrl']);
@@ -116 +127 @@
     }
     $app->setHeight(! empty($gadget['height']) ? $gadget['height'] : '0');
-    $iframe_url = $gadget['iframeUrl'];
-    $iframe_params = array();
-    parse_str($iframe_url, $iframe_params);
-    $app->setVersion(isset($iframe_params['v']) ? $iframe_params['v'] : '');
     $app->save();
     return $app;
@@ -160 +167 @@
    * @return Application The application instance
    */
-  public static function updateApplication($modId, $culture = 'en_US')
+  public static function updateApplication($modId, $culture = null)
   {
+    if (is_null($culture))
+    {
+      $culture = sfContext::getInstance()->getUser()->getCulture();
+    }
+
     $app = self::retrieveByPk($modId);
     if (!$app)
@@ -170 +182 @@
     try
     {
-      return self::addApplication($app->getUrl(), $culture, true);
+      return self::addApplication($app->getUrl(), true, $culture);
     }
     catch (Exception $e)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/user/opJsonDbOpensocialService.class.php

@@ -72 +72 @@
       }
       $p['profileUrl']   = sfContext::getInstance()->getController()->genUrl("@member_profile?id=".$member->getId(),true);
-      $memberProfiles = MemberProfilePeer::getProfileListByMemberId($member->getId());
+      $memberProfiles = $member->getProfile(true, $token->getViewerId());
       foreach ($memberProfiles as $memberProfile)
       {