Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 11:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce connector model to WebDAV-only state

Browse Source
This commit is contained in:
Terranom674
2026-08-20 11:00:29 +02:00
parent 2e9b3ee2c6
commit aacbd5af1d
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/nc_connector.inc.php
View File

@@ -21,9 +21,8 @@ function bratonien_tools_nc_connector_ensure_table()
id int(11) NOT NULL AUTO_INCREMENT, id int(11) NOT NULL AUTO_INCREMENT,
connection_key varchar(64) NOT NULL, connection_key varchar(64) NOT NULL,
name varchar(255) NOT NULL, name varchar(255) NOT NULL,
adapter enum('local','remote') NOT NULL DEFAULT 'remote', adapter enum('remote') NOT NULL DEFAULT 'remote',
enabled tinyint(1) NOT NULL DEFAULT 0, enabled tinyint(1) NOT NULL DEFAULT 1,
takeover_state enum('imported','verified','active','disabled') NOT NULL DEFAULT 'disabled',
config_json mediumtext NOT NULL, config_json mediumtext NOT NULL,
secret_blob mediumtext DEFAULT NULL, secret_blob mediumtext DEFAULT NULL,
created datetime NOT NULL, created datetime NOT NULL,
@@ -101,7 +100,7 @@ function bratonien_tools_nc_connector_connections()
{ {
bratonien_tools_nc_connector_ensure_table(); bratonien_tools_nc_connector_ensure_table();
$table = bratonien_tools_nc_connector_table(); $table = bratonien_tools_nc_connector_table();
$result = pwg_query("SELECT id, connection_key, name, adapter, enabled, takeover_state, config_json, secret_blob, created, updated FROM `$table` WHERE adapter='remote' ORDER BY id"); $result = pwg_query("SELECT id, connection_key, name, adapter, enabled, config_json, secret_blob, created, updated FROM `$table` WHERE adapter='remote' ORDER BY id");
$connections = array(); $connections = array();
while ($row = pwg_db_fetch_assoc($result)) while ($row = pwg_db_fetch_assoc($result))
@@ -128,17 +127,9 @@ function bratonien_tools_nc_connector_connections()
$row['id'] = (int)$row['id']; $row['id'] = (int)$row['id'];
$row['enabled'] = (bool)$row['enabled']; $row['enabled'] = (bool)$row['enabled'];
$row['config'] = $config; $row['config'] = $config;
$row['host'] = (string)($config['nextcloud_url'] ?? '');
$row['database'] = '';
$row['user'] = (string)($config['nextcloud_access_user'] ?? $config['access_user'] ?? ''); $row['user'] = (string)($config['nextcloud_access_user'] ?? $config['access_user'] ?? '');
$row['source_view'] = 'WebDAV';
$row['storage_count'] = isset($config['roots']) && is_array($config['roots']) ? count($config['roots']) : 0; $row['storage_count'] = isset($config['roots']) && is_array($config['roots']) ? count($config['roots']) : 0;
$row['fallback_stored'] = $has_fallback; $row['fallback_stored'] = $has_fallback;
$row['verification'] = array();
$row['verified_ok'] = true;
$row['verified_at'] = '';
$row['source_count'] = $row['storage_count'];
$row['verification_checks'] = array();
$connections[] = $row; $connections[] = $row;
} }
@@ -152,7 +143,7 @@ function bratonien_tools_nc_connector_connection($id, $with_secret = false)
$id = (int)$id; $id = (int)$id;
if ($id <= 0) return null; if ($id <= 0) return null;
$columns = 'id, connection_key, name, adapter, enabled, takeover_state, config_json, created, updated'; $columns = 'id, connection_key, name, adapter, enabled, config_json, created, updated';
if ($with_secret) $columns .= ', secret_blob'; if ($with_secret) $columns .= ', secret_blob';
$result = pwg_query("SELECT $columns FROM `$table` WHERE id = $id AND adapter='remote' LIMIT 1"); $result = pwg_query("SELECT $columns FROM `$table` WHERE id = $id AND adapter='remote' LIMIT 1");
if (!pwg_db_num_rows($result)) return null; if (!pwg_db_num_rows($result)) return null;
@@ -168,10 +159,16 @@ function bratonien_tools_nc_connector_connection($id, $with_secret = false)
function bratonien_tools_nc_connector_status() function bratonien_tools_nc_connector_status()
{ {
$connections = bratonien_tools_nc_connector_connections(); $connections = bratonien_tools_nc_connector_connections();
$active_count = 0;
foreach ($connections as $connection)
{
if (!empty($connection['enabled'])) $active_count++;
}
return array( return array(
'phase'=>'webdav', 'phase'=>'webdav',
'connections'=>$connections, 'connections'=>$connections,
'connection_count'=>count($connections), 'connection_count'=>count($connections),
'active_count'=>count($connections), 'active_count'=>$active_count,
); );
} }