From 810bd072443511c54e958038a00153d2c1eca097 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Mon, 12 Feb 2018 15:37:58 +0200
Subject: [PATCH] - fixed role keys for no-UTF8 titles;

---
 includes/admin/core/packages/2.0-beta1.php  | 36 ++++++++++++++++-----
 includes/admin/templates/role/role-edit.php | 15 ++++++++-
 includes/class-config.php                   |  1 +
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/includes/admin/core/packages/2.0-beta1.php b/includes/admin/core/packages/2.0-beta1.php
index 45454cb6..61d47981 100644
--- a/includes/admin/core/packages/2.0-beta1.php
+++ b/includes/admin/core/packages/2.0-beta1.php
@@ -945,7 +945,20 @@ $roles_associations = array();
 $all_wp_roles = array_keys( get_editable_roles() );
 if ( ! empty( $um_roles ) ) {
 	foreach ( $um_roles as $um_role ) {
-		$role_key = sanitize_title( $um_role->post_title );
+
+		//old role key which inserted for each user to usermeta "role"
+		$key_in_meta = $um_role->post_name;
+
+		if ( preg_match( "/[a-z0-9]+$/i", $um_role->post_title ) ) {
+			$role_key = sanitize_title( $um_role->post_title );
+		} else {
+			$auto_increment = UM()->options()->get( 'custom_roles_increment' );
+			$auto_increment = ! empty( $auto_increment ) ? $auto_increment : 1;
+			$role_key = 'custom_role_' . $auto_increment;
+
+			$auto_increment++;
+			UM()->options()->update( 'custom_roles_increment', $auto_increment );
+		}
 
 		if ( ! in_array( $role_key, $all_wp_roles ) ) {
 			$role_keys[] = $role_key;
@@ -963,7 +976,7 @@ if ( ! empty( $um_roles ) ) {
 
 		$role_metadata = array();
 		if ( ! empty( $all_role_metadata ) ) {
-			foreach( $all_role_metadata as $metadata ) {
+			foreach ( $all_role_metadata as $metadata ) {
 
 				if ( '_um_can_edit_roles' == $metadata['meta_key'] || '_um_can_delete_roles' == $metadata['meta_key']
 				     || '_um_can_view_roles' == $metadata['meta_key'] || '_um_can_follow_roles' == $metadata['meta_key']
@@ -985,20 +998,21 @@ if ( ! empty( $um_roles ) ) {
 			$role_meta = $role_metadata;
 		}
 
-		$old_key = ! empty( $role_meta['_um_core'] ) ? $role_meta['_um_core'] : $role_key;
+		//$old_key = ! empty( $role_meta['_um_core'] ) ? $role_meta['_um_core'] : $role_key;
 		if ( ! in_array( $role_key, $all_wp_roles ) ) {
-			$roles_associations[ $old_key ] = 'um_' . $role_key;
+			$roles_associations[ $key_in_meta ] = 'um_' . $role_key;
 		} else {
-			$roles_associations[ $old_key ] = $role_key;
+			$roles_associations[ $key_in_meta ] = $role_key;
 		}
 
-		$r_key = ! empty( $role_meta['_um_core'] ) ? $role_meta['_um_core'] : $role_key;
+
+		//$r_key = ! empty( $role_meta['_um_core'] ) ? $role_meta['_um_core'] : $role_key;
 		//get all users with UM role
 		$args = array(
 			'meta_query'   => array(
 				array(
 					'key'       => 'role',
-					'value'     => $r_key
+					'value'     => $key_in_meta
 				)
 			),
 			'number'       => '',
@@ -1025,8 +1039,14 @@ if ( ! empty( $um_roles ) ) {
 		update_option( "um_role_{$role_key}_meta", $role_meta );
 	}
 
+	//update user role meta where role keys stored
 	foreach ( $um_roles as $um_role ) {
-		$role_key = sanitize_title( $um_role->post_title );
+
+		$key_in_meta = $um_role->post_name;
+
+		$role_key = $roles_associations[ $key_in_meta ];
+		if ( strpos( $role_key, 'um_' ) === 0 )
+			$role_key = substr( $role_key, 3 );
 
 		$role_meta = get_option( "um_role_{$role_key}_meta" );
 
diff --git a/includes/admin/templates/role/role-edit.php b/includes/admin/templates/role/role-edit.php
index 8a2dc3bc..597746a8 100644
--- a/includes/admin/templates/role/role-edit.php
+++ b/includes/admin/templates/role/role-edit.php
@@ -36,7 +36,15 @@ if ( ! empty( $_POST['role'] ) ) {
     } else {
 
         if ( 'add' == $_GET['tab'] ) {
-            $id = sanitize_title( $data['name'] );
+
+	        if ( preg_match( "/[a-z0-9]+$/i", $data['name'] ) ) {
+	            $id = sanitize_title( $data['name'] );
+            } else {
+		        $auto_increment = UM()->options()->get( 'custom_roles_increment' );
+		        $auto_increment = ! empty( $auto_increment ) ? $auto_increment : 1;
+		        $id = 'custom_role_' . $auto_increment;
+	        }
+
             $redirect = add_query_arg( array( 'page'=>'um_roles', 'tab'=>'edit', 'id'=>$id, 'msg'=>'a' ), admin_url( 'admin.php' ) );
         } elseif ( 'edit' == $_GET['tab'] && ! empty( $_GET['id'] ) ) {
             $id = $_GET['id'];
@@ -58,6 +66,11 @@ if ( ! empty( $_POST['role'] ) ) {
             $roles[] = $id;
 
             update_option( 'um_roles', $roles );
+
+	        if ( isset( $auto_increment ) ) {
+		        $auto_increment++;
+		        UM()->options()->update( 'custom_roles_increment', $auto_increment );
+	        }
         }
 
         $role_meta = $data;
diff --git a/includes/class-config.php b/includes/class-config.php
index 20b2d49c..50b3eec1 100644
--- a/includes/class-config.php
+++ b/includes/class-config.php
@@ -368,6 +368,7 @@ if ( ! class_exists( 'um\Config' ) ) {
                 'profile_photo_max_size'                => 999999999,
                 'cover_photo_max_size'                  => 999999999,
                 'menu_item_workaround'                  => 0,
+	            'custom_roles_increment'                => 1,
             );
 
             $tabs = UM()->profile()->tabs_primary();