From e6782ba7939c6d03fb335596482b484129429653 Mon Sep 17 00:00:00 2001
From: Daniel Reintanz <85614916+FreelancerAMP@users.noreply.github.com>
Date: Tue, 28 Mar 2023 13:52:47 +0200
Subject: [PATCH 01/14] CHANGES: CHANGED tax to efobi standard

---
 rpi-wall-installer.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/rpi-wall-installer.php b/rpi-wall-installer.php
index e3cf6a5..63dcaac 100644
--- a/rpi-wall-installer.php
+++ b/rpi-wall-installer.php
@@ -70,10 +70,10 @@ public function add_custom_capabilities()
             $role->add_cap('delete_badge');
             $role->add_cap('assign_badge');
 
-            $role->add_cap('manage_schooltype');
-            $role->add_cap('edit_schooltype');
-            $role->add_cap('delete_schooltype');
-            $role->add_cap('assign_schooltype');
+            $role->add_cap('manage_section');
+            $role->add_cap('edit_section');
+            $role->add_cap('delete_section');
+            $role->add_cap('assign_section');
 
             /*
             if($roleslug === 'editor'){
@@ -137,7 +137,7 @@ public function add_custom_capabilities()
 
             $role->add_cap('assign_badge');
 
-            $role->add_cap('assign_schooltype');
+            $role->add_cap('assign_section');
 
         }
     }
@@ -249,7 +249,7 @@ public function register_post_types()
                 'title',
                 "editor",
             ],
-            'taxonomies' => ['wall-tag', "badge", 'schooltype', 'profession'],
+            'taxonomies' => ['wall-tag', "badge", 'section', 'profession'],
             "show_in_graphql" => false,
         ];
 
@@ -547,17 +547,17 @@ function register_taxonomies()
         register_taxonomy("badge", ["member"], $args);
 
         /**
-         * Taxonomy: schooltype.
+         * Taxonomy: Section.
          */
 
         $labels = [
-            "name" => __("Schulformen", "blocksy"),
-            "singular_name" => __("Schulform", "blocksy"),
+            "name" => __("Bereiche", "blocksy"),
+            "singular_name" => __("Bereich", "blocksy"),
         ];
 
 
         $args = [
-            "label" => __("Schulform", "blocksy"),
+            "label" => __("Bereich", "blocksy"),
             "labels" => $labels,
             "public" => true,
             "publicly_queryable" => true,
@@ -566,24 +566,24 @@ function register_taxonomies()
             "show_in_menu" => true,
             "show_in_nav_menus" => true,
             "query_var" => true,
-            "rewrite" => ['slug' => 'schooltype', 'with_front' => true, 'hierarchical' => true,],
+            "rewrite" => ['slug' => 'section', 'with_front' => true, 'hierarchical' => true,],
             "show_admin_column" => false,
             "show_in_rest" => true,
             "show_tagcloud" => false,
-            "rest_base" => "schooltype",
+            "rest_base" => "section",
             "rest_controller_class" => "WP_REST_Terms_Controller",
             "rest_namespace" => "wp/v2",
             "show_in_quick_edit" => false,
             "sort" => false,
             "show_in_graphql" => false,
             "capabilities" => array(
-                'manage_terms' => 'manage_schooltype',
-                'edit_terms' => 'edit_schooltype',
-                'delete_terms' => 'delete_schooltype',
-                'assign_terms' => 'assign_schooltype'
+                'manage_terms' => 'manage_section',
+                'edit_terms' => 'edit_section',
+                'delete_terms' => 'delete_section',
+                'assign_terms' => 'assign_section'
             ),
         ];
-        register_taxonomy("schooltype", ["member"], $args);
+        register_taxonomy("section", ["member"], $args);
 
         /**
          * Taxonomy: profession.

From d76e733744b9d604c8687583676b41046b0a4e6b Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Fri, 31 Mar 2023 17:07:04 +0200
Subject: [PATCH 02/14] =?UTF-8?q?CHANGES:=20Leerer=20Termin=20bei=20Arbeit?=
 =?UTF-8?q?sstruktubogen=20wird=20ber=C3=BCcksichtigt=20Fehlende=20Ausgabe?=
 =?UTF-8?q?n=20im=20Protokoll=20erg=C3=A4nzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/protocol.php | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/inc/protocol.php b/inc/protocol.php
index 0a476b7..661a298 100644
--- a/inc/protocol.php
+++ b/inc/protocol.php
@@ -166,6 +166,8 @@ function on_acf_update_protocol( $post_id, $type, $args, $form, $action) {
 			if(time() < strtotime($next_date)){
 				update_post_meta($group_id,'date_of_meeting', $next_date );
 				do_action('new_meeting_date', $next_date, $group_id );
+			}elseif(!$next_date){
+				delete_post_meta($group_id,'date_of_meeting');
 			}
 			do_action('update_group_protocol', $post_id,  $group_id );
 		}
@@ -205,10 +207,12 @@ function on_acf_submit_new_protocol( $post_id, $type, $args, $form, $action) {
 	static function display($content){
 
 		$fields = (get_field_objects());
+		//var_dump('<pre>',$fields); die();
 
 
 		if('protokoll' === get_post_type()){
 
+
 			$members = get_field('teilnehmende');
 			$content .= '<h3>'.$fields['teilnehmende']['label'].':</h3> <ul>';
 			foreach ($members as $member_id){
@@ -226,14 +230,15 @@ static function display($content){
 			$content .= '<h3>'.$fields['rpi_wall_protocol_agenda']['label'].':</h3>';
 			$content .= ''.$c.'';
 
-			$rows = get_field('reflexion_der_heutigen_arbeit');
+			$content .= '<h2>Reflexion</h2>';
+
+
+			$content .= '<h3>'.$fields['rpi_wall_protocol_was_hat_gut_geklappt']['label'].'</h3>';
+			$content .= '<div>'.nl2br(get_field('rpi_wall_protocol_was_hat_gut_geklappt')).'</div>';
+
+			$content .= '<h3>'.$fields['rpi_wall_protocol_was_wollen_wir_verbessern']['label'].'</h3>';
+			$content .= '<div>'.nl2br(get_field('rpi_wall_protocol_was_wollen_wir_verbessern')).'</div>';
 
-			$content .= '<h3>'.$fields['reflexion_der_heutigen_arbeit']['label'].'</h3>';
-			$content .= '<div style="display: grid; grid-template-columns: 1fr 1fr; grid-column-gap: 20px">';
-			foreach ($fields['reflexion_der_heutigen_arbeit']['sub_fields'] as $field){
-				$content .= '<div><p><strong>'.$field['label'].'</strong></p><p>'.nl2br($rows[$field['name']]).'</p></div>';
-			}
-			$content .= '</div>';
 
 
 			$b = get_field('rpi_wall_protocol_is_schoolwork_sighted');
@@ -246,6 +251,7 @@ static function display($content){
 			}
 			$content .= '<h3>'.$label.'</h3>'.nl2br($c);
 
+			$content .= '<h2>Absprachen</h2>';
 
 			$rows = get_field('rpi_wall_protocol_orga');
 			$content .= '<h3>'.$fields['rpi_wall_protocol_orga']['label'].'</h3>';
@@ -253,15 +259,27 @@ static function display($content){
 				$content .= '<div><p><strong>'.$field['label'].'</strong></p><p>'.nl2br($rows[$field['name']]).'</p></div>';
 			}
 
+			$next_date = get_field('rpi_wall_protocol_orga_next_meeting_date');
+			if(!$next_date){
+				$next_date = 'Ein nächster Termin wird noch abgesprochen.';
+			}
+
+			$content .= '<h3>'.$fields['rpi_wall_protocol_orga_next_meeting_date']['label'].'</h3>';
+			$content .= '<div>'.$next_date.'</div>';
+
+			$content .= '<h3>'.$fields['rpi_wall_protocol_orga_todo']['label'].'</h3>';
+			$content .= '<div>'.nl2br(get_field('rpi_wall_protocol_orga_todo')).'</div>';
+
 
 			$c = get_field('rpi_wall_protocol_notices');
 			$content .= '<h3>'.$fields['rpi_wall_protocol_notices']['label'].':</h3>';
 			$content .= ''.nl2br($c).'';
 
 			$c = get_field('rpi_wall_protocol_result');
-			$content .= '<h3>'.$fields['rpi_wall_protocol_result']['label'].'</h3>';
+			$content .= '<h2>'.$fields['rpi_wall_protocol_result']['label'].'</h2>';
 			$content .= ''.$c.'';
 
+
 			$b = get_field('rpi_wall_protocol_is_public_result');
 			if($b){
 				$label = $fields['rpi_wall_protocol_is_public_result']['message']. ' Ja';

From a42744280003d2d9e6d195ed2434f0978c1030ac Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Fri, 31 Mar 2023 17:17:22 +0200
Subject: [PATCH 03/14] CHANGES: add custom css Protokoll

---
 assets/css/custom-style.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/assets/css/custom-style.css b/assets/css/custom-style.css
index 5c21529..ce8b7a6 100644
--- a/assets/css/custom-style.css
+++ b/assets/css/custom-style.css
@@ -1217,3 +1217,12 @@ body.toolbar #wpadminbar {
     font-weight: bold;
     font-size: large;
 }
+
+/* Protokoll */
+.single-protokoll h2{
+    border-bottom: 1px solid #ccc;
+    font-size:medium;
+    margin-top:30px;
+    background-color:#f9c227;
+    padding: 5px 20px;
+}

From b127949269a472e3d68643c441d8bf5d7506e682 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Mon, 3 Apr 2023 10:28:56 +0200
Subject: [PATCH 04/14] CHANGES: fix empty termin date fix missing field
 outputs add custom css Protokoll

---
 assets/css/custom-style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/css/custom-style.css b/assets/css/custom-style.css
index ce8b7a6..1c1856a 100644
--- a/assets/css/custom-style.css
+++ b/assets/css/custom-style.css
@@ -1218,6 +1218,7 @@ body.toolbar #wpadminbar {
     font-size: large;
 }
 
+
 /* Protokoll */
 .single-protokoll h2{
     border-bottom: 1px solid #ccc;

From b36da5857147f89aae53ad365dd9c360418aac10 Mon Sep 17 00:00:00 2001
From: Daniel Reintanz <85614916+FreelancerAMP@users.noreply.github.com>
Date: Mon, 3 Apr 2023 10:32:10 +0200
Subject: [PATCH 05/14] REMOVED deprecated code

---
 rpi-wall.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/rpi-wall.php b/rpi-wall.php
index 94787a1..4a63561 100644
--- a/rpi-wall.php
+++ b/rpi-wall.php
@@ -411,17 +411,6 @@ public function facetwp_injection($query_args, $class)
         return $query_args;
     }
 
-    public function query_tags(&$query)
-    {
-
-
-        if (is_tax('wall-tag') && is_post_type_archive('wall')) {
-            //$query->set('post_type','wall');
-
-        }
-
-    }
-
     public function query_member(WP_Query &$query)
     {
         if (is_tax('wall-tag') && !isset($_GET['wall-tag'])) {

From 4cf7f0597f3536250a840fd9a47e6d15644df6df Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Wed, 5 Apr 2023 15:47:10 +0200
Subject: [PATCH 06/14] CHANGES: alter PhP matrix SDK:
 https://github.com/rpi-virtuell/php-matrix-sdk

---
 inc/matrix.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/inc/matrix.php b/inc/matrix.php
index 2e4ba28..ff7e63d 100644
--- a/inc/matrix.php
+++ b/inc/matrix.php
@@ -4,22 +4,15 @@
 
 require_once dirname( __DIR__ ) . '/vendor/autoload.php';
 
-use Aryess\PhpMatrixSdk\Cache;
-use Aryess\PhpMatrixSdk\Exceptions\MatrixException;
-use Aryess\PhpMatrixSdk\Exceptions\MatrixHttpLibException;
-use Aryess\PhpMatrixSdk\Exceptions\MatrixRequestException;
-use Aryess\PhpMatrixSdk\MatrixClient;
-use Aryess\PhpMatrixSdk\Room;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\RequestOptions;
+use MatrixPhp;
+use MatrixPhp\MatrixClient;
+
 use rpi\Wall;
 
 
 class Matrix {
 
-	public \Aryess\PhpMatrixSdk\MatrixClient $client;
+	public MatrixPhp\MatrixClient $client;
 	protected $orga_room;
 	protected $domain;
 	protected $homeserver;
@@ -331,7 +324,7 @@ private function randomString()
 
 }
 
-use Aryess\PhpMatrixSdk\MatrixHttpApi;
+use MatrixPhp\MatrixHttpApi;
 
 class MatrixCustomApi extends MatrixHttpApi{
 	public function __construct(string $baseUrl, ?string $token = null, ?string $identity = null,

From e9588ba589d7b0a85171a46f9951ad3ca5be9305 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Wed, 5 Apr 2023 18:46:59 +0200
Subject: [PATCH 07/14] CHANGES: sprachliche Anpassungen

---
 inc/matrix.php | 8 +-------
 shortcodes.php | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/inc/matrix.php b/inc/matrix.php
index ff7e63d..03b2b36 100644
--- a/inc/matrix.php
+++ b/inc/matrix.php
@@ -30,7 +30,7 @@ function __construct() {
 
 		//var_dump($this);
 		try {
-			$this->client = new MatrixCustomClient('https://'.$this->homeserver, $this->token);
+			$this->client = new MatrixClient('https://'.$this->homeserver, $this->token);
 		}catch (\Exception $exception ){
 			echo $exception->getMessage();
 		}
@@ -426,9 +426,3 @@ public function __construct(string $baseUrl, ?string $token = null, bool $validC
 		}
 	}
 }
-/*
-add_action('init', function (){
-	$matrix = new Matrix();
-	$matrix->tests(13);
-});
-*/
diff --git a/shortcodes.php b/shortcodes.php
index 3b0c0c9..a430458 100644
--- a/shortcodes.php
+++ b/shortcodes.php
@@ -580,12 +580,12 @@ public function display_termine($atts)
         </h4>
             <span class="dibes-termin termin-type">
                 <div class="dibes-termin termin-type-color"></div>
-                <div class="dibes-termin termin-type-name">- Schule Evangelisch Digital Termin</div>
+                <div class="dibes-termin termin-type-name">- Netzwerk Termin</div>
             </span>
             <?php if (is_user_logged_in()){?>
             <span class="plg-termin termin-type">
                 <div class="plg-termin termin-type-color"></div>
-                <div class="plg-termin termin-type-name">- Termin deiner PLG</div>
+                <div class="plg-termin termin-type-name">- AG-Treffen</div>
             </span>
             <?php } ?>
         </div>

From bc840374fbf6f559c1773cd4ec6ad41d733a6e50 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Thu, 6 Apr 2023 19:10:38 +0200
Subject: [PATCH 08/14] CHANGES: recode Matrix for meet-kingsters MatrixPhp fix
 addRoomToSpace add sendImage

---
 inc/group.php  |  16 +++++++
 inc/matrix.php | 127 ++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 109 insertions(+), 34 deletions(-)

diff --git a/inc/group.php b/inc/group.php
index bf57794..b964265 100644
--- a/inc/group.php
+++ b/inc/group.php
@@ -690,6 +690,22 @@ protected function get_matrix_channel($local_slug = false)
         return $ch;
     }
 
+	/**
+	 * @param bool $set
+     * @return bool
+	 */
+    public function has_matrix_toolbar(bool $set = false){
+
+        if($set){
+	        update_post_meta($this->ID,'matrix_room_has_toolbar',1);
+            $return = true;
+        }else {
+	        $return = empty( get_post_meta( $this->ID, 'matrix_room_has_toolbar', true ) ) ? false : true;
+        }
+	    return $return;
+
+    }
+
     protected function get_joined_member_matrixId($member)
     {
         $matrix = new Matrix();
diff --git a/inc/matrix.php b/inc/matrix.php
index 03b2b36..1106c60 100644
--- a/inc/matrix.php
+++ b/inc/matrix.php
@@ -6,7 +6,10 @@
 
 use MatrixPhp;
 use MatrixPhp\MatrixClient;
+use MatrixPhp\MatrixHttpApi;
+use MatrixPhp\Room;
 
+use mysql_xdevapi\Exception;
 use rpi\Wall;
 
 
@@ -45,13 +48,23 @@ function set_topic( Wall\Group $group, string $topic ){
 		$room->setRoomTopic($topic);
 	}
 
-	function send_msg( Wall\Group $group, string $msg ){
+	public function send_msg( Wall\Group $group, string $msg ){
 		$room_id = $this->getRoomId($group);
 		$room = new Room($this->client,$room_id);
 		$room->sendHtml($msg);
 	}
 
-	function send_msg_obj( Wall\Group $group, \stdClass $msg ){
+	public function send_image (Wall\Group $group, string $url, ?string $name='image.png'){
+		$room_id = $this->getRoomId($group);
+		$room = new Room($this->client,$room_id);
+		$fileinfo = array(
+			"mimetype"=> "image/png",
+            "xyz.amorgan.blurhash"=> "TBR:KR^*~pofx]i_s9j]ax-;RjM{"
+		);
+		$room->sendImage($url,$name, $fileinfo);
+	}
+
+	public function send_msg_obj( Wall\Group $group, \stdClass $msg ){
 		$room_id = $this->getRoomId($group);
 		$room = new Room($this->client,$room_id);
 		$room->sendHtml('<strong>'.$msg->subject.'</strong><br>'.$msg->body);
@@ -202,7 +215,16 @@ protected function stateKey($roomId){
 		//return str_replace([':','@'],['%3A','%40'],$roomId.$this->client->userId().'_'.time());
 	}
 
-	function addWidget($room_id, $name,$url, $type = 'm.custom'){
+	/**
+	 * @param string $room_id
+	 * @param string $name
+	 * @param string $url
+	 * @param string $type
+	 *
+	 * @return bool
+	 * @throws MatrixPhp\Exceptions\MatrixException
+	 */
+	function addWidget(string $room_id, string $name, string $url, string $type = 'm.custom'){
 
 			$room = new Room($this->client,$room_id);
 			$content = array(
@@ -218,47 +240,87 @@ function addWidget($room_id, $name,$url, $type = 'm.custom'){
 	}
 
 	function addRoomToSpace($room_id){
+		$space = get_option('options_matrix_space', '!WQMdgHoIuSFUVKVaBB:rpi-virtuell.de');
 
-			$content = array(
-				'via'  =>  [$this->domain],
-			);
-			$plg_space_room = get_option('options_matrix_plg_space_room', '!WQMdgHoIuSFUVKVaBB:rpi-virtuell.de');
-			return $this->client->api()->sendStateEvent( $room_id,'m.space.child',$content,$plg_space_room,time());
+		$content = array(
+			"canonical" => true,
+			'via'  =>  [$this->domain],
+		);
 
+		$this->client->api()->sendStateEvent( $room_id,'m.space.parent',$content,$space,time());
+		$this->client->api()->sendStateEvent( $space,'m.space.child',$content,$room_id,time());
+		return $room_id;
 
 	}
 
-	function addToolbar(Group $group){
+	/**
+	 * @param Group $group
+	 * @param string $room_id
+	 *
+	 * @return bool
+	 * @throws MatrixPhp\Exceptions\MatrixException
+	 * @throws MatrixPhp\Exceptions\MatrixHttpLibException
+	 * @throws MatrixPhp\Exceptions\MatrixRequestException
+	 */
+	protected function check_toolbar_created(Group $group, string $room_id){
 
-		$room_id = $this->getRoomId($group);
+		$has_toolbar = empty(get_post_meta($group->ID,'matrix_room_has_toolbar',1))?false:true;
+		if($group->has_matrix_toolbar()) {
+			return true;
+		}else{
 
-		$messages = $this->client->api()->filterRoomEvents($room_id,['im.vector.modular.widgets']);
-		$toolbar_exists = false;
-		$deleted =[];
+			$messages = $this->client->api()->getRoomState($room_id);
+			$toolbar_exists = false;
+			$deleted = array();
 
-		foreach ($messages['chunk'] as  $msg){
-			$message = (object) $msg;
-			if(isset($message->unsigned)){
-				$deleted[]= $message->unsigned["replaces_state"];
-			}
-			if($message->content['type'] == 'm.custom' && $message->content['name']=='Toolbar' && !in_array($message->event_id, $deleted)){
-				$toolbar_exists = true;
+			foreach ($messages as  $message){
+
+				$message = (object) $message;
+
+
+				if(isset($message->unsigned)){
+					$deleted[]= $message->unsigned["replaces_state"];
+				}
+				if($message->content['type'] == 'm.custom' && $message->content['name']=='Toolbar' && !in_array($message->event_id, $deleted)){
+					$toolbar_exists = $group->has_matrix_toolbar(true);
+				}
 			}
-		}
-		if(!$toolbar_exists) {
 
-			return $this->addWidget( $room_id, 'Toolbar', home_url(  )."?p=".$group->post->ID ."&roomId=".$this->getRoomId($group) );
+			return $toolbar_exists;
+
 		}
 
+
 	}
 
-	function tests(int $group_id=0 ){
+	/**
+	 * @param Group $group
+	 *
+	 * @return bool|void
+	 * @throws MatrixPhp\Exceptions\MatrixException
+	 * @throws MatrixPhp\Exceptions\MatrixHttpLibException
+	 * @throws MatrixPhp\Exceptions\MatrixRequestException
+	 */
+	function addToolbar(Group $group){
+
+		$room_id = $this->getRoomId($group);
+
+		if(!$this->check_toolbar_created($group,$room_id)) {
 
+			$ok = $this->addWidget( $room_id, 'Toolbar', home_url(  )."?p=".$group->post->ID ."&roomId=".$this->getRoomId($group) );
+			if($ok){
+				return $group->has_matrix_toolbar(true);
+			}
+			return false;
+		}
+		return true;
 
+	}
 
+	function tests(int $group_id=0 ){
 
 
-		if( $group_id>0 && get_current_user_id() == 2 && false ){
+		if( $group_id>0 && get_current_user_id() == 2 && false){
 
 
 			$msg_obj =new \stdClass();
@@ -277,24 +339,23 @@ function tests(int $group_id=0 ){
 			}
 
 
-			/*
-			$widget_ID = $this -> addToolbar($group);
 
 
+			if($this -> addToolbar($group)){
+				//$ret = $this->send_msg_obj($group,$msg_obj);
+				//$this->send_image($group,'mxc://rpi-virtuell.de/FTcrArFukOkGSTJtIjMusbTz', 'showtoolbar.png');
+			}
 
 
+			/*
 			$ret = $this->send_msg_obj($group,$msg_obj);
 
 			$this->set_topic($group,$group->url);
 
-
-
 			$msg = str_replace('%postlink%',get_permalink($group_id).'#group', get_option('options_matrix_bot_welcome_message'));
 			$this->send_msg($group,$msg);
 			$msg = get_option('options_matrix_bot_toolbar_tutorial');
 			$this->send_msg($group,$msg);
-			*/
-			/*
 
 			$user = wp_get_current_user();
 			$to = $user->user_email;
@@ -305,10 +366,8 @@ function tests(int $group_id=0 ){
 			wp_mail( $to, $subject, $body, $headers );
 			*/
 
-
 			//var_dump($this->get_MatrixRoom_Members($group));
 
-
 		}
 
 	}
@@ -324,7 +383,7 @@ private function randomString()
 
 }
 
-use MatrixPhp\MatrixHttpApi;
+#use MatrixPhp\MatrixHttpApi;
 
 class MatrixCustomApi extends MatrixHttpApi{
 	public function __construct(string $baseUrl, ?string $token = null, ?string $identity = null,

From 8ae9aca74f171fd7e0a5e7ea1d7ae0294aec9d08 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Tue, 11 Apr 2023 10:43:11 +0200
Subject: [PATCH 09/14] CHANGES: recode Matrix for meet-kingsters MatrixPhp

---
 inc/matrix.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/inc/matrix.php b/inc/matrix.php
index 1106c60..31cff5e 100644
--- a/inc/matrix.php
+++ b/inc/matrix.php
@@ -59,7 +59,7 @@ public function send_image (Wall\Group $group, string $url, ?string $name='image
 		$room = new Room($this->client,$room_id);
 		$fileinfo = array(
 			"mimetype"=> "image/png",
-            "xyz.amorgan.blurhash"=> "TBR:KR^*~pofx]i_s9j]ax-;RjM{"
+			"xyz.amorgan.blurhash"=> "TBR:KR^*~pofx]i_s9j]ax-;RjM{"
 		);
 		$room->sendImage($url,$name, $fileinfo);
 	}
@@ -167,7 +167,7 @@ function create_Room( Wall\Group $group){
 					$group->set_matrix_room_id( $room->room_id );
 					$group->set_status( 'founded' );
 
-                    $widget_ID = $this->addToolbar($group);
+					$widget_ID = $this->addToolbar($group);
 					$msg = str_replace('%postlink%',get_permalink($group->post->ID).'#group', get_option('options_matrix_bot_welcome_message'));
 					$this->send_msg($group,$msg);
 					$msg = get_option('options_matrix_bot_toolbar_tutorial');
@@ -226,15 +226,15 @@ protected function stateKey($roomId){
 	 */
 	function addWidget(string $room_id, string $name, string $url, string $type = 'm.custom'){
 
-			$room = new Room($this->client,$room_id);
-			$content = array(
-				'type'  =>  $type,
-				'url'   =>  $url,
-				'name'  =>  $name,
-				'data'  =>  array('m'=>'n')
-			);
+		$room = new Room($this->client,$room_id);
+		$content = array(
+			'type'  =>  $type,
+			'url'   =>  $url,
+			'name'  =>  $name,
+			'data'  =>  array('m'=>'n')
+		);
 
-			return $room->sendStateEvent('im.vector.modular.widgets', $content, $this->stateKey($room_id));
+		return $room->sendStateEvent('im.vector.modular.widgets', $content, $this->stateKey($room_id));
 
 
 	}

From 5f17c8160e381b9d06b6084feb8edf34dbd20083 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Tue, 11 Apr 2023 10:49:48 +0200
Subject: [PATCH 10/14] CHANGES: add group function has_matrix_toolbar

---
 inc/group.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/inc/group.php b/inc/group.php
index a983cd9..521de95 100644
--- a/inc/group.php
+++ b/inc/group.php
@@ -693,20 +693,19 @@ protected function get_matrix_channel($local_slug = false)
 
 	/**
 	 * @param bool $set
-     * @return bool
+	 * @return bool
 	 */
-    public function has_matrix_toolbar(bool $set = false){
-
-        if($set){
-	        update_post_meta($this->ID,'matrix_room_has_toolbar',1);
-            $return = true;
-        }else {
-	        $return = empty( get_post_meta( $this->ID, 'matrix_room_has_toolbar', true ) ) ? false : true;
-        }
-	    return $return;
+	public function has_matrix_toolbar(bool $set = false){
 
-    }
+		if($set){
+			update_post_meta($this->ID,'matrix_room_has_toolbar',1);
+			$return = true;
+		}else {
+			$return = empty( get_post_meta( $this->ID, 'matrix_room_has_toolbar', true ) ) ? false : true;
+		}
+		return $return;
 
+	}
     protected function get_joined_member_matrixId($member)
     {
         $matrix = new Matrix();

From b62789209a0e4a5ee9e10342734379289fd9a008 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Tue, 11 Apr 2023 14:22:09 +0200
Subject: [PATCH 11/14] CHANGES: group slug to _ag_

---
 inc/group.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/group.php b/inc/group.php
index 521de95..3c528ea 100644
--- a/inc/group.php
+++ b/inc/group.php
@@ -683,7 +683,7 @@ protected function get_matrix_channel($local_slug = false)
         $prefix = get_option('options_matrix_channel_prefix', 'dibes');
         $ch  = $this->get('rpi_wall_group_channel');
         if(!$ch){
-            return $prefix.'_plg_' . $this->ID;
+            return $prefix.'_ag_' . $this->ID;
         }
         if($local_slug){
 	        $ch = substr($ch, 1, strpos($ch, ':')-1);

From 338a0aba73530b085fc62f4e66cce78370863bf7 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Wed, 12 Apr 2023 11:54:20 +0200
Subject: [PATCH 12/14] UPDATED toolbar name of group if group is constituted

---
 inc/group.php          |  7 ++++++-
 inc/matrix.php         |  3 ++-
 inc/member-page.php    |  6 +++---
 rpi-wall-installer.php | 23 ++++++++++++++++++++++-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/inc/group.php b/inc/group.php
index 3c528ea..a389a86 100644
--- a/inc/group.php
+++ b/inc/group.php
@@ -681,9 +681,14 @@ protected function get_matrix_channel($local_slug = false)
     {
 
         $prefix = get_option('options_matrix_channel_prefix', 'dibes');
+        $group_slug = get_option('options_matrix_group_slug', 'plg');
         $ch  = $this->get('rpi_wall_group_channel');
         if(!$ch){
-            return $prefix.'_ag_' . $this->ID;
+            $ch = '#'.$prefix.'_'.$group_slug.'_' . $this->ID.':'.get_option('options_matrix_server_base','rpi-virtuell.de');
+            if($this->get_matrix_room_id()){
+	            $this->set_matrix_channel($ch);
+            }
+            return $prefix.'_'.$group_slug.'_' . $this->ID;
         }
         if($local_slug){
 	        $ch = substr($ch, 1, strpos($ch, ':')-1);
diff --git a/inc/matrix.php b/inc/matrix.php
index 31cff5e..407f60f 100644
--- a/inc/matrix.php
+++ b/inc/matrix.php
@@ -103,6 +103,7 @@ function create_Room( Wall\Group $group){
 			try{
 				//check if we can join
 				$this->client->api()->joinRoom($room_id);
+
 				//room was created and is available
 				return $room_id;
 
@@ -118,7 +119,7 @@ function create_Room( Wall\Group $group){
 			}
 		}
 		//room_id is not in post_meta may be room is just available
-		$room_alias = '#'.$group->slug.':rpi-virtuell.de';
+		$room_alias = '#'.$group->slug.':'.$this->domain;
 
 
 		//check that the room with the slug does not exist
diff --git a/inc/member-page.php b/inc/member-page.php
index 7522a9a..57f7a0f 100644
--- a/inc/member-page.php
+++ b/inc/member-page.php
@@ -97,12 +97,12 @@ public function bio()
         $tags = '<div class="member-tags">
             <div class="cats"> 
                 <!--[my_tags content="badge"]-->
-                [my_tags content="schooltype"]
+                [my_tags content="section"]
                 [my_tags content="profession"]
             </div>
             <div class="tags">
-            [my_tags content="wall-tag"]
-            [my_tags content="wall-cat"]
+                [my_tags content="wall-tag"]
+                [my_tags content="wall-cat"]
             </div>
          </div>';
         $user = get_userdata($_POST['user_ID']);
diff --git a/rpi-wall-installer.php b/rpi-wall-installer.php
index a068bcc..304a4fe 100644
--- a/rpi-wall-installer.php
+++ b/rpi-wall-installer.php
@@ -927,7 +927,7 @@ function register_custom_fields()
 		                    'label' => 'Matrix Channel Prefix',
 		                    'name' => 'matrix_channel_prefix',
 		                    'type' => 'text',
-		                    'instructions' => 'Zeichenfolge in Kleinbuchstaben, mit der alle Matrix-Channel-Slugs beginnen sollen',
+		                    'instructions' => 'Zeichenfolge in Kleinbuchstaben, mit der alle Matrix-Channel-Slugs (z.B:  #<b><i>rpi</i></b>_plg_1234) beginnen sollen',
 		                    'required' => 0,
 		                    'conditional_logic' => 0,
 		                    'wrapper' => array(
@@ -943,6 +943,27 @@ function register_custom_fields()
 		                    'append' => '',
 		                    'maxlength' => '',
 	                    ),
+	                    array(
+		                    'key' => 'field_rpi_matrix_group_slug',
+		                    'label' => 'Gruppen Kürzel (plg, ag, gruppe...)',
+		                    'name' => 'matrix_group_slug',
+		                    'type' => 'text',
+		                    'instructions' => 'kleinbuchstaben für den zweiten Teil des Channel-Slugs (z.B: #rpi_<b><i>plg</i></b>_1234)',
+		                    'required' => 0,
+		                    'conditional_logic' => 0,
+		                    'wrapper' => array(
+			                    'width' => '',
+			                    'class' => '',
+			                    'id' => '',
+		                    ),
+		                    'frontend_admin_display_mode' => 'edit',
+		                    'readonly' => 0,
+		                    'default_value' => 'plg',
+		                    'placeholder' => 'plg',
+		                    'prepend' => '',
+		                    'append' => '',
+		                    'maxlength' => '',
+	                    ),
                         array(
                             'key' => 'field_rpi_matrix_bot_welcome_message',
                             'label' => 'Matrix Bot Willkommens Nachricht',

From 9029de0427a511100e1a3f8b48e955dad289ef9d Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Wed, 19 Apr 2023 18:30:05 +0200
Subject: [PATCH 13/14] CHANGES: fix counter chronjob read messages

---
 cronjobs.php | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/cronjobs.php b/cronjobs.php
index 7dda59a..96e23d6 100644
--- a/cronjobs.php
+++ b/cronjobs.php
@@ -89,6 +89,8 @@ function cron_sync_read_messages()
 
                 if (!empty($read_messages)) {
 
+	                $this->log('User', $user->user_login);
+
                     $ids = implode(',', array_keys(unserialize($read_messages)));
 
                     //check ob die message noch in der tabelle vrohanden ist
@@ -102,7 +104,11 @@ function cron_sync_read_messages()
                     //allerdings kann es seign dass die Zuordnung rpi_wall_message_recipient von message und user gelöscht wurde.
                     //deshalb besser der post meta checken welche zuordnungen es überhaupt gibt
 
-                    $assigned_messages = $wpdb->get_results("select post_id from {$wpdb->postmeta} where meta_key = 'rpi_wall_message_recipient' and meta_value = {$user->ID}");
+                    $assigned_messages = $wpdb->get_results("select post_id from {$wpdb->postmeta} where
+                              post_id in ($in_ids) and 
+                              meta_key = 'rpi_wall_message_recipient' and meta_value = {$user->ID}");
+
+					$this->log('assigned_messages', count($assigned_messages));
 
                     $read_messages_ids = array();
                     $assigned_messages_ids = array();
@@ -114,12 +120,15 @@ function cron_sync_read_messages()
                             $read_messages_ids[] = $message->post_id;
                         }
                     }
+					$this->log(array_diff($assigned_messages_ids,$read_messages_ids ));
 
                     //Zusammenfassung
                     $count_assigned_messages = count($assigned_messages_ids);
                     $count_read_messages = count($read_messages_ids);
                     $counted_unread = $count_assigned_messages - $count_read_messages;
 
+	                $this->log('Zusammenfassung', $count_assigned_messages,$count_read_messages,$counted_unread );
+
                     update_user_meta($user->ID, 'rpi_wall_unread_messages_count', $counted_unread);
 
                     $update_read_messages = array();
@@ -135,4 +144,31 @@ function cron_sync_read_messages()
         }
 
     }
-}
\ No newline at end of file
+	function log(){
+
+		if(WP_DEBUG){
+			ob_start();
+			echo date('ymd H:i:s');
+			echo ' : ';
+			$args = func_get_args();
+
+			foreach ($args as $arg) {
+
+				if(is_object($arg) || is_array($arg)){
+					echo json_encode($arg);
+
+				}else{
+					echo $arg;
+					echo ' : ';
+				}
+
+
+			}
+			echo "\n";
+			$c = ob_get_clean();
+			file_put_contents(dirname(__FILE__).'/cronjobs.log', $c, FILE_APPEND);
+		}
+
+
+	}
+}

From ec577efc6f20b96b3566dc55da7cd1bea3a05d33 Mon Sep 17 00:00:00 2001
From: Joachim Happel <joachim.happel@gmail.com>
Date: Mon, 8 May 2023 17:27:52 +0200
Subject: [PATCH 14/14] CHANGES: merge

---
 cronjobs.php    | 2 +-
 inc/message.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cronjobs.php b/cronjobs.php
index bed104a..d4f4742 100644
--- a/cronjobs.php
+++ b/cronjobs.php
@@ -147,7 +147,7 @@ function cron_sync_read_messages()
     }
 	function log(){
 
-		if(WP_DEBUG){
+		if(true || WP_DEBUG){
 			ob_start();
 			echo date('ymd H:i:s');
 			echo ' : ';
diff --git a/inc/message.php b/inc/message.php
index d6476fd..82a8007 100644
--- a/inc/message.php
+++ b/inc/message.php
@@ -352,7 +352,7 @@ public function send(\stdClass $msg, array $recipient_ids, string $email_permiss
                     $to[] = $user->user_email;
                 }
             }
-            $headers[] = 'From: ' . get_option('options_network_name', 'Dibes Netzwerk') . ' <' . get_option('options_moderation_email', 'technik@rpi-virtuell.de') . '>' . "\r\n";
+            $headers[] = 'From: ' . get_option('options_network_name', bloginfo('name')) . ' <' . get_option('options_moderation_email', 'technik@rpi-virtuell.de') . '>' . "\r\n";
             foreach ($to as $bcc) {
                 $headers[] = 'Bcc: ' . $bcc;
             }
@@ -439,7 +439,7 @@ static function send_messages($member, \stdClass $msg, $email_permission = '')
                     $to[] = $user->user_email;
                 }
             }
-            $headers[] = 'From: ' . get_option('options_network_name', 'Dibes Netzwerk') . ' <' . get_option('options_moderation_email', 'technik@rpi-virtuell.de') . '>' . "\r\n";
+            $headers[] = 'From: ' . get_option('options_network_name', bloginfo('name')) . ' <' . get_option('options_moderation_email', 'technik@rpi-virtuell.de') . '>' . "\r\n";
             foreach ($to as $bcc) {
                 $headers[] = 'Bcc: ' . $bcc;
             }