Browse Source

Fixing before_login template.

Julio Montoya 11 years ago
parent
commit
80279f1015
3 changed files with 21 additions and 19 deletions
  1. 18 16
      plugin/before_login/index.php
  2. 3 1
      plugin/before_login/plugin.php
  3. 0 2
      plugin/before_login/template.tpl

+ 18 - 16
plugin/before_login/index.php

@@ -54,25 +54,27 @@ if (api_is_anonymous()) {
 
     $form2 = new FormValidator('form');
 
-    $renderer =& $form2->defaultRenderer();
-    $renderer->setHeaderTemplate('');
-    $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-    $renderer->setElementTemplate('<tr><td>{element}</td></tr>');
-
-    $form->addElement('html', $option2);
-    $form2->addElement('checkbox', 'right', null, get_lang('Yes'));
-    $form2->addElement('button', 'submit', get_lang('Send'));
-
-    if ($form2->validate()) {
-        $result = $form2->getSubmitValues();
-        if (isset($result['right']) && $result['right']) {
-            header('Location: '.$urlOption2);
-            exit;
+    if (!empty($option2) && !empty($urlOption2)) {
+        $renderer =& $form2->defaultRenderer();
+        $renderer->setHeaderTemplate('');
+        $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
+        $renderer->setElementTemplate('<tr><td>{element}</td></tr>');
+
+        $form2->addElement('html', $option2);
+        $form2->addElement('checkbox', 'right', null, get_lang('Yes'));
+        $form2->addElement('button', 'submit', get_lang('Send'));
+
+        if ($form2->validate()) {
+            $result = $form2->getSubmitValues();
+            if (isset($result['right']) && $result['right']) {
+                header('Location: '.$urlOption2);
+                exit;
+            }
         }
     }
 
-    $_template['option1'] = api_get_plugin_setting('before_login', 'option1');
-    $_template['option2'] = api_get_plugin_setting('before_login', 'option2');
+    //$_template['option1'] = api_get_plugin_setting('before_login', 'option1');
+    //$_template['option2'] = api_get_plugin_setting('before_login', 'option2');
     $_template['form_option1'] = $form->return_form();
     $_template['form_option2'] = $form2->return_form();
 }

+ 3 - 1
plugin/before_login/plugin.php

@@ -42,7 +42,9 @@ $defaults['option1_url'] = api_get_plugin_setting('before_login', 'option1_url')
 $defaults['option2_url'] = api_get_plugin_setting('before_login', 'option2_url');
 
 $plugin_info['templates']   = array('template.tpl');
-
+if (file_exists(__DIR__.'/custom.template.tpl')) {
+    $plugin_info['templates']   = array( 'custom.template.tpl');
+}
 $form->setDefaults($defaults);
 
 // Display form

+ 0 - 2
plugin/before_login/template.tpl

@@ -1,11 +1,9 @@
 <div class="span12">
     <div class="row">
         <div class="span6">
-            {{ before_login.option1 }}
             {{ before_login.form_option1 }}
         </div>
         <div class="span6">
-            {{ before_login.option2 }}
             {{ before_login.form_option2 }}
         </div>
     </div>