summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrashant P. Shah2011-07-07 14:49:35 +0530
committerPrashant P. Shah2011-07-07 14:49:35 +0530
commitc72b90c4a23e0d411713789477945bc12182c56c (patch)
tree5dc8e4c1748708fd46151b851ef67676bbdaafe7
parent84758a501241369263f74d1564ea58e6307d35dc (diff)
downloadscilab_lab_migration-c72b90c4a23e0d411713789477945bc12182c56c.tar.gz
scilab_lab_migration-c72b90c4a23e0d411713789477945bc12182c56c.tar.bz2
scilab_lab_migration-c72b90c4a23e0d411713789477945bc12182c56c.zip
Update code stlying issues
Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
-rw-r--r--lab_migration.install10
-rw-r--r--lab_migration.module12
-rw-r--r--manage_proposal.inc16
3 files changed, 18 insertions, 20 deletions
diff --git a/lab_migration.install b/lab_migration.install
index 2ccd4ac..b6b818b 100644
--- a/lab_migration.install
+++ b/lab_migration.install
@@ -4,7 +4,8 @@
/**
* Implementation of hook_install().
*/
-function lab_migration_install() {
+function lab_migration_install()
+{
// Create tables.
drupal_install_schema('lab_migration');
// Set variables
@@ -20,7 +21,8 @@ function lab_migration_install() {
/**
* Implementation of hook_uninstall().
*/
-function lab_migration_uninstall() {
+function lab_migration_uninstall()
+{
// Remove tables.
drupal_uninstall_schema('lab_migration');
// Remove variables
@@ -32,8 +34,8 @@ function lab_migration_uninstall() {
/**
* Implementation of hook_schema().
*/
-function lab_migration_schema() {
-
+function lab_migration_schema()
+{
$schema['lab_migration_proposal'] = array(
'description' => t('TODO: please describe this table!'),
'fields' => array(
diff --git a/lab_migration.module b/lab_migration.module
index eee9cec..46848b0 100644
--- a/lab_migration.module
+++ b/lab_migration.module
@@ -83,7 +83,8 @@ function lab_migration_menu()
/**
* Implementation of hook_perm().
*/
-function lab_migration_perm() {
+function lab_migration_perm()
+{
return array('create proposal', 'reply proposal', 'approve proposal', 'view questions', 'view answers', 'administer lab migration');
}
@@ -94,8 +95,7 @@ function lab_migration_mail($key, &$message, $params)
{
global $user;
$language = $message['language'];
- switch ($key)
- {
+ switch ($key) {
case 'proposal_received':
/* initializing data */
$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE id = %d LIMIT 1", $params['proposal_received']['proposal_id']);
@@ -189,7 +189,8 @@ Lab Migration Team
/**************************** GENERAL FUNCTION ********************************/
/******************************************************************************/
-function lab_migration_path() {
+function lab_migration_path()
+{
return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'sites/default/files/lab_migration/';
}
@@ -197,7 +198,8 @@ function lab_migration_path() {
/*************************** VALIDATION FUNCTIONS *****************************/
/******************************************************************************/
-function lab_migration_check_valid_filename($file_name) {
+function lab_migration_check_valid_filename($file_name)
+{
if (!preg_match('/^[0-9a-zA-Z\_\.]+$/', $file_name))
return FALSE;
else
diff --git a/manage_proposal.inc b/manage_proposal.inc
index cf8616f..9e0e5ba 100644
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -6,14 +6,12 @@ function _proposal_pending()
/* get pending proposals to be approved */
$pending_rows = array();
$pending_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE approval_status = 0 ORDER BY id DESC");
- while ($pending_data = db_fetch_object($pending_q))
- {
+ while ($pending_data = db_fetch_object($pending_q)) {
$pending_rows[$pending_data->id] = array(date('d-m-Y', $pending_data->creation_date), l($pending_data->name, 'user/' . $pending_data->uid), $pending_data->department, $pending_data->university, $pending_data->lab_title, l('Approve', 'lab_migration/manage_proposal/approve/' . $pending_data->id) . ' | ' . l('Edit', '/lab_migration/manage_proposal/edit/' . $pending_data->id));
}
/* check if there are any pending proposals */
- if (!$pending_rows)
- {
+ if (!$pending_rows) {
drupal_set_message(t('There are no pending proposals.'), 'status');
return '';
}
@@ -28,23 +26,19 @@ function _proposal_all()
/* get pending proposals to be approved */
$proposal_rows = array();
$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} ORDER BY id DESC");
- while ($proposal_data = db_fetch_object($proposal_q))
- {
+ while ($proposal_data = db_fetch_object($proposal_q)) {
$proposal_status = '';
- switch ($proposal_data->approval_status)
- {
+ switch ($proposal_data->approval_status) {
case 0: $proposal_status = 'Pending'; break;
case 1: $proposal_status = 'Approved'; break;
case 2: $proposal_status = 'Dis-approved'; break;
- case 3: $proposal_status = 'Completed'; break;
default: $proposal_status = 'Unknown'; break;
}
$proposal_rows[] = array(date('d-m-Y', $proposal_data->creation_date), l($proposal_data->name, 'user/' . $proposal_data->uid), $proposal_data->department, $proposal_data->university, $proposal_data->lab_title, $proposal_status, l('Approve', 'lab_migration/manage_proposal/approve/' . $proposal_data->id) . ' | ' . l('Edit', 'lab_migration/manage_proposal/edit/' . $proposal_data->id));
}
/* check if there are any pending proposals */
- if (!$proposal_rows)
- {
+ if (!$proposal_rows) {
drupal_set_message(t('There are no proposals.'), 'status');
return '';
}