fixes near versioncontrol_get_backend() calls

marvil07 · Jul 19, 2009 · 42c9041 · 42c9041
1 parent 69e14ec
commit 42c9041
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/hook_versioncontrol.php b/hook_versioncontrol.php
@@ -267,12 +267,12 @@ function hook_versioncontrol_write_access($operation, $operation_items) {
     $user = user_load(array('uid' => $operation['uid']));
   }
   if (!$user) {
-    $backend = versioncontrol_get_backend($operation['repository']);
+    $backend = versioncontrol_get_backend($operation->repository);
 
     $error_message = t(
 "** ERROR: no Drupal user matches !vcs user '!user'.
 ** Please contact a !vcs administrator for help.",
-      array('!vcs' => $backend['name'], '!user' => $operation['username'])
+      array('!vcs' => $backend->name, '!user' => $operation['username'])
     );
     return array($error_message); // disallow the commit with an explanation
   }

diff --git a/includes/VersioncontrolItem.php b/includes/VersioncontrolItem.php
@@ -189,7 +189,7 @@ public function fetchCommitOperations($repository, &$items) {
       // So fetch by revision id instead in that case.
       $backend = versioncontrol_get_backend($repository);
 
-      if (in_array(VERSIONCONTROL_CAPABILITY_ATOMIC_COMMITS, $backend['capabilities'])) {
+      if (in_array(VERSIONCONTROL_CAPABILITY_ATOMIC_COMMITS, $backend->capabilities)) {
         $fetch_by_revision_id = TRUE;
       }
 
@@ -538,7 +538,7 @@ public function getParentItem($parent_path = NULL) {
       $backend = versioncontrol_get_backend($this->repository);
 
       $revision = '';
-      if (in_array(VERSIONCONTROL_CAPABILITY_DIRECTORY_REVISIONS, $backend['capabilities'])) {
+      if (in_array(VERSIONCONTROL_CAPABILITY_DIRECTORY_REVISIONS, $backend->capabilities)) {
         $revision = $this->revision;
       }
 

diff --git a/includes/versioncontrol.rules.inc b/includes/versioncontrol.rules.inc
@@ -68,25 +68,25 @@ function versioncontrol_token_values($type, $object = NULL) {
   switch ($type) {
     case 'versioncontrol_repository':
       $repository = $object;
-      $backend = versioncontrol_get_backend($repository['vcs']);
+      $backend = versioncontrol_get_backend($repository);
       $values = array(
         'id' => $repository['repo_id'],
-        'name' => check_plain($repository['name']),
-        'vcs' => check_plain($repository['vcs']),
-        'vcs-name' => check_plain($backend['name']),
-        'root' => check_plain($backend['root']),
+        'name' => check_plain($repository->name),
+        'vcs' => check_plain($repository->vcs),
+        'vcs-name' => check_plain($backend->name),
+        'root' => check_plain($repository->root),
       );
       break;
     case 'versioncontrol_operation':
       $operation = $object;
       $values = array(
-        'id' => $operation['vc_op_id'],
-        'revision' => $operation['revision'],
-        'vcs-user' => check_plain($operation['username']),
-        'vcs-user-raw' => $operation['username'],
-        'message' => check_plain($operation['message']),
-        'message-raw' => $operation['message'],
-        'date' => format_date($operation['date'],
+        'id' => $operation->vc_op_id,
+        'revision' => $operation->revision,
+        'vcs-user' => check_plain($operation->username),
+        'vcs-user-raw' => $operation->username,
+        'message' => check_plain($operation->message),
+        'message-raw' => $operation->message,
+        'date' => format_date($operation->date,
           'short', '', variable_get('date_default_timezone', 0)
         ),
       );

diff --git a/versioncontrol.admin.inc b/versioncontrol.admin.inc
@@ -526,7 +526,7 @@ function versioncontrol_admin_account_export_display_form(&$form_state, $reposit
 
   $form['data'] = array(
     '#type' => 'textarea',
-    '#title' => t('@vcs account data', array('@vcs' => $backend['name'])),
+    '#title' => t('@vcs account data', array('@vcs' => $backend->name)),
     '#description' => t('The exported account data. You can copy this to the config file that contains the @vcs accounts.', array('@vcs' => $backend['name'])),
     '#default_value' => $data,
     '#cols' => 70,

diff --git a/versioncontrol.pages.inc b/versioncontrol.pages.inc
@@ -314,7 +314,7 @@ function versioncontrol_account_list_form(&$form_state, $accounts) {
         $rows[] = array(
           $repo_name,
           $formatted_username,
-          l(t('Edit @vcs account', array('@vcs' => $backend['name'])),
+          l(t('Edit @vcs account', array('@vcs' => $backend->name)),
             'user/'. $uid .'/edit/versioncontrol/'. $repo_id .'/'. drupal_urlencode($username)
           ),
         );

diff --git a/versioncontrol_account_status/versioncontrol_account_status.module b/versioncontrol_account_status/versioncontrol_account_status.module
@@ -988,7 +988,7 @@ function _versioncontrol_account_status_send_application_mails($status_data, $is
   // Send an e-mail to the applicant.
   $from = t('!site @vcs administrator <!mail>', array(
     '!site' => variable_get('site_name', 'Drupal'),
-    '@vcs' => $backend['name'],
+    '@vcs' => $backend->name,
     '!mail' => $admin_mail,
   ));
   drupal_mail('versioncontrol_account_status', 'application_applicant',
@@ -1019,7 +1019,7 @@ function _versioncontrol_account_status_send_status_update_mails($status_data, $
   // Send an e-mail to the user whose account status has been updated.
   $from = t('!site @vcs administrator <!mail>', array(
     '!site' => variable_get('site_name', 'Drupal'),
-    '@vcs' => $backend['name'],
+    '@vcs' => $backend->name,
     '!mail' => $admin_mail,
   ));
   drupal_mail('versioncontrol_account_status', 'status_update',
@@ -1042,7 +1042,7 @@ function versioncontrol_account_status_mail($key, &$message, $params) {
     '%account-name' => $params['applicant_user']->name,
     '%user-account-url' => url('user/'. $params['applicant_user']->uid, array('absolute' => TRUE)),
     '%manage-account-url' => url('user/'. $params['applicant_user']->uid .'/edit/versioncontrol/'. $params['repository']['repo_id'], array('absolute' => TRUE)),
-    '%vcs-name' => $backend['name'],
+    '%vcs-name' => $backend->name,
     '%repository-name' => check_plain($params['repository']['name']),
     '%motivation-message' => wordwrap($params['motivation_message'], 72),
   );
@@ -1054,7 +1054,7 @@ function versioncontrol_account_status_mail($key, &$message, $params) {
 
     $variables['%client-information'] = implode("\n", $client_information);
 
-    $message['subject'] = t('@vcs account request', array('@vcs' => $backend['name']));
+    $message['subject'] = t('@vcs account request', array('@vcs' => $backend->name));
 
     if (isset($params['is_reapplication'])) {
       $message['subject'] = t('!subject [reapplication]', array(
@@ -1074,7 +1074,7 @@ function versioncontrol_account_status_mail($key, &$message, $params) {
   if ($is_update_mail) {
     if (!empty($params['admin_message'])) {
       $params['admin_message'] = t('Message from the @vcs maintainer:',
-        array('@vcs' => $backend['name'])) ."\n". $params['admin_message'] ."\n";
+        array('@vcs' => $backend->name)) ."\n". $params['admin_message'] ."\n";
     }
 
     switch ($params['status']) {
@@ -1097,7 +1097,7 @@ function versioncontrol_account_status_mail($key, &$message, $params) {
     $variables['%admin-message'] = $params['admin_message'];
     $variables['%admin-name'] = $params['admin_user']->name;
 
-    $message['subject'] = t('@vcs account maintenance', array('@vcs' => $backend['name']));
+    $message['subject'] = t('@vcs account maintenance', array('@vcs' => $backend->name));
 
     switch ($params['status']) {
       case VERSIONCONTROL_ACCOUNT_STATUS_PENDING:

diff --git a/versioncontrol_account_status/versioncontrol_account_status.test b/versioncontrol_account_status/versioncontrol_account_status.test
@@ -75,11 +75,11 @@ class VersioncontrolAccountStatusTestCase extends DrupalWebTestCase {
     );
 
     // Then, create an account
-    $this->drupalPost( 'versioncontrol/register', $account_edit, t('Request @repo_name account', array('@repo_name' => $backend['name'])) );
+    $this->drupalPost( 'versioncontrol/register', $account_edit, t('Request @repo_name account', array('@repo_name' => $backend->name)) );
 
     // make sure that the application form messages are listed there correctly.
     $this->assertText(t('Your application has been sent to the version control administrators and will be processed as soon as possible.'), t('Account request sent successfully.'));
-    $this->assertRaw(t('The @vcs account %username has been registered.', array('@vcs' => $backend['name'], '%username' => $account_edit['account_name'])), t('Account registered successfully.'));
+    $this->assertRaw(t('The @vcs account %username has been registered.', array('@vcs' => $backend->name, '%username' => $account_edit['account_name'])), t('Account registered successfully.'));
 
     // check if the various emails get sent to the applicant and admin.
     $admin_mail = $this->drupalGetMails(array('id' => 'versioncontrol_account_status_application_admin'));
@@ -100,8 +100,8 @@ class VersioncontrolAccountStatusTestCase extends DrupalWebTestCase {
       'send_admin_message' => 0,
     );
     $this->drupalGet("user/{$this->basic_user->uid}/edit/versioncontrol/{$repo->repo_id}");
-    $this->drupalPost($this->url, $account_edit_by_admin, t('Update @repo_name account', array('@repo_name' => $backend['name'])) );
-    $this->assertRaw(t('The @vcs account %username has been updated successfully.', array('@vcs' => $backend['name'], '%username' => $account_edit['account_name'])), t('Status successfully changed.'));
+    $this->drupalPost($this->url, $account_edit_by_admin, t('Update @repo_name account', array('@repo_name' => $backend->name)) );
+    $this->assertRaw(t('The @vcs account %username has been updated successfully.', array('@vcs' => $backend->name, '%username' => $account_edit['account_name'])), t('Status successfully changed.'));
     $account_status_user_status = db_result(db_query("SELECT status FROM {versioncontrol_account_status_users} WHERE uid = '%s' AND repo_id = '%s'", array($this->basic_user->uid, $repo->repo_id)));
     $this->assertTrue($account_status_user_status==VERSIONCONTROL_ACCOUNT_STATUS_PENDING, t('Account status successfully changed on DB.'));
     // TODO test all?