Jannick Knudsen пре 4 година
родитељ
комит
680092ce18
6 измењених фајлова са 17 додато и 14 уклоњено
  1. 1 1
      VERSION
  2. 1 0
      VERSIONLOG
  3. 1 1
      package.json
  4. 4 7
      plug_adminusers.php
  5. 8 3
      plug_woohook.php
  6. 2 2
      plugin.php

+ 1 - 1
VERSION

@@ -1 +1 @@
-v0.0.56
+v0.0.57

+ 1 - 0
VERSIONLOG

@@ -55,3 +55,4 @@ v0.0.53
 v0.0.54
 v0.0.55
 v0.0.56
+v0.0.57

+ 1 - 1
package.json

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

+ 4 - 7
plug_adminusers.php

@@ -45,14 +45,11 @@ if (!class_exists("plug_adminusers")) {
 		function imel_column_userfield($defaults) {
 
 			$defaults['lastlogin'] = __('Seneste Login', 'lastlogin-column');
-			$defaults['lastview'] = __('Seneste Side', 'lastlogin-column');
-			$defaults['imel-login-userfield'] = __('Ældste Session', 'login-column');
-			$defaults['imel-login2-userfield'] = __('Nyeste Session', 'login2-column');
-
+			$defaults['lastview'] = __('Sidst set', 'lastlogin-column');
 			$defaults['proselect'] = __('Pro/Select', 'user-column');
 			$defaults['gruppe'] = __('Gruppe', 'id-column');
-			$defaults['imel-navn-userfield'] = __('Navn', 'navn-column');
-			$defaults['session'] = __('sessions', 'session-column');
+			$defaults['navn'] = __('Navn', 'navn-column');
+			$defaults['session'] = __('Sessions', 'session-column');
 			$defaults['id'] = __('id', 'id-column');
 
 			return $defaults;
@@ -99,7 +96,7 @@ if (!class_exists("plug_adminusers")) {
 				return $id;
 
 			}
-			if ($column_name == 'imel-navn-userfield') {
+			if ($column_name == 'navn') {
 
 				return get_user_meta($id, 'Navn', true);
 

+ 8 - 3
plug_woohook.php

@@ -53,12 +53,17 @@ if (!class_exists("plug_wookook")) {
 
 				$pid = get_user_meta($id, 'abo_order', true);
 				if ($pid) {
-
+					$s = '<a href="' . $burl . '' . $pid . '">' . $pid . '</a>';
 				} else {
-					$pid = get_user_meta($id, 'abo_statuscode', true);
+					if (get_user_meta($id, 'abo_status', true) == "ACTIVE") {
+
+					} else {
+						$pid = get_user_meta($id, 'abo_statuscode', true);
+						$s = '<a href="' . $burl . '' . $pid . '">' . $pid . '</a>';
+
+					}
 				}
 
-				$s = '<a href="' . $burl . '' . $pid . '">' . $pid . '</a>';
 				return $s;
 			}
 

+ 2 - 2
plugin.php

@@ -4,7 +4,7 @@ Plugin Name: dagsopt
 Plugin URI: https://git.tum.dk/tum.dk/dagsplug/
 Description: Tools
 Author: iskedk
-Version: 0.0.56
+Version: 0.0.57
 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.56";
+	var $version = "0.0.57";
 	var $publish_date = "2021-01-14";
 	var $pluginname;
 	var $plugintitle;