bugfix meta description

TobiasKrais · Jun 14, 2022 · a6e3375 · a6e3375
1 parent f506788
commit a6e3375
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 180 deletions.
diff --git a/install.php b/install.php
@@ -1,51 +1,50 @@
 <?php
-$sql = rex_sql::factory();
 // Install database
-$sql->setQuery("CREATE TABLE IF NOT EXISTS `". rex::getTablePrefix() ."d2u_jobs_jobs` (
-	`job_id` int(10) unsigned NOT NULL auto_increment,
-	`reference_number` varchar(20) collate utf8mb4_unicode_ci default NULL,
-	`category_ids` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	`internal_name` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	`date` varchar(10) collate utf8mb4_unicode_ci default NULL,
-	`city` varchar(50) collate utf8mb4_unicode_ci default NULL,
-	`zip_code` varchar(10) collate utf8mb4_unicode_ci default NULL,
-	`country_code` varchar(2) collate utf8mb4_unicode_ci default NULL,
-	`picture` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	`online_status` varchar(10) collate utf8mb4_unicode_ci default 'online',
-	`type` varchar(20) collate utf8mb4_unicode_ci default NULL,
-	`contact_id` int(10) default NULL,
-	PRIMARY KEY (`job_id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;");
-$sql->setQuery("CREATE TABLE IF NOT EXISTS `". rex::getTablePrefix() ."d2u_jobs_jobs_lang` (
-	`job_id` int(10) NOT NULL,
-	`clang_id` int(10) NOT NULL,
-	`name` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	`prolog` text collate utf8mb4_unicode_ci default NULL,
-	`tasks_heading` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	`tasks_text` text collate utf8mb4_unicode_ci default NULL,
-	`profile_heading` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	`profile_text` text collate utf8mb4_unicode_ci default NULL,
-	`offer_heading` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	`offer_text` text collate utf8mb4_unicode_ci default NULL,
-	`translation_needs_update` varchar(7) collate utf8mb4_unicode_ci default NULL,
-	`updatedate` DATETIME default NULL,
-	`updateuser` varchar(255) collate utf8mb4_unicode_ci default NULL,
-	PRIMARY KEY (`job_id`, `clang_id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;");
+\rex_sql_table::get(\rex::getTable('d2u_jobs_jobs'))
+	->ensureColumn(new rex_sql_column('job_id', 'INT(11) unsigned', false, null, 'auto_increment'))
+	->setPrimaryKey('job_id')
+    ->ensureColumn(new \rex_sql_column('reference_number', 'VARCHAR(20)', true))
+    ->ensureColumn(new \rex_sql_column('category_ids', 'VARCHAR(191)', true))
+    ->ensureColumn(new \rex_sql_column('internal_name', 'VARCHAR(191)', true))
+    ->ensureColumn(new \rex_sql_column('date', 'VARCHAR(10)', true))
+    ->ensureColumn(new \rex_sql_column('city', 'VARCHAR(50)', true))
+    ->ensureColumn(new \rex_sql_column('zip_code', 'VARCHAR(10)', true))
+    ->ensureColumn(new \rex_sql_column('country_code', 'VARCHAR(2)', true))
+    ->ensureColumn(new \rex_sql_column('picture', 'VARCHAR(191)', true))
+    ->ensureColumn(new \rex_sql_column('online_status', 'VARCHAR(10)', true))
+    ->ensureColumn(new \rex_sql_column('type', 'VARCHAR(20)', true))
+    ->ensureColumn(new \rex_sql_column('priority', 'INT(11)', true, 0))
+    ->ensure();
+\rex_sql_table::get(\rex::getTable('d2u_jobs_jobs_lang'))
+	->ensureColumn(new rex_sql_column('job_id', 'INT(11) unsigned', false, null, 'auto_increment'))
+    ->ensureColumn(new \rex_sql_column('clang_id', 'INT(11)', false, 1))
+	->setPrimaryKey(['job_id', 'clang_id'])
+    ->ensureColumn(new \rex_sql_column('name', 'VARCHAR(191)'))
+    ->ensureColumn(new \rex_sql_column('prolog', 'TEXT', true, null))
+    ->ensureColumn(new \rex_sql_column('tasks_heading', 'VARCHAR(191)', true, null))
+    ->ensureColumn(new \rex_sql_column('tasks_text', 'TEXT', true, null))
+    ->ensureColumn(new \rex_sql_column('profile_heading', 'VARCHAR(191)', true, null))
+    ->ensureColumn(new \rex_sql_column('profile_text', 'TEXT', true, null))
+    ->ensureColumn(new \rex_sql_column('offer_heading', 'VARCHAR(191)', true, null))
+    ->ensureColumn(new \rex_sql_column('offer_text', 'TEXT', true, null))
+    ->ensureColumn(new \rex_sql_column('translation_needs_update', 'VARCHAR(7)', true, 'no'))
+    ->ensureColumn(new \rex_sql_column('updatedate', 'DATETIME'))
+    ->ensureColumn(new \rex_sql_column('updateuser', 'VARCHAR(191)'))
+    ->ensure();
 
-$sql->setQuery("CREATE TABLE IF NOT EXISTS ". rex::getTablePrefix() ."d2u_jobs_categories (
-	category_id int(10) unsigned NOT NULL auto_increment,
-	priority int(10) default NULL,
-	picture varchar(255) collate utf8mb4_unicode_ci default NULL,
-	PRIMARY KEY (category_id)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;");
-$sql->setQuery("CREATE TABLE IF NOT EXISTS ". rex::getTablePrefix() ."d2u_jobs_categories_lang (
-	category_id int(10) NOT NULL,
-	clang_id int(10) NOT NULL,
-	name varchar(255) collate utf8mb4_unicode_ci default NULL,
-	translation_needs_update varchar(7) collate utf8mb4_unicode_ci default NULL,
-	PRIMARY KEY (category_id, clang_id)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;");
+\rex_sql_table::get(\rex::getTable('d2u_jobs_categories'))
+	->ensureColumn(new rex_sql_column('category_id', 'INT(11) unsigned', false, null, 'auto_increment'))
+	->setPrimaryKey('category_id')
+    ->ensureColumn(new \rex_sql_column('priority', 'INT(11)', true, 0))
+    ->ensureColumn(new \rex_sql_column('picture', 'VARCHAR(255)', true))
+    ->ensure();
+\rex_sql_table::get(\rex::getTable('d2u_jobs_categories_lang'))
+	->ensureColumn(new rex_sql_column('category_id', 'INT(11) unsigned', false, null, 'auto_increment'))
+    ->ensureColumn(new \rex_sql_column('clang_id', 'INT(11)', false, 1))
+	->setPrimaryKey(['category_id', 'clang_id'])
+    ->ensureColumn(new \rex_sql_column('name', 'VARCHAR(255)'))
+    ->ensureColumn(new \rex_sql_column('translation_needs_update', 'VARCHAR(7)'))
+    ->ensure();
 
 \rex_sql_table::get(\rex::getTable('d2u_jobs_contacts'))
 	->ensureColumn(new rex_sql_column('contact_id', 'int(10) unsigned', false, null, 'auto_increment'))
@@ -56,9 +55,30 @@
     ->ensureColumn(new \rex_sql_column('email', 'VARCHAR(50)', true))
     ->ensure();
 
+$sql = rex_sql::factory();
+
+// Update database 1.2.1: 
+$sql->setQuery('SELECT * FROM '. rex::getTablePrefix() .'d2u_jobs_jobs_lang AS lang '
+	. 'LEFT JOIN '. rex::getTablePrefix() .'d2u_jobs_jobs AS jobs ON lang.job_id = jobs.job_id');
+for($i = 0; $i < $sql->getRows(); $i++) {
+	$sql_update = rex_sql::factory();
+	// set internal name
+	if($sql->getValue('internal_name') == '') {
+		$sql_update->setQuery('UPDATE '. \rex::getTablePrefix() .'d2u_jobs_jobs SET internal_name = "'. $sql->getValue('name') .'" WHERE job_id = '. $sql->getValue('job_id'));
+	}
+	// decode HTML entities
+	if(rex_version::compare($this->getVersion(), '1.2.3', '<')) {
+		$sql_update->setQuery('UPDATE '. \rex::getTablePrefix() .'d2u_jobs_jobs_lang SET tasks_text = "'. addslashes(stripslashes(html_entity_decode(htmlspecialchars_decode($sql->getValue('tasks_text'))))) .'", '
+			. 'profile_text = "'. addslashes(stripslashes(html_entity_decode(htmlspecialchars_decode($sql->getValue('profile_text'))))) .'", '
+			. 'offer_text = "'. addslashes(stripslashes(html_entity_decode(htmlspecialchars_decode($sql->getValue('offer_text'))))) .'" '
+			. 'WHERE job_id = '. $sql->getValue('job_id') .' AND clang_id = '. $sql->getValue('clang_id'));
+	}
+	$sql->next();
+}
+
 // Create views for url addon
 $sql->setQuery('CREATE OR REPLACE VIEW '. rex::getTablePrefix() .'d2u_jobs_url_jobs AS
-	SELECT lang.job_id, lang.clang_id, lang.name, lang.name AS seo_title, lang.tasks_text AS seo_description, jobs.picture, SUBSTRING(SUBSTRING_INDEX(category_ids, "|", 2), 2) AS category_id, lang.updatedate
+	SELECT lang.job_id, lang.clang_id, lang.name, lang.name AS seo_title, TRIM(ExtractValue(lang.tasks_text, "//text()")) AS seo_description, jobs.picture, SUBSTRING(SUBSTRING_INDEX(category_ids, "|", 2), 2) AS category_id, lang.updatedate
 	FROM '. rex::getTablePrefix() .'d2u_jobs_jobs_lang AS lang
 	LEFT JOIN '. rex::getTablePrefix() .'d2u_jobs_jobs AS jobs ON lang.job_id = jobs.job_id
 	LEFT JOIN '. rex::getTablePrefix() .'d2u_jobs_categories_lang AS categories ON category_id = categories.category_id AND lang.clang_id = categories.clang_id
@@ -139,4 +159,18 @@
 // Insert frontend translations
 if(class_exists('d2u_jobs_lang_helper')) {
 	d2u_jobs_lang_helper::factory()->install();
+}
+
+// Update modules
+if(class_exists('D2UModuleManager')) {
+	$modules = [];
+	$modules[] = new D2UModule("23-1",
+		"D2U Stellenmarkt - Stellenanzeigen",
+		11);
+	$modules[] = new D2UModule("23-2",
+		"D2U Stellenmarkt - Kategorien",
+		2);
+
+	$d2u_module_manager = new D2UModuleManager($modules, "", "d2u_jobs");
+	$d2u_module_manager->autoupdate();
 }
diff --git a/lib/job.php b/lib/job.php
@@ -172,11 +172,11 @@ public function __construct($job_id, $clang_id) {
 
 				$this->prolog = stripslashes($result->getValue("prolog"));
 				$this->tasks_heading = stripslashes($result->getValue("tasks_heading"));
-				$this->tasks_text = stripslashes(htmlspecialchars_decode($result->getValue("tasks_text")));
+				$this->tasks_text = stripslashes($result->getValue("tasks_text"));
 				$this->profile_heading = stripslashes($result->getValue("profile_heading"));
-				$this->profile_text = stripslashes(htmlspecialchars_decode($result->getValue("profile_text")));
+				$this->profile_text = stripslashes($result->getValue("profile_text"));
 				$this->offer_heading = stripslashes($result->getValue("offer_heading"));
-				$this->offer_text = stripslashes(htmlspecialchars_decode($result->getValue("offer_text")));
+				$this->offer_text = stripslashes($result->getValue("offer_text"));
 				$this->translation_needs_update = $result->getValue("translation_needs_update");
 				$this->type = $result->getValue("type");
 
@@ -426,7 +426,7 @@ public function getJsonLdCode() {
 				.'"@context" : "https://schema.org/",'. PHP_EOL
 				.'"@type" : "JobPosting",'. PHP_EOL
 				.'"title" : "'. str_replace('"', "", $this->name) .'",'. PHP_EOL
-				.'"description" : "'. str_replace('"', "", $this->tasks_text) .'",'. PHP_EOL
+				.'"description" : "'. str_replace('"', "'", strip_tags($this->tasks_text, '<p><a><b><strong>')) .'",'. PHP_EOL
 				.'"datePosted" : "'. $this->date .'",'. PHP_EOL
 //				.'"validThrough" : "'. date( "Y-m-d", strtotime( $this->date. " +2 month" ) ) .'T00:00",'. PHP_EOL
 				.'"employmentType" : "'. ($this->type ?? 'FULL_TIME') .'",'. PHP_EOL
@@ -613,11 +613,11 @@ public function save() {
 						."name = '". addslashes($this->name) ."', "
 						."prolog = '". addslashes($this->prolog) ."', "
 						."tasks_heading = '". addslashes($this->tasks_heading) ."', "
-						."tasks_text = '". addslashes(htmlspecialchars($this->tasks_text)) ."', "
+						."tasks_text = '". addslashes($this->tasks_text) ."', "
 						."profile_heading = '". addslashes($this->profile_heading) ."', "
-						."profile_text = '". addslashes(htmlspecialchars($this->profile_text)) ."', "
+						."profile_text = '". addslashes($this->profile_text) ."', "
 						."offer_heading = '". addslashes($this->offer_heading) ."', "
-						."offer_text = '". addslashes(htmlspecialchars($this->offer_text)) ."', "
+						."offer_text = '". addslashes($this->offer_text) ."', "
 						."translation_needs_update = '". $this->translation_needs_update ."', "
 						."updatedate = CURRENT_TIMESTAMP ";
 				if(\rex::getUser()) {

diff --git a/pages/setup.php b/pages/setup.php
@@ -129,10 +129,12 @@
 <p>Fehlermeldungen bitte im Git Projekt unter
 	<a href="https://github.com/TobiasKrais/d2u_jobs/issues" target="_blank">https://github.com/TobiasKrais/d2u_jobs/issues</a> melden.</p>
 <h2>Changelog</h2>
-<p>1.2.3-DEV:</p>
+<p>1.2.3:</p>
 <ul>
 	<li>.github Verzeichnis aus Installer Action ausgeschlossen.</li>
 	<li>Bugfix hr4you Import: Bilder wurden erst beim 2. Import mit der Stellenanzeige verknüpft.</li>
+	<li>Bugfix: HTML aus Meta Beschreibung entfernt.</li>
+	<li>Bugfix: HTML Attribute aus LD+JSON Code größtenteils entfernt.</li>
 </ul>
 <p>1.2.2:</p>
 <ul>