Skip to content

small fixesfor plugin AddIn and plugin update #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MightyMCoder merged 2 commits into from
Jan 15, 2025
Merged

small fixesfor plugin AddIn and plugin update #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7f9f26
add default field for multiple organizations on initial plugin call
MightyMCoder Jan 15, 2025
f4d3600
make AddIn field order consistant to sequence property of field
MightyMCoder Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 51 additions & 29 deletions classes/configtable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class CConfigTablePIM
public $config = array(); // array with configuration-data
public $configPff = array(); // array with configuration-data of (P)lugin (f)orm (f)iller

private $table_name; // db table name *_plugin_preferences
private $table_preferences_name; // db table name *_plugin_preferences
private $isPffInst; // (is) (P)lugin (f)orm (f)iller (Inst)alled
private $pffDir; // (p)lugin (f)orm (f)iller (Dir)ectory

Expand All @@ -41,7 +41,7 @@ public function __construct()
require_once(__DIR__ . '/../version.php');
require_once(__DIR__ . '/configdata.php');

$this->table_name = TABLE_PREFIX .'_plugin_preferences';
$this->table_preferences_name = TABLE_PREFIX .'_plugin_preferences';

$this->findPff();
$this->checkPffInst();
Expand All @@ -56,12 +56,12 @@ private function checkPffInst()
global $gDb, $gCurrentOrgId;

// check if configuration table for plugin FormFiller exists
$sql = 'SHOW TABLES LIKE \''.$this->table_name.'\';';
$sql = 'SHOW TABLES LIKE \''.$this->table_preferences_name.'\';';
$statement = $gDb->queryPrepared($sql);

if ($statement->rowCount() !== 0)
{
$sql = 'SELECT COUNT(*) AS COUNT FROM '.$this->table_name.' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$sql = 'SELECT COUNT(*) AS COUNT FROM '.$this->table_preferences_name.' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$statement = $gDb->queryPrepared($sql, array('PFF__Plugininformationen__version', $gCurrentOrgId));

$this->isPffInst = ((int) $statement->fetchColumn() === 1 && $this->pffDir !== false);
Expand Down Expand Up @@ -134,8 +134,8 @@ public function pffDir()
public function init()
{
$this->createTablesIfNotExist();
$this->initializeDefaultFields();
$this->initializePreferences();
$this->initializeDefaultFieldsByOrgId();
$this->initializePreferencesByOrgId();
}

/**
Expand Down Expand Up @@ -193,7 +193,7 @@ private function createTablesIfNotExist()
PRIMARY KEY (iml_id)
');

$this->createTableIfNotExist($this->table_name, '
$this->createTableIfNotExist($this->table_preferences_name, '
plp_id integer unsigned NOT NULL AUTO_INCREMENT,
plp_org_id integer unsigned NOT NULL,
plp_name varchar(255) NOT NULL,
Expand Down Expand Up @@ -225,7 +225,7 @@ private function createTableIfNotExist($tableName, $tableDefinition)
* Initializes default fields in the inventory manager database
* @return void
*/
private function initializeDefaultFields()
private function initializeDefaultFieldsByOrgId()
{
global $gDb, $gCurrentOrgId;

Expand Down Expand Up @@ -329,8 +329,9 @@ private function initializeDefaultFields()
// Now $allFields contains the combined and updated fields

// Clear the table and reset the AUTO_INCREMENT
$sql = 'TRUNCATE TABLE ' . TBL_INVENTORY_MANAGER_FIELDS;
$gDb->query($sql);
//$sql = 'TRUNCATE TABLE ' . TBL_INVENTORY_MANAGER_FIELDS;
$sql = 'DELETE FROM ' . TBL_INVENTORY_MANAGER_FIELDS . ' WHERE imf_org_id = ?;';
$gDb->queryPrepared($sql, array($gCurrentOrgId));

// Insert the new array into the database and keep track of new IDs
$newFieldIds = array();
Expand Down Expand Up @@ -423,7 +424,7 @@ private function createField($name, $internalName, $type, $description, $sequenc
* Initializes preferences for the inventory manager
* @return void
*/
private function initializePreferences()
private function initializePreferencesByOrgId()
{
global $gDb, $gCurrentOrgId;

Expand Down Expand Up @@ -451,7 +452,7 @@ private function initializePreferences()
foreach ($configCurrent as $section => $sectiondata) {
foreach ($sectiondata as $item => $value) {
$plp_name = self::SHORTCUT . '__' . $section . '__' . $item;
$sql = 'DELETE FROM ' . $this->table_name . ' WHERE plp_name = ? AND plp_org_id = ?;';
$sql = 'DELETE FROM ' . $this->table_preferences_name . ' WHERE plp_name = ? AND plp_org_id = ?;';
$gDb->queryPrepared($sql, array($plp_name, $gCurrentOrgId));
unset($this->config[$section][$item]);
}
Expand Down Expand Up @@ -480,17 +481,17 @@ public function write()

$plpName = self::SHORTCUT . '__' . $section . '__' . $item;

$sql = 'SELECT plp_id FROM ' . $this->table_name . ' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$sql = 'SELECT plp_id FROM ' . $this->table_preferences_name . ' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$statement = $gDb->queryPrepared($sql, array($plpName, $gCurrentOrgId));
$row = $statement->fetchObject();

if (isset($row->plp_id) && strlen($row->plp_id) > 0) {
// Record exists, update it
$sql = 'UPDATE ' . $this->table_name . ' SET plp_value = ? WHERE plp_id = ?;';
$sql = 'UPDATE ' . $this->table_preferences_name . ' SET plp_value = ? WHERE plp_id = ?;';
$gDb->queryPrepared($sql, array($value, $row->plp_id));
} else {
// Record does not exist, insert it
$sql = 'INSERT INTO ' . $this->table_name . ' (plp_org_id, plp_name, plp_value) VALUES (?, ?, ?);';
$sql = 'INSERT INTO ' . $this->table_preferences_name . ' (plp_org_id, plp_name, plp_value) VALUES (?, ?, ?);';
$gDb->queryPrepared($sql, array($gCurrentOrgId, $plpName, $value));
}
}
Expand Down Expand Up @@ -525,7 +526,7 @@ private function readConfigData($pluginShortcut, &$configArray)
{
global $gDb, $gCurrentOrgId;

$sql = 'SELECT plp_id, plp_name, plp_value FROM '.$this->table_name.' WHERE plp_name LIKE ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$sql = 'SELECT plp_id, plp_name, plp_value FROM '.$this->table_preferences_name.' WHERE plp_name LIKE ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$statement = $gDb->queryPrepared($sql, array($pluginShortcut.'__%', $gCurrentOrgId));

while ($row = $statement->fetch())
Expand Down Expand Up @@ -572,11 +573,14 @@ public function checkForUpdate()
$needsUpdate = false;

// Check if table *_plugin_preferences exists
$sql = 'SHOW TABLES LIKE \'' . $this->table_name . '\' ';
$tableExistStatement = $gDb->queryPrepared($sql);
$sql = 'SHOW TABLES LIKE \'' . $this->table_preferences_name . '\' ';
$tablePreferencesExistStatement = $gDb->queryPrepared($sql);

if ($tableExistStatement->rowCount()) {
$needsUpdate = $this->compareVersion() || $this->compareStand();
$sql = 'SHOW TABLES LIKE \'' . TBL_INVENTORY_MANAGER_FIELDS . '\' ';
$tableFieldsExistStatement = $gDb->queryPrepared($sql);

if ($tablePreferencesExistStatement->rowCount() && $tableFieldsExistStatement->rowCount()) {
$needsUpdate = $this->checkDefaultFieldsForCurrentOrg() || $this->compareVersion() || $this->compareStand();
} else {
// Update needed because it is not installed yet
$needsUpdate = true;
Expand All @@ -595,7 +599,7 @@ private function compareVersion()

$plp_name = self::SHORTCUT . '__Plugininformationen__version';

$sql = 'SELECT plp_value FROM ' . $this->table_name . ' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$sql = 'SELECT plp_value FROM ' . $this->table_preferences_name . ' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$statement = $gDb->queryPrepared($sql, array($plp_name, $gCurrentOrgId));
$row = $statement->fetchObject();

Expand All @@ -613,14 +617,32 @@ private function compareStand()

$plp_name = self::SHORTCUT . '__Plugininformationen__stand';

$sql = 'SELECT plp_value FROM ' . $this->table_name . ' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$sql = 'SELECT plp_value FROM ' . $this->table_preferences_name . ' WHERE plp_name = ? AND (plp_org_id = ? OR plp_org_id IS NULL);';
$statement = $gDb->queryPrepared($sql, array($plp_name, $gCurrentOrgId));
$row = $statement->fetchObject();

// Compare stands
return !isset($row->plp_value) || strlen($row->plp_value) === 0 || $row->plp_value !== CPluginInfoPIM::getPluginStand();
}


/**
* Checks if there are default fields for all organizations.
* @return bool Returns true if there are no default fields for the current organization, false otherwise.
*/
private function checkDefaultFieldsForCurrentOrg()
{
global $gDb, $gCurrentOrgId;

$sql = 'SELECT imf_name_intern FROM ' . TBL_INVENTORY_MANAGER_FIELDS . ' WHERE imf_org_id = ?;';
$statement = $gDb->queryPrepared($sql, array($gCurrentOrgId));
$row = $statement->fetchObject();

if (!$row) {
return true;
}
return false;
}

/**
* Delete configuration data from the database
* @param int $deinstOrgSelect 0 = only delete data from current org, 1 = delete data from every org
Expand All @@ -637,24 +659,24 @@ public function deleteConfigData($deinstOrgSelect)
$sqlWhereCondition = 'AND plp_org_id = ?';
}

$sql = 'DELETE FROM ' . $this->table_name . ' WHERE plp_name LIKE ? ' . $sqlWhereCondition;
$sql = 'DELETE FROM ' . $this->table_preferences_name . ' WHERE plp_name LIKE ? ' . $sqlWhereCondition;
$params = [self::SHORTCUT . '__%'];
if ($deinstOrgSelect == 0) {
$params[] = $gCurrentOrgId;
}
$result_data = $gDb->queryPrepared($sql, $params);
$result .= ($result_data ? $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_DATA_DELETED_IN', [$this->table_name]) : $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_DATA_DELETED_IN_ERROR', [$this->table_name]));
$result .= ($result_data ? $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_DATA_DELETED_IN', [$this->table_preferences_name]) : $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_DATA_DELETED_IN_ERROR', [$this->table_preferences_name]));

// Check if the table is empty and can be deleted
$sql = 'SELECT * FROM ' . $this->table_name;
$sql = 'SELECT * FROM ' . $this->table_preferences_name;
$statement = $gDb->queryPrepared($sql);

if ($statement->rowCount() == 0) {
$sql = 'DROP TABLE ' . $this->table_name;
$sql = 'DROP TABLE ' . $this->table_preferences_name;
$result_db = $gDb->queryPrepared($sql);
$result .= ($result_db ? $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_TABLE_DELETED', [$this->table_name]) : $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_TABLE_DELETE_ERROR', [$this->table_name]));
$result .= ($result_db ? $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_TABLE_DELETED', [$this->table_preferences_name]) : $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_TABLE_DELETE_ERROR', [$this->table_preferences_name]));
} else {
$result .= $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_CONFIGTABLE_DELETE_NOTPOSSIBLE', [$this->table_name]);
$result .= $gL10n->get('PLG_INVENTORY_MANAGER_DEINST_CONFIGTABLE_DELETE_NOTPOSSIBLE', [$this->table_preferences_name]);
}

return $result;
Expand Down
10 changes: 5 additions & 5 deletions classes/items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ class CItems
* @param \Database $database Database object (should be @b $gDb)
* @param int $organizationId The id of the organization for which the item field structure should be read
*/
public function __construct($database, $organizationId)
public function __construct($database, $organizationId, $fieldsOrderBy = 'imf_id')
{
$this->organizationId = $organizationId;
$this->setDatabase($database);
$this->readItemFields($this->organizationId);
$this->readItemFields($this->organizationId, $fieldsOrderBy);
$this->mItemId = 0;
$this->columnsValueChanged = false;
$this->itemCreated = false;
Expand Down Expand Up @@ -534,15 +534,15 @@ public function saveItemData()
* @param int $organizationId The id of the organization for which the item fields
* structure should be read.
*/
public function readItemFields($organizationId)
public function readItemFields($organizationId, $orderBy = 'imf_id')
{
// first initialize existing data
$this->mItemFields = array();
$this->clearItemData();

$sql = 'SELECT * FROM '.TBL_INVENTORY_MANAGER_FIELDS.'
WHERE imf_org_id IS NULL
OR imf_org_id = ?;';
WHERE (imf_org_id IS NULL OR imf_org_id = ?)
ORDER BY '. $orderBy .';';
$statement = $this->mDb->queryPrepared($sql, array($organizationId));

while ($row = $statement->fetch()) {
Expand Down
Loading