Sfoglia il codice sorgente

Bumped version to 0.0.34

Jannick Knudsen 4 anni fa
parent
commit
5469ca1044
6 ha cambiato i file con 29 aggiunte e 33 eliminazioni
  1. 1 1
      VERSION
  2. 1 0
      VERSIONLOG
  3. 1 1
      package.json
  4. 2 0
      plug_update_plugin.php
  5. 22 29
      plug_usermanager.php
  6. 2 2
      plugin.php

+ 1 - 1
VERSION

@@ -1 +1 @@
-v0.0.33
+v0.0.34

+ 1 - 0
VERSIONLOG

@@ -32,3 +32,4 @@ v0.0.30
 v0.0.31
 v0.0.32
 v0.0.33
+v0.0.34

+ 1 - 1
package.json

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

+ 2 - 0
plug_update_plugin.php

@@ -8,6 +8,8 @@ if (!class_exists("plug_update_plugin")) {
 		$this->pluginname = $ns->pluginname;
 		$this->file = $ns->file;
 		$this->ns = $ns;
+		$this->status="";
+		$this->possible=false;
 		}
 
 	function start(){

+ 22 - 29
plug_usermanager.php

@@ -109,21 +109,14 @@ if (!class_exists("plug_usermanager")) {
 
 
 	function Cruncher($pre){
-
 				if(isset($_REQUEST['nodryrun'])){
 					$testmode = false;
 					echo("RUNNING LIVE<br>");
 				}else{
 					echo("RUNNING TEST<br>");
-
 					$testmode = true;
 				}
 
-
-
-	 
-
-
 				$upload = wp_upload_dir();
 			    $upload_dir = $upload['basedir'];
 			    $upload_dir = $upload_dir . '/assets';
@@ -137,34 +130,27 @@ if (!class_exists("plug_usermanager")) {
 				    	echo("$max : $ii   -> ");
 				    	flush();
 				    	if($user['Spærret']=="" ){
-				    		if($testmode){
-					    		$user_email = str_replace("@","_",$user['E-mail'])."@bloggen.dk";
-				    		}else{
-//					    		$user_email =$user['E-mail'];
-					    		$user_email = str_replace("@","_",$user['E-mail'])."@ere.dk";
-				    		}
+
+				    		$user_email =$user['E-mail'];
+
+
 				    		$user_name = sanitize_username("T".$user['Telefon']);
 				    		$user_id = username_exists( $user_name );
 								if ( ! $user_id && false == email_exists( $user_email ) ) {
 								    $random_password = wp_generate_password( $length = 12, $include_standard_special_chars = false );
 								   if($testmode){
-
-									  $user_id = wp_create_user( $user_name, $random_password, $user_email );
-								    wp_update_user( array( 'ID' => $user_id, 'role' => 'betalende-abonnent' ) );
-									wp_send_new_user_notifications($user_id,'both');
-									$resu[] = "$user_id created : $user_name $user_email ";
-
+  								    //$user_id = wp_create_user( $user_name, $random_password, $user_email );
+								    //wp_update_user( array( 'ID' => $user_id, 'role' => 'betalende-abonnent' ) );
+									//wp_send_new_user_notifications($user_id,'both');
+									$resu[] = "$user_id mock created : $user_name $user_email ";
 								   }else{
 								    $user_id = wp_create_user( $user_name, $random_password, $user_email );
-
 								    wp_update_user( array( 'ID' => $user_id, 'role' => 'betalende-abonnent' ) );
-
-
-
 									wp_send_new_user_notifications($user_id,'both');
 									$resu[] = "$user_id created : $user_name $user_email ";
 								   }
 								} else {
+									$resu[] = "$user_id or $user_email exists";
 								    $random_password = __( 'User already exists.  Password inherited.', 'textdomain' );
 								}
 
@@ -172,16 +158,23 @@ if (!class_exists("plug_usermanager")) {
 							   flush();
 					    	
 				    	}else{
+									$resu[] = "$user_email spærret";
 
 				    	}
 				    }
-//				    if(count($resu)){
-//				    	echo("SEND NOTIFY");
-					$rr = wp_mail('jannick@bloggen.dk', 'CCR '. count($resu)." : ". getenv('HOSTNAME')." : ".$_SERVER['REMOTE_ADDR']." : " . $_SERVER['SERVER_ADDR'] . " : ". $_SERVER['SERVER_NAME']." ".date("U"), "::".print_r($resu,true));
+ 
+				    if($testmode){
+				    	print_r($resu);
+				    	echo("DONE test");
+				    }else{
+
+				    $aemail = get_bloginfo('admin_email');
+					$rr = wp_mail($aemail, 'CCR '. count($resu)." : ". getenv('HOSTNAME')." : ".$_SERVER['REMOTE_ADDR']." : " . $_SERVER['SERVER_ADDR'] . " : ". $_SERVER['SERVER_NAME']." ".date("U"), "::".print_r($resu,true));
+				    	echo("DONE live");
 
-//				    }else{
-//				    	echo("no noti");
-//				    }
+				    }
+
+ 
 
 				    if(!isset($_REQUEST['nodryrun'])){
 					?>

+ 2 - 2
plugin.php

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