? coding_standards.patch Index: modules/sms_actions/sms_actions.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smsframework/modules/sms_actions/sms_actions.module,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 sms_actions.module --- modules/sms_actions/sms_actions.module 21 Aug 2008 13:34:57 -0000 1.1.2.2 +++ modules/sms_actions/sms_actions.module 7 Nov 2008 19:59:28 -0000 @@ -259,7 +259,7 @@ $commands = sms_actions_get_commands(); $command_triggers[] = 'sms_actions'; foreach ($commands as $command) { - $command_triggers[] = 'sms_actions_' . $command->discriminator; + $command_triggers[] = 'sms_actions_'. $command->discriminator; } foreach ($actions as $hook => $action) { @@ -297,7 +297,7 @@ $commands = variable_get('sms_actions_commands', array()); foreach ($commands as $key => $command) { - $commands[$key]->op = 'sms_actions_' . $command->discriminator; + $commands[$key]->op = 'sms_actions_'. $command->discriminator; } return $commands; @@ -320,7 +320,7 @@ $existing_discriminator = !empty($command->old_discriminator) ? $command->old_discriminator : $command->discriminator; $is_existing = count($commands[$existing_discriminator]); if ($is_existing) { - db_query("UPDATE {trigger_assignments} SET op = '%s' WHERE op = '%s'", array('sms_actions_' . $command->discriminator, 'sms_actions_' . $existing_discriminator)); + db_query("UPDATE {trigger_assignments} SET op = '%s' WHERE op = '%s'", array('sms_actions_'. $command->discriminator, 'sms_actions_'. $existing_discriminator)); } unset($commands[$existing_discriminator]); $commands[$command->discriminator] = $command; @@ -346,7 +346,7 @@ if (!empty($commands)) { foreach ($commands as $command) { - $row = array($command->discriminator, l(t('edit'), 'admin/smsframework/actions/edit/' . $command->discriminator)); + $row = array($command->discriminator, l(t('edit'), 'admin/smsframework/actions/edit/'. $command->discriminator)); $rows[] = $row; } } @@ -404,7 +404,7 @@ function sms_actions_edit_command_form_submit($form, &$form_state) { // $commands = sms_actions_get_commands(); - $command = new StdClass(); + $command = new stdClass(); $command->discriminator = $form_state['values']['discriminator']; $command->old_discriminator = $form_state['values']['old_discriminator']; Index: modules/sms_muse/sms_muse.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smsframework/modules/sms_muse/sms_muse.module,v retrieving revision 1.4 diff -u -r1.4 sms_muse.module --- modules/sms_muse/sms_muse.module 16 Aug 2008 18:20:26 -0000 1.4 +++ modules/sms_muse/sms_muse.module 7 Nov 2008 19:59:28 -0000 @@ -105,12 +105,12 @@ $userid = $config['sms_muse_user']; $pwd = $config['sms_muse_password']; try { - $result = $client->userAuthenticate($userid, $pwd); + $result = $client->userAuthenticate($userid, $pwd); - // Remember the token returned in order to send the message - variable_set('sms_muse_session_id', $result->AuthenticateToken); - variable_set('sms_clickatell_session_id_timestamp', time()); - return true; + // Remember the token returned in order to send the message + variable_set('sms_muse_session_id', $result->AuthenticateToken); + variable_set('sms_clickatell_session_id_timestamp', time()); + return true; } catch (Exception $error) { return array( 'faultcode' => $error->faultcode, @@ -120,56 +120,56 @@ break; case 'sendmsg': if (variable_get('sms_clickatell_session_id_timestamp', 0) < strtotime('-50 mins')) { - sms_muse_command(); + sms_muse_command(); } $user = variable_get('sms_muse_session_id', ''); try { $phonenums = $client->CleanPhoneList($user, $data['number'], $smsservicename); - } catch (Exception $error){ - return array( + } catch (Exception $error) { + return array( 'faultcode' => $error->faultcode, 'faultstring' => $error->faultstring, - ); + ); } try { - $result = $client->sendSMS($user, null, $smsservicename, $data['number'], $data['message'], "TEST"); + $result = $client->sendSMS($user, null, $smsservicename, $data['number'], $data['message'], "TEST"); drupal_set_message("Send message was successful."); return true; - } catch (Exception $error){ - return array( + } catch (Exception $error) { + return array( 'faultcode' => $error->faultcode, 'faultstring' => $error->faultstring, - ); + ); } break; case 'setcallback': if (variable_get('sms_clickatell_session_id_timestamp', 0) < strtotime('-50 mins')) { - sms_muse_command(); + sms_muse_command(); } $user = variable_get('sms_muse_session_id', ''); $url = $data['url']; try { return $client->setCallBackURL($user, null, $smsservicename, $url); - } catch (Exception $error){ + } catch (Exception $error) { drupal_set_message($error->faultstring); - return array( + return array( 'faultcode' => $error->faultcode, 'faultstring' => $error->faultstring, - ); + ); } break; case 'getcallback': if (variable_get('sms_clickatell_session_id_timestamp', 0) < strtotime('-50 mins')) { - sms_muse_command(); + sms_muse_command(); } $user = variable_get('sms_muse_session_id', ''); try { return $client->getCallBackURL($user, $smsservicename); - } catch (Exception $error){ - return $result = array( + } catch (Exception $error) { + return $result = array( 'faultcode' => $error->faultcode, 'faultstring' => $error->faultstring, - ); + ); } break; } @@ -234,12 +234,12 @@ ); $auth = sms_muse_command('auth', array(), $config); - if($auth == '1') { - $result = 1; + if ($auth == '1') { + $result = 1; } else { - $result = 0; - $error = $auth['faultstring']; + $result = 0; + $error = $auth['faultstring']; } print drupal_to_js(array( Index: modules/sms_receive/sms_receive.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smsframework/modules/sms_receive/sms_receive.module,v retrieving revision 1.4 diff -u -r1.4 sms_receive.module --- modules/sms_receive/sms_receive.module 7 Aug 2008 19:05:11 -0000 1.4 +++ modules/sms_receive/sms_receive.module 7 Nov 2008 19:59:28 -0000 @@ -257,7 +257,7 @@ break; } // Set to anonymous if no match - if(empty($node->uid) && empty($node->name)) { + if (empty($node->uid) && empty($node->name)) { $node->uid = 0; $node->name = ''; } Index: modules/sms_sendtophone/sms_sendtophone.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smsframework/modules/sms_sendtophone/sms_sendtophone.module,v retrieving revision 1.4.2.1 diff -u -r1.4.2.1 sms_sendtophone.module --- modules/sms_sendtophone/sms_sendtophone.module 17 Sep 2008 14:11:51 -0000 1.4.2.1 +++ modules/sms_sendtophone/sms_sendtophone.module 7 Nov 2008 19:59:29 -0000 @@ -10,7 +10,7 @@ $items['sms/sendtophone/%/%'] = array( 'title' => 'Send to phone', 'page callback' => 'sms_sendtophone_page', - 'page arguments' => array(2,3), + 'page arguments' => array(2, 3), 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, ); @@ -74,7 +74,7 @@ $form = drupal_get_form('sms_sendtophone_form', $type); } else { - if(empty($user->sms_user['0']['number']) && user_access('send to any number')) { + if (empty($user->sms_user['0']['number']) && user_access('send to any number')) { $register = array( '#value' => t('You need need to setup your mobile phone to send messages.', array('@setup' => url('user/'. $user->uid .'/mobile'))) ); @@ -411,8 +411,8 @@ } function sms_sendtophone_form_alter(&$form, $form_state, $form_id) { - if($form_id == 'sms_sendtophone_inline_form' || $form_id == 'sms_sendtophone_node_form' || $form_id == 'sms_sendtophone_cck_form') { - if(!user_access('send to any number')) { + if ($form_id == 'sms_sendtophone_inline_form' || $form_id == 'sms_sendtophone_node_form' || $form_id == 'sms_sendtophone_cck_form') { + if (!user_access('send to any number')) { // Makes number field plain text $form['sms']['number']['#type'] = 'item'; $form['sms']['number']['#value'] = $form['sms']['number']['#default_value'];