Finish api/statusnet/groups/update

diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php
index 0d3620c265382dda76dff68dfe224b6f95b85190..6ac4b5a4b56894aa9f2bcded6ed1d71c58c68633 100644 (file)
--- a/actions/apigroupprofileupdate.php
+++ b/actions/apigroupprofileupdate.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR . '/lib/apiauth.php';
 
-class ApiValidationException extends Exception { }
-
 /**
  * API analog to the group edit page
  *
@@ -62,6 +60,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
         parent::prepare($args);
 
         $this->nickname    = common_canonical_nickname($this->trimmed('nickname'));
+
         $this->fullname    = $this->trimmed('fullname');
         $this->homepage    = $this->trimmed('homepage');
         $this->description = $this->trimmed('description');
@@ -172,12 +171,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             $this->serverError(_('Could not update group.'));
         }
 
-        $aliases = null;
+        $aliases = array();
 
         try {
 
-            if (!empty($this->aliasstring)) {
-                $aliases = $this->parseAliases();
+                       if (!empty($this->aliasstring)) {
+                               $aliases = $this->validateAliases();
             }
 
         } catch (ApiValidationException $ave) {
@@ -195,7 +194,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             $this->serverError(_('Could not create aliases.'));
         }
 
-        if (!empty($this->nickname) && $this->nickname != $orig->nickname) {
+        if (!empty($this->nickname) && ($this->nickname != $orig->nickname)) {
             common_log(LOG_INFO, "Saving local group info.");
             $local = Local_group::staticGet('group_id', $this->group->id);
             $local->setNickname($this->nickname);
@@ -260,6 +259,8 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
                 _('Not a valid nickname.')
             );
         }
+
+               return true;
     }
 
     function validateHomepage()
@@ -319,10 +320,6 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             )
         );
 
-        if (empty($aliases)) {
-            $aliases = array();
-        }
-
         if (count($aliases) > common_config('group', 'maxaliases')) {
             throw new ApiValidationException(
                 sprintf(
@@ -357,7 +354,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             }
 
             // XXX assumes alphanum nicknames
-            if (strcmp($alias, $nickname) == 0) {
+            if (strcmp($alias, $this->nickname) == 0) {
                 throw new ApiValidationException(
                     _('Alias can\'t be the same as nickname.')
                 );

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 42aa08ef7d0fed8c97ccf2816e95333eaabd1568..d35391d4ea25b0e2a411dea0f171cc6bfe2bd6c8 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -97,6 +97,8 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+class ApiValidationException extends Exception { }
+
 /**
  * Contains most of the Twitter-compatible API output functions.
  *