'. t('You may combine this feature with the usual use of groups in the registration form.'). '
'; + switch ($path) { + case 'admin/og/og-reg-codes': + $output = ''. t('Settings for Organic Groups registration codes. A new user will be '); + $output .= t('auto-approved as member of a group when they supply a group code at registration.'); + $output .= t(' Users may also visit the "join a group" page to join a group using a code.'); + $output .= '
'. t('You may combine this feature with the usual use of groups in the registration form.') .'
'; return $output; - case 'og/use_code': + case 'og/use-code': $output = ''. t('You may check a group code by entering it below.'); if ($user->uid) { $output .= ' '. t('You may also join a group by submitting its code.'); } - return $output. '
'; + return $output .''; } } @@ -29,36 +29,51 @@ * Implementation of hook_menu * */ -function og_reg_codes_menu($may_cache) { +function og_reg_codes_menu() { $items = array(); global $user; - if ($may_cache) { - $items[] = array( - 'path' => 'admin/settings/og_reg_codes', - 'title' => t('og reg. codes'), - 'callback' => 'og_reg_codes_set', + $items['admin/og/og-reg-codes'] = array( + 'title' => 'OG registration codes', + 'description' => 'Configure group registration codes.', + 'access arguments' => array('administer og'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('og_reg_codes_set'), ); - $items[] = array( - 'path' => 'og/use_code', - 'title' => t('use group code'), - 'callback' => 'og_reg_codes_join', - 'type' => MENU_SUGGESTED_ITEM, + $items['og/use-code'] = array( + 'title' => 'Use group code', + 'access arguments' => array('administer og'), + + 'page callback' => 'drupal_get_form', + 'page arguments' => array('og_reg_codes_join'), + 'weight' => 10, + 'type' => MENU_LOCAL_TASK, ); - } return $items; } /** + * IMplemention of hook_theme + * + */ +function og_reg_codes_theme() { + return array( + 'theme_og_reg_codes_join_preview' => array( + 'arguements' => array( 'node' => NULL ), + ) + ); +} + +/** * Implementation of hook_form_alter * */ -function og_reg_codes_form_alter($form_id, &$form) { +function og_reg_codes_form_alter(&$form, &$form_state, $form_id) { if ($form_id == 'og_invite_form') { $code = og_reg_codes_get_code($form['gid']['#value']); - $form['pmessage']['#default_value'] = t(_og_reg_codes_message(), array('%reg_code' => $code)). "\n\n"; + $form['pmessage']['#default_value'] .= strtr(_og_reg_codes_message(), array('%reg_code' => $code)) ."\n\n"; } elseif ($form_id == 'user_register') { if (!isset($form['og_register'])) { @@ -69,7 +84,7 @@ '#title' => t('Group registration code'), '#required' => variable_get('og_reg_code_required', TRUE), '#description' => t('Enter the group registration code that you received from a current group member or site administrator.'), - '#suffix' => t('Before registering, you can check your group code.', array('%url' => url('og/use_code'))) + '#suffix' => t('Before registering, you can check your group code.', array('!url' => url('og/use-code'))) ); } } @@ -80,7 +95,7 @@ */ function og_reg_codes_user($op, &$edit, &$account, $category = NULL) { - if (!module_exist('og')) { + if (!module_exists('og')) { return; } global $user; @@ -117,7 +132,7 @@ $nids[] = $key; } if (count($nids)) { - $result = db_query("SELECT nid FROM {og} WHERE nid in (". implode(',', $nids).") AND (selective = %d OR selective = %d)", OG_OPEN, OG_MODERATED); + $result = db_query("SELECT nid FROM {og} WHERE nid in (". implode(',', $nids) .") AND (selective = %d OR selective = %d)", OG_OPEN, OG_MODERATED); while ($r = db_fetch_array($result)) { $open_groups[] = $r['nid']; } @@ -178,30 +193,29 @@ $form['reset_salt'] = array( '#type' => 'submit', '#value' => t('Reset codes'), - '#suffix' => ''.t("All existing codes will be invalidated. The last date that new codes were initiated was %date", array('%date' => $date)).'
', + '#suffix' => ''. t("All existing codes will be invalidated. The last date that new codes were initiated was !date", array('!date' => $date)) .'
', ); - return system_settings_form('og_reg_codes_set', $form); + return system_settings_form($form); } -function og_reg_codes_set_validate($form_id, $form_values, $form) { +function og_reg_codes_set_validate( $form , &$form_state ) { $op = isset($_POST['op']) ? $_POST['op'] : ''; - if ($op == t('Save configuration') && !strstr($form_values['og_reg_codes_message'], '%reg_code')) { + if ($op == t('Save configuration') && !strstr($form_state['values']['og_reg_codes_message'], '%reg_code')) { form_set_error('og_reg_codes_message', t("You must include in your message the token '%reg_code'")); } } -function og_reg_codes_set_submit($form_id, $form_values) { - $op = isset($_POST['op']) ? $_POST['op'] : ''; +function og_reg_codes_set_submit($form, &$form_state) { - if ($op == t('Reset codes')) { + if ($form_state['values']['op'] == t('Reset codes')) { variable_del('og_reg_codes_salt'); drupal_set_message(t('All registration codes have been reset and given new values.')); } else { - unset($form_values['reset_salt']); - system_settings_form_submit($form_id, $form_values); + unset($form_state['values']['reset_salt']); + system_settings_form_submit($form, $form_state); } } @@ -226,7 +240,7 @@ if ($user->uid > 0) { $form['submit'] = array('#type' => 'submit', '#value' => t('Submit and join') ); } - return drupal_get_form('og_reg_codes_join', $form); + return $form; } function og_reg_codes_add_preview($form) { @@ -234,7 +248,7 @@ $op = isset($_POST['op']) ? $_POST['op'] : ''; if ($op == t('Check code')) { - drupal_validate_form($form['form_id']['#value'], $form); + drupal_validate_form($form['form_id']['#value'], $form, &$form_state); if (!form_get_errors()) { $gid = node_load(og_reg_codes_get_gid($form['og_reg_code']['#value'])); $preview = theme('og_reg_codes_join_preview', $gid); @@ -244,17 +258,17 @@ return $form; } -function og_reg_codes_join_validate($form_id, $form_values, $form) { - if (!og_reg_codes_valid_code($form_values['og_reg_code'])) { +function og_reg_codes_join_validate( $form , &$form_state ) { + if (!og_reg_codes_valid_code($form_state['values']['og_reg_code'])) { form_set_error('og_reg_code', "Not a valid group registration code."); } } -function og_reg_codes_join_submit($form_id, $form_values) { +function og_reg_codes_join_submit($form, $form_state) { global $user; if ($user->uid) { - $gid = og_reg_codes_get_gid($form_values['og_reg_code']); + $gid = og_reg_codes_get_gid($form_state['values']['og_reg_code']); $return = og_subscribe_user($gid, $user); drupal_set_message($return['message']); } @@ -279,7 +293,7 @@ */ function _og_reg_codes_message() { - return variable_get('og_reg_codes_message', "To join this group, use the registration code %reg_code"); + return variable_get('og_reg_codes_message', t("To join this group, use the registration code %reg_code")); } /** @@ -320,8 +334,8 @@ */ function og_reg_codes_get_code($gid) { - $hash = strtoupper(substr(md5($gid. _og_reg_codes_get_salt()), 11, 6)); - return $hash. '-'. $gid; + $hash = strtoupper(substr(md5($gid . _og_reg_codes_get_salt()), 11, 6)); + return $hash .'-'. $gid; } /** @@ -346,3 +360,4 @@ /** * @} End of "og_reg_codes utility". */ +