Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
  • Loading branch information
shakty committed Oct 22, 2013
1 parent f84f912 commit 881d066
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion includes/config.inc
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function patterns_client_link_remoteuser() {
);
$form['password'] = array(
'#type' => 'password',
'#title' => t('Password'),
'#title' => t('Token'),
'#required' => TRUE,
);
$form['submit'] = array(
Expand Down
10 changes: 5 additions & 5 deletions includes/io.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* Code related to send pattern to server / receive pattern as server.
*/


module_load_include('module', 'd2d');

/**
Expand Down Expand Up @@ -107,16 +106,17 @@ function patterns_client_link_user_on_server($url, $user, $pwd) {
}
// Communication Error
elseif ($result === FALSE) {
drupal_set_message(check_plain($url) . ' - ' . check_plain($error_string), 'error');
drupal_set_message(check_plain($url) . ' -A ' . check_plain($error_string), 'error');
}
// Trying to parse returned string
elseif (_patterns_client_is_linking_error($result)) {
drupal_set_message(check_plain($url) . ' - ' . t('%err', array('%err' => $result)), 'error');
drupal_set_message(check_plain($url) . ' - ' . t('%err', array(
'%err' => $result,
)), 'error');
}
else {
$values = d2d_explode($result);
// debug(print_r($result, TRUE));
// debug(print_r($values, TRUE));

if ($values === FALSE) {
drupal_set_message(check_plain($url) . ' - ' . t('Could not parse return value. Control server/client versions.'), 'error');
}
Expand Down

0 comments on commit 881d066

Please sign in to comment.