diff --git splash.admin.inc splash.admin.inc index 8c09923..af8e61a 100644 --- splash.admin.inc +++ splash.admin.inc @@ -1,65 +1,65 @@ 'fieldset', - '#title' => t('Settings'), - ); + $form['general'] = array( + '#type' => 'fieldset', + '#title' => t('Settings'), + ); $form['general']['frequency'] = array( - '#type' => 'select', - '#title' => t('Display with frequency'), - '#default_value' => $splash_when['frequency'], - '#options' => array( - '' => t('Never (off)'), - 'always' => t('Always'), - 'once' => t('Once'), - 'daily' => t('Daily'), - 'weekly' => t('Weekly'), - ), - '#description' => t('How often should visitors see the splash page?'), - ); - $form['general']['cookie'] = array( - '#type' => 'checkbox', - '#title' => t('Force display on next visit'), - '#description' => t('Reset the name of the cookie to force the display of the splash on next visit. This is useful to preview changes to the splash content in development.'), - '#default_value' => 0, - ); - - if (module_exists('condition')) { - $form = array_merge($form, module_invoke('condition', 'selection_form', $splash_when['conditions'])); - } - - $form = system_settings_form($form); - - unset($form['#submit']); - - return $form; + '#type' => 'select', + '#title' => t('Display with frequency'), + '#default_value' => $splash_when['frequency'], + '#options' => array( + '' => t('Never (off)'), + 'always' => t('Always'), + 'once' => t('Once'), + 'daily' => t('Daily'), + 'weekly' => t('Weekly'), + ), + '#description' => t('How often should visitors see the splash page?'), + ); + $form['general']['cookie'] = array( + '#type' => 'checkbox', + '#title' => t('Force display on next visit'), + '#description' => t('Reset the name of the cookie to force the display of the splash on next visit. This is useful to preview changes to the splash content in development.'), + '#default_value' => 0, + ); + + if (module_exists('condition')) { + $form = array_merge($form, module_invoke('condition', 'selection_form', $splash_when['conditions'])); + } + + $form = system_settings_form($form); + + unset($form['#submit']); + + return $form; } function splash_admin_when_submit($form, &$form_state) { - + if ($op == t('Reset to defaults')) { - variable_del('splash_when'); - + variable_del('splash_when'); + drupal_set_message(t('The configuration options have been reset to their default values.')); } else { - $splash_when = variable_get('splash_when', array()); - $splash_when['frequency'] = $form_state['values']['frequency']; - - if ($form_state['values']['cookie']) { - $splash_when['cookie'] = 'splash_cookie_'.time(); - } - - if (module_exists('condition')) { - $splash_when['conditions'] = $form_state['values']['conditions']; - } - - variable_set('splash_when', $splash_when); - + $splash_when = variable_get('splash_when', array()); + $splash_when['frequency'] = $form_state['values']['frequency']; + + if ($form_state['values']['cookie']) { + $splash_when['cookie'] = 'splash_cookie_'.time(); + } + + if (module_exists('condition')) { + $splash_when['conditions'] = $form_state['values']['conditions']; + } + + variable_set('splash_when', $splash_when); + drupal_set_message(t('The configuration options have been saved.')); } @@ -68,19 +68,19 @@ function splash_admin_when_submit($form, &$form_state) { } function splash_admin_what() { - $splash_what = variable_get('splash_what', array()); + $splash_what = variable_get('splash_what', array()); - $form['splash_what'] = array( - '#tree' => TRUE, - ); + $form['splash_what'] = array( + '#tree' => TRUE, + ); $form['splash_what']['mode'] = array( '#type' => 'select', '#title' => t('Content mode'), '#options' => array( - '' => t('Pick random path or URL from the list'), - 'sequence' => t('Pick next path or URL from the list'), - 'template' => t('Display entered text in the site template'), - 'fullscreen' => t('Display entered text/HTML full screen'), + '' => t('Pick random path or URL from the list'), + 'sequence' => t('Pick next path or URL from the list'), + 'template' => t('Display entered text in the site template'), + 'fullscreen' => t('Display entered text/HTML full screen'), ), '#default_value' => $splash_what['mode'], '#description' => t('Determines how the content field below will be used.'), @@ -88,33 +88,71 @@ function splash_admin_what() { $form['splash_what']['content'] = array( '#type' => 'textarea', - '#title' => t('Content'), + '#title' => variable_get('splash_languages', 0) == 1 ? t('Default Content') : t('Content'), '#default_value' => $splash_what['content'], '#description' => t('Text to show or paths/URLs (one on each line) to use. To open a non-Drupal path, use an absolute URL, i.e. http://example.com/splash.html'), ); - + $form['splash_what']['filter'] = filter_form($splash_what['format']); $form['splash_what']['format'] = array( - '#type' => 'value', - '#value' => $splash_what['format'], + '#type' => 'value', + '#value' => $splash_what['format'], ); - + + // if multi-lingual enabled show a content box for each. + if (variable_get('splash_languages', 0)) { + $languages = language_list(); + + foreach ($languages as $id => $lang) { + + // exclude default language + if ($id != language_default()->language): + $form['splash_what']['content_' . $id] = array( + '#type' => 'textarea', + '#title' => $lang->name . ' ' . t('Content'), + '#default_value' => $splash_what['content_' . $id], + '#description' => t('Text to show or paths/URLs (one on each line) to use. To open a non-Drupal path, use an absolute URL, i.e. http://example.com/splash.html'), + ); + + $form['splash_what']['filter_' . $id] = filter_form($splash_what['filter_' . $id], ++$i, array('splash_what', 'filter_' . $id)); + $form['splash_what']['format_' . $id] = array( + '#type' => 'value', + '#value' => $splash_what['format_' . $id], + ); + endif; + } + } + $form['#submit'][] = 'splash_admin_what_submit'; return system_settings_form($form); } function splash_admin_what_submit($form, &$form_state) { - $form_state['values']['splash_what']['format'] = $form_state['values']['format']; + $form_state['values']['splash_what']['format'] = $form_state['values']['format']; + + // if multi-lingual enabled show a content box for each. + if (variable_get('splash_languages', 0)) { + $languages = language_list(); + + foreach ($languages as $id => $lang) { + + // exclude default language + if ($id != language_default()->language): + $form_state['values']['splash_what']['format_' . $id] = $form_state['values']['format_' . $id]; + endif; + } + + } } function splash_admin_how() { - $splash_how = variable_get('splash_how', array()); - - $options = array( - 'redirect' => t('Redirect'), - 'window' => t('Open in new window'), - ); + $splash_how = variable_get('splash_how', array()); + + $options = array( + 'redirect' => t('Redirect'), + 'window' => t('Open in new window'), + ); if (module_exists('thickbox')) { $options['thickbox'] = t('Open in ThickBox'); } @@ -124,10 +162,10 @@ function splash_admin_how() { if (module_exists('lightbox2')) { $options['lightbox2'] = t('Open in Lightbox2'); } - - $form['splash_how'] = array( - '#tree' => TRUE, - ); + + $form['splash_how'] = array( + '#tree' => TRUE, + ); $form['splash_how']['mode'] = array( '#type' => 'radios', '#required' => TRUE, @@ -142,15 +180,27 @@ function splash_admin_how() { '#default_value' => $splash_how['size'], '#description' => t('Size (WIDTHxHEIGHT, e.g. 400x300) of the window or ThickBox.'), ); - - return system_settings_form($form); + + if (module_exists('i18n')) { + $form['splash_how']['splash_languages'] = array( + '#type' => 'checkbox', + '#title' => 'Enable multi-lingual Splash pages?', + '#default_value' => variable_get('splash_languages', 0), + ); + } + + return system_settings_form($form); } function splash_admin_how_validate($form, &$form_state) { - - if (!empty($form_state['values']['splash_how']['size']) && !preg_match('/^[1-9][0-9]*x[1-9][0-9]*$/i', $form_state['values']['splash_how']['size'])) { - form_set_error('size', t('Invalid Window/Box size. Use WIDTHxHEIGHT, e.g. 400x300.')); - } + + if (!empty($form_state['values']['splash_how']['size']) && !preg_match('/^[1-9][0-9]*x[1-9][0-9]*$/i', $form_state['values']['splash_how']['size'])) { + form_set_error('size', t('Invalid Window/Box size. Use WIDTHxHEIGHT, e.g. 400x300.')); + } + + if (module_exists('i18n')) { + variable_set('splash_languages', $form_state['values']['splash_how']['splash_languages']); + } } ?> \ No newline at end of file diff --git splash.module splash.module index ed71fa2..be6a7b4 100644 --- splash.module +++ splash.module @@ -225,15 +225,20 @@ function splash_help($path, $arg) { } function splash_page() { - $splash_what = variable_get('splash_what', array()); - $output = check_markup($splash_what['content'], $splash_what['format'], FALSE); - - if ($splash_what['mode'] == 'fullscreen') { - echo $output; - exit; - + $splash_what = variable_get('splash_what', array()); + + if (variable_get('splash_languages', 0) && ($_GET['lang'] != language_default()->language && $_GET['lang'])) { + $output = check_markup($splash_what['content_' . $_GET['lang']], $splash_what['filter_' . $_GET['lang']], FALSE); + } + else { + $output = check_markup($splash_what['content'], $splash_what['format'], FALSE); + } + if ($splash_what['mode'] == 'fullscreen') { + echo $output; + exit; + } else { - return $output; + return $output; } }