Selaa lähdekoodia

Bumped version to 0.0.38

Jannick Knudsen 4 vuotta sitten
vanhempi
commit
30e937f661
5 muutettua tiedostoa jossa 18 lisäystä ja 12 poistoa
  1. 1 1
      VERSION
  2. 1 0
      VERSIONLOG
  3. 1 1
      package.json
  4. 13 8
      plug_login.php
  5. 2 2
      plugin.php

+ 1 - 1
VERSION

@@ -1 +1 @@
-v0.0.37
+v0.0.38

+ 1 - 0
VERSIONLOG

@@ -36,3 +36,4 @@ v0.0.34
 v0.0.35
 v0.0.36
 v0.0.37
+v0.0.38

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "dagsplug",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "",
   "main": "script_backend.js",
   "scripts": {

+ 13 - 8
plug_login.php

@@ -228,15 +228,15 @@ if (!class_exists("plug_login")) {
 }
 
 		function login_head() {
-//			$type = (empty($_REQUEST['type']) || !($_REQUEST['type'] == "Select" || $_REQUEST['type'] == "Pro")) ? "Select" :  $_REQUEST['type'];
-			$type = "Perspektiv";
+			$type = (empty($_REQUEST['type']) || !($_REQUEST['type'] == "Select" || $_REQUEST['type'] == "Pro")) ? " " : $_REQUEST['type'];
+//			$type = "Perspektiv";
 			if ($type !== "") {
 				?>
 		<script type='text/javascript' src='/wp-includes/js/jquery/jquery.js?ver=1.4.2'></script>
 		<script type="text/javascript">
 			jQuery(document).ready(function(){
 				if(jQuery("form").attr('action').indexOf('register')>-1){
-					jQuery("form").prepend('<h3>Ræson <?php echo ($type) ?></h3><br>');
+					jQuery("form").prepend('<h3><?php echo ($type) ?></h3><br>');
 					jQuery("p:contains('Brugernavn')").hide();
 
 					jQuery("#user_email").attr("tabindex","24")
@@ -291,16 +291,16 @@ if (!class_exists("plug_login")) {
 			//print_r($_REQUEST);
 			//$arra = explode("<hr>","".$tt->post_content);
 			//$listen = array_pop($arra);
-			$content = get_option($this->pluginname . "_login_groups", false) . "::::" . ($this->pluginname . "_login_groups");
+			$content = "";
 			//$arr = explode("\n","".$listen);
 
 			$arr = explode("\n", get_option($this->pluginname . "_login_groups", false));
 
 			$sel = '<select name="r_membership" id="r_membership" class="input nnl"  tabindex="26">';
-			$sel .= '<option ' . ((!isset($_POST['r_membership']) || $_POST['r_membership'] === "") ? "selected" : "") . '>Vælg gruppe</option>';
+			$sel .= '<option ' . ((!isset($_POST['r_membership']) || $_POST['r_membership'] === "") ? "selected" : "") . '>Vælg </option>';
 			foreach ($arr as $ii => $title) {
 				if (strlen($title) > 3) {
-					$sel .= '<option value="' . $title . '" ' . ($_POST['r_membership'] === $title ? "selected" : "") . '>' . $title . '</option>';
+					$sel .= '<option value="' . $title . '" ' . (isset($_POST['r_membership']) && $_POST['r_membership'] === $title ? "selected" : "") . '>' . $title . '</option>';
 				}
 			}
 			$sel .= '</select>';
@@ -329,13 +329,13 @@ if (!class_exists("plug_login")) {
 
  					<p>
  						<label style="display: block; margin-bottom: 5px;">' . __('Navn', 'Navn') . '
- 							<input type="text" name="r_navn" id="r_navn" class="input nnl" value="' . $_POST['r_navn'] . '" size="20" tabindex="25" />
+ 							<input type="text" name="r_navn" id="r_navn" class="input nnl" value="' . (isset($_POST['r_navn']) ? $_POST['r_navn'] : "") . '" size="20" tabindex="25" />
  						</label>
 					</p>
 
 
  					<p>
- 						<label style="display: block; margin-bottom: 5px;">' . __('Medlem af', 'Medlem af') . '
+ 						<label style="display: block; margin-bottom: 5px;">' . __('Vælg', 'Vælg') . '
  								' . $sel . '
 					</label>
 					</p>
@@ -353,6 +353,7 @@ if (!class_exists("plug_login")) {
 			update_option($pre . '_support_splash_rp', $_POST[$pre . '_support_splash_rp']);
 			update_option($pre . '_support_splash_welcome', $_POST[$pre . '_support_splash_welcome']);
 			update_option($pre . '_support_splash_resetpass', $_POST[$pre . '_support_splash_resetpass']);
+			update_option($pre . '_support_splash_register', $_POST[$pre . '_support_splash_register']);
 
 			update_option($pre . '_background_image', $_POST[$pre . '_background_image']);
 			update_option($pre . '_image', $_POST[$pre . '_image']);
@@ -402,6 +403,10 @@ if (!class_exists("plug_login")) {
 
 		  <?php echo (__("Login splash html resetpass:", "dagsopt")) ?><br><textarea style="width: 100%; height: 150px;" name="<?php echo ($pre . '_support_splash_resetpass'); ?>"><?php echo (stripslashes(get_option($pre . "_support_splash_resetpass"))); ?></textarea>
 
+<hr>
+
+		  <?php echo (__("Login splash html register:", "dagsopt")) ?><br><textarea style="width: 100%; height: 150px;" name="<?php echo ($pre . '_support_splash_register'); ?>"><?php echo (stripslashes(get_option($pre . "_support_splash_register"))); ?></textarea>
+
 
 		<hr>
 		  <?php echo (__("Groups", "dagsopt")) ?><br>

+ 2 - 2
plugin.php

@@ -4,7 +4,7 @@
  Plugin URI: https://git.tum.dk/tum.dk/dagsplug/
  Description: Tools 
  Author: iskedk
- Version: 0.0.37
+ Version: 0.0.38
  Date: 2021-01-14
  Author URI: https://iske.dk/
  Text Domain: dagsopt
@@ -17,7 +17,7 @@ function wppluginspage() {
 $wp_dagsopt = new dagsopt ( );
 
 class dagsopt {
-	var $version = "0.0.37";
+	var $version = "0.0.38";
 	var $publish_date = "2021-01-14";
 	var $pluginname;
 	var $plugintitle;