Jannick Knudsen 4 жил өмнө
parent
commit
660e8a8d83
6 өөрчлөгдсөн 14 нэмэгдсэн , 36 устгасан
  1. 1 1
      VERSION
  2. 1 0
      VERSIONLOG
  3. 1 1
      package.json
  4. 4 28
      plug_adminusers.php
  5. 5 4
      plug_woohook.php
  6. 2 2
      plugin.php

+ 1 - 1
VERSION

@@ -1 +1 @@
-v0.0.57
+v0.0.58

+ 1 - 0
VERSIONLOG

@@ -56,3 +56,4 @@ v0.0.54
 v0.0.55
 v0.0.56
 v0.0.57
+v0.0.58

+ 1 - 1
package.json

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

+ 4 - 28
plug_adminusers.php

@@ -9,9 +9,9 @@ if (!class_exists("plug_adminusers")) {
 			$this->ns = $ns;
 		}
 		function start() {
-			add_action('manage_users_custom_column', array(&$this, 'imel_custom_column_userfield'), 15, 3);
-			add_filter('manage_users_columns', array(&$this, 'imel_column_userfield'), 15, 1);
-			add_filter('manage_users_sortable_columns', array(&$this, 'user_sortable_columns'), 15, 1);
+			add_filter('manage_users_custom_column', array(&$this, 'imel_custom_column_userfield'), 12, 3);
+			add_filter('manage_users_columns', array(&$this, 'imel_column_userfield'), 12, 1);
+			add_filter('manage_users_sortable_columns', array(&$this, 'user_sortable_columns'), 14, 1);
 
 			if (is_admin()) {
 //prolly not necessary, but I do want to be sure this only runs within the admin
@@ -102,20 +102,6 @@ if (!class_exists("plug_adminusers")) {
 
 			}
 
-			if ($column_name == 'session2') {
-
-				$ss = get_user_meta($id, 'session_tokens', true);
-				if ($ss) {
-					$s = "";
-					foreach ($ss as $name => $obj) {
-						//	$s .= human_time_diff($obj['login']) . " " . $obj['ua'] . "\n";
-						$s .= human_time_diff($obj['login']) . " <br> ";
-					}
-					return $s;
-				} else {
-					return "N";
-				}
-			}
 			if ($column_name == 'session') {
 
 				$ss = get_user_meta($id, 'session_tokens', true);
@@ -134,17 +120,7 @@ if (!class_exists("plug_adminusers")) {
 					return "N";
 				}
 			}
-			if ($column_name == 'imel-login2-userfield') {
-
-				$ss = get_user_meta($id, 'session_tokens', true);
-				if ($ss) {
-					//$f = array_pop(array_keys($ss));
-					//return human_time_diff($ss[$f]['login']);
-					return "L";
-				} else {
-					return "N";
-				}
-			}
+			return $value;
 		}
 
 		function user_sortable_columns($columns) {

+ 5 - 4
plug_woohook.php

@@ -27,12 +27,12 @@ if (!class_exists("plug_wookook")) {
 			add_role("suspenderet-abonnent", "Suspenderet abonnent", array('read' => true, 'level_0' => false));
 			add_role("betalende-abonnent", "Betalende abonnent", array('read' => true, 'level_0' => true));
 
-			add_action('manage_users_custom_column', array(&$this, 'imel_custom_column_userfield'), 15, 3);
-			add_filter('manage_users_columns', array(&$this, 'imel_column_userfield'), 15, 1);
+			add_filter('manage_users_custom_column', array(&$this, 'imel_custom_column_userfieldx'), 13, 3);
+			add_filter('manage_users_columns', array(&$this, 'imel_column_userfieldx'), 13, 1);
 
 		}
 
-		function imel_column_userfield($defaults) {
+		function imel_column_userfieldx($defaults) {
 
 			$defaults['abostatus'] = __('Abo Status', 'id-column');
 			$defaults['aboproduct'] = __('Abo Product', 'id-column');
@@ -41,7 +41,7 @@ if (!class_exists("plug_wookook")) {
 
 		}
 
-		function imel_custom_column_userfield($value, $column_name, $id) {
+		function imel_custom_column_userfieldx($value, $column_name, $id) {
 			if ($column_name == 'aboproduct') {
 				$burl = get_option($this->pluginname . "_wookook_baseurl_product");
 				$pid = get_user_meta($id, 'abo_prod', true);
@@ -71,6 +71,7 @@ if (!class_exists("plug_wookook")) {
 				$s = get_user_meta($id, 'abo_status', true);
 				return $s;
 			}
+			return $value;
 		}
 
 		function xx__update_custom_roles() {

+ 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.57
+Version: 0.0.58
 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.57";
+	var $version = "0.0.58";
 	var $publish_date = "2021-01-14";
 	var $pluginname;
 	var $plugintitle;