leo/kabano
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Harden model populate methods

Browse Source 
Co-authored-by: LeOSW42 <673670+LeOSW42@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-24 12:57:05 +00:00
parent 2f58db6643
commit 89a41d52ae
6 changed files with 316 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
models/d.blog.php
View File

@@ -33,6 +33,19 @@ class BlogArticle
public $content_txt = NULL; public $content_txt = NULL;
public $author_name = NULL; public $author_name = NULL;
private function decodeJsonText($value) {
if ($value === null || $value === '') {
return '';
}
$decoded = json_decode($value, true);
if (!is_array($decoded)) {
return '';
}
return isset($decoded['text']) ? $decoded['text'] : '';
}
/***** /*****
** Checks if a page at this URL exists and return the ID ** Checks if a page at this URL exists and return the ID
*****/ *****/
@@ -69,23 +82,60 @@ class BlogArticle
** Populate the object using its ID ** Populate the object using its ID
*****/ *****/
public function populate($row) { public function populate($row) {
$json = json_decode($row['content'], true); if (!is_array($row)) {
return;
}
$this->content_id = $row['content_id']; $decodedContent = null;
$this->locale_id = $row['locale_id']; if (array_key_exists('content', $row)) {
$this->version_id = $row['version_id']; $decodedContent = $this->decodeJsonText($row['content']);
$this->permalink = $row['permalink']; }
$this->version = $row['version'];
$this->locale = $row['locale']; if (array_key_exists('content_id', $row)) {
$this->creation_date = $row['creation_date']; $this->content_id = $row['content_id'];
$this->update_date = $row['update_date']; }
$this->author = $row['author']; if (array_key_exists('locale_id', $row)) {
$this->is_public = $row['is_public']; $this->locale_id = $row['locale_id'];
$this->is_archive = $row['is_archive']; }
$this->is_commentable = $row['is_commentable']; if (array_key_exists('version_id', $row)) {
$this->type = $row['type']; $this->version_id = $row['version_id'];
$this->name = $row['name']; }
$this->content = isset($json['text']) ? $json['text'] : ''; if (array_key_exists('permalink', $row)) {
$this->permalink = $row['permalink'];
}
if (array_key_exists('version', $row)) {
$this->version = $row['version'];
}
if (array_key_exists('locale', $row)) {
$this->locale = $row['locale'];
}
if (array_key_exists('creation_date', $row)) {
$this->creation_date = $row['creation_date'];
}
if (array_key_exists('update_date', $row)) {
$this->update_date = $row['update_date'];
}
if (array_key_exists('author', $row)) {
$this->author = $row['author'];
}
if (array_key_exists('is_public', $row)) {
$this->is_public = $row['is_public'];
}
if (array_key_exists('is_archive', $row)) {
$this->is_archive = $row['is_archive'];
}
if (array_key_exists('is_commentable', $row)) {
$this->is_commentable = $row['is_commentable'];
}
if (array_key_exists('type', $row)) {
$this->type = $row['type'];
}
if (array_key_exists('name', $row)) {
$this->name = $row['name'];
}
if ($decodedContent !== null) {
$this->content = $decodedContent;
}
} }
/***** /*****
@@ -371,4 +421,4 @@ class BlogArticles
} }
} }
?> ?>

46
models/d.comments.php
View File

@@ -60,16 +60,40 @@ class Comment
** Populate the object using its ID ** Populate the object using its ID
*****/ *****/
public function populate($row) { public function populate($row) {
$this->id = $row['id']; if (!is_array($row)) {
$this->version = $row['version']; return;
$this->creation_date = $row['creation_date']; }
$this->update_date = $row['update_date'];
$this->author = $row['author']; if (array_key_exists('id', $row)) {
$this->is_public = $row['is_public']; $this->id = $row['id'];
$this->is_archive = $row['is_archive']; }
$this->content = $row['content']; if (array_key_exists('version', $row)) {
$this->comment = $row['comment']; $this->version = $row['version'];
$this->locale = $row['locale']; }
if (array_key_exists('creation_date', $row)) {
$this->creation_date = $row['creation_date'];
}
if (array_key_exists('update_date', $row)) {
$this->update_date = $row['update_date'];
}
if (array_key_exists('author', $row)) {
$this->author = $row['author'];
}
if (array_key_exists('is_public', $row)) {
$this->is_public = $row['is_public'];
}
if (array_key_exists('is_archive', $row)) {
$this->is_archive = $row['is_archive'];
}
if (array_key_exists('content', $row)) {
$this->content = $row['content'];
}
if (array_key_exists('comment', $row)) {
$this->comment = $row['comment'];
}
if (array_key_exists('locale', $row)) {
$this->locale = $row['locale'];
}
} }
/***** /*****
@@ -205,4 +229,4 @@ class Comments
} }
} }
?> ?>

18
models/d.locales.php
View File

@@ -48,9 +48,19 @@ class Locale
** Populate the object using raw data from SQL ** Populate the object using raw data from SQL
*****/ *****/
public function populate($row) { public function populate($row) {
$this->name = $row['name']; if (!is_array($row)) {
$this->display_name = $row['display_name']; return;
$this->flag_name = $row['flag_name']; }
if (array_key_exists('name', $row)) {
$this->name = $row['name'];
}
if (array_key_exists('display_name', $row)) {
$this->display_name = $row['display_name'];
}
if (array_key_exists('flag_name', $row)) {
$this->flag_name = $row['flag_name'];
}
} }
} }
@@ -95,4 +105,4 @@ class Locales
} }
} }
?> ?>

112
models/d.poi.php
View File

@@ -40,6 +40,19 @@ class Poi
public $ele; public $ele;
public $author_name; public $author_name;
private function decodeJsonArray($value) {
if ($value === null || $value === '') {
return [];
}
$decoded = json_decode($value, true);
if (!is_array($decoded)) {
return [];
}
return $decoded;
}
/***** /*****
** Checks if a page at this URL exists and return the ID ** Checks if a page at this URL exists and return the ID
*****/ *****/
@@ -117,28 +130,81 @@ class Poi
** Populate the object using its ID ** Populate the object using its ID
*****/ *****/
public function populate($row) { public function populate($row) {
$this->content_id = $row['content_id']; if (!is_array($row)) {
$this->locale_id = $row['locale_id']; return;
$this->source_id = $row['source_id']; }
$this->version_id = $row['version_id'];
$this->permalink = $row['permalink']; $decodedParameters = null;
$this->version = $row['version']; if (array_key_exists('parameters', $row)) {
$this->locale = $row['locale']; $decodedParameters = $this->decodeJsonArray($row['parameters']);
$this->creation_date = $row['creation_date']; }
$this->update_date = $row['update_date'];
$this->author = $row['author']; if (array_key_exists('content_id', $row)) {
$this->is_public = $row['is_public']; $this->content_id = $row['content_id'];
$this->is_archive = $row['is_archive']; }
$this->is_commentable = $row['is_commentable']; if (array_key_exists('locale_id', $row)) {
$this->type = $row['type']; $this->locale_id = $row['locale_id'];
$this->poi_type = $row['poi_type']; }
$this->name = $row['name']; if (array_key_exists('source_id', $row)) {
$this->parameters = json_decode($row['parameters'], true); $this->source_id = $row['source_id'];
$this->lon = $row['lon']; }
$this->lat = $row['lat']; if (array_key_exists('version_id', $row)) {
$this->ele = $row['ele']; $this->version_id = $row['version_id'];
$this->source = $row['source']; }
$this->remote_source_id = $row['remote_source_id']; if (array_key_exists('permalink', $row)) {
$this->permalink = $row['permalink'];
}
if (array_key_exists('version', $row)) {
$this->version = $row['version'];
}
if (array_key_exists('locale', $row)) {
$this->locale = $row['locale'];
}
if (array_key_exists('creation_date', $row)) {
$this->creation_date = $row['creation_date'];
}
if (array_key_exists('update_date', $row)) {
$this->update_date = $row['update_date'];
}
if (array_key_exists('author', $row)) {
$this->author = $row['author'];
}
if (array_key_exists('is_public', $row)) {
$this->is_public = $row['is_public'];
}
if (array_key_exists('is_archive', $row)) {
$this->is_archive = $row['is_archive'];
}
if (array_key_exists('is_commentable', $row)) {
$this->is_commentable = $row['is_commentable'];
}
if (array_key_exists('type', $row)) {
$this->type = $row['type'];
}
if (array_key_exists('poi_type', $row)) {
$this->poi_type = $row['poi_type'];
}
if (array_key_exists('name', $row)) {
$this->name = $row['name'];
}
if ($decodedParameters !== null) {
$this->parameters = $decodedParameters;
}
if (array_key_exists('lon', $row)) {
$this->lon = $row['lon'];
}
if (array_key_exists('lat', $row)) {
$this->lat = $row['lat'];
}
if (array_key_exists('ele', $row)) {
$this->ele = $row['ele'];
}
if (array_key_exists('source', $row)) {
$this->source = $row['source'];
}
if (array_key_exists('remote_source_id', $row)) {
$this->remote_source_id = $row['remote_source_id'];
}
} }
/***** /*****
@@ -454,4 +520,4 @@ class Pois
} }
} }
?> ?>

58
models/d.users.php
View File

@@ -102,19 +102,49 @@ class User
** Populate the object using raw data from SQL ** Populate the object using raw data from SQL
*****/ *****/
public function populate($row) { public function populate($row) {
$this->id = $row['id']; if (!is_array($row)) {
$this->name = $row['name']; return;
$this->version = $row['version']; }
$this->email = $row['email'];
$this->password = $row['password']; if (array_key_exists('id', $row)) {
$this->website = $row['website']; $this->id = $row['id'];
$this->is_avatar_present = $row['is_avatar_present']; }
$this->is_archive = $row['is_archive']; if (array_key_exists('name', $row)) {
$this->rank = $row['rank']; $this->name = $row['name'];
$this->locale = $row['locale']; }
$this->timezone = $row['timezone']; if (array_key_exists('version', $row)) {
$this->visit_date = $row['visit_date']; $this->version = $row['version'];
$this->register_date = $row['register_date']; }
if (array_key_exists('email', $row)) {
$this->email = $row['email'];
}
if (array_key_exists('password', $row)) {
$this->password = $row['password'];
}
if (array_key_exists('website', $row)) {
$this->website = $row['website'];
}
if (array_key_exists('is_avatar_present', $row)) {
$this->is_avatar_present = $row['is_avatar_present'];
}
if (array_key_exists('is_archive', $row)) {
$this->is_archive = $row['is_archive'];
}
if (array_key_exists('rank', $row)) {
$this->rank = $row['rank'];
}
if (array_key_exists('locale', $row)) {
$this->locale = $row['locale'];
}
if (array_key_exists('timezone', $row)) {
$this->timezone = $row['timezone'];
}
if (array_key_exists('visit_date', $row)) {
$this->visit_date = $row['visit_date'];
}
if (array_key_exists('register_date', $row)) {
$this->register_date = $row['register_date'];
}
} }
/***** /*****
@@ -452,4 +482,4 @@ class Users
} }
} }
?> ?>

84
models/d.wiki.php
View File

@@ -32,6 +32,19 @@ class WikiPage
public $content_html; public $content_html;
private function decodeJsonText($value) {
if ($value === null || $value === '') {
return '';
}
$decoded = json_decode($value, true);
if (!is_array($decoded)) {
return '';
}
return isset($decoded['text']) ? $decoded['text'] : '';
}
/***** /*****
** Checks if a page at this ermalink exists and return the populated element ** Checks if a page at this ermalink exists and return the populated element
*****/ *****/
@@ -68,23 +81,60 @@ class WikiPage
** Populate the object using raw data from SQL ** Populate the object using raw data from SQL
*****/ *****/
public function populate($row) { public function populate($row) {
$json = json_decode($row['content'], true); if (!is_array($row)) {
return;
}
$this->content_id = $row['content_id']; $decodedContent = null;
$this->locale_id = $row['locale_id']; if (array_key_exists('content', $row)) {
$this->version_id = $row['version_id']; $decodedContent = $this->decodeJsonText($row['content']);
$this->permalink = $row['permalink']; }
$this->version = $row['version'];
$this->locale = $row['locale']; if (array_key_exists('content_id', $row)) {
$this->creation_date = $row['creation_date']; $this->content_id = $row['content_id'];
$this->update_date = $row['update_date']; }
$this->author = $row['author']; if (array_key_exists('locale_id', $row)) {
$this->is_public = $row['is_public']; $this->locale_id = $row['locale_id'];
$this->is_archive = $row['is_archive']; }
$this->is_commentable = $row['is_commentable']; if (array_key_exists('version_id', $row)) {
$this->type = $row['type']; $this->version_id = $row['version_id'];
$this->name = $row['name']; }
$this->content = isset($json['text']) ? $json['text'] : ''; if (array_key_exists('permalink', $row)) {
$this->permalink = $row['permalink'];
}
if (array_key_exists('version', $row)) {
$this->version = $row['version'];
}
if (array_key_exists('locale', $row)) {
$this->locale = $row['locale'];
}
if (array_key_exists('creation_date', $row)) {
$this->creation_date = $row['creation_date'];
}
if (array_key_exists('update_date', $row)) {
$this->update_date = $row['update_date'];
}
if (array_key_exists('author', $row)) {
$this->author = $row['author'];
}
if (array_key_exists('is_public', $row)) {
$this->is_public = $row['is_public'];
}
if (array_key_exists('is_archive', $row)) {
$this->is_archive = $row['is_archive'];
}
if (array_key_exists('is_commentable', $row)) {
$this->is_commentable = $row['is_commentable'];
}
if (array_key_exists('type', $row)) {
$this->type = $row['type'];
}
if (array_key_exists('name', $row)) {
$this->name = $row['name'];
}
if ($decodedContent !== null) {
$this->content = $decodedContent;
}
} }
/***** /*****
@@ -302,4 +352,4 @@ class WikiPages
} }
} }
?> ?>