From a89849850aca2584d7979c1eb8e59a041b25aacd Mon Sep 17 00:00:00 2001 From: rkemmere Date: Mon, 11 Jan 2021 18:00:20 +0100 Subject: [PATCH] Changes 1.3 --- CHANGELOG.md | 12 ++++++++++++ package.yml | 4 ++-- .../redaxo_4/project_manager_client.php | 2 ++ .../client/lib/rex_api_project_manager.php | 1 + plugins/client/package.yml | 2 +- plugins/server/assets/css/theme.css | 5 +++++ .../server/assets/favicon/redaxo-favicon.png | Bin 0 -> 797 bytes .../server/lib/project-manager.cronjob.php | 9 +++++---- .../lib/rex_api_project_manager_server.php | 4 ++-- plugins/server/package.yml | 2 +- .../pages/project_manager.server.overview.php | 18 +++++++++++++++++- .../pages/project_manager.server.projects.php | 6 ++++++ 12 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 plugins/server/assets/favicon/redaxo-favicon.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d218ed..ccbd3ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## Version 1.3 // 11.01.2021 + +# Plugin: Server 1.3 +* Bug: Abfrage auf Servern mit vorgeschalter index.html behoben +* PHP Anforderungen package.yml um Version 8 erweitert +* Listenansicht mit Redaxo Backend Link erweitert +* Detailansicht mit Redaxo Backend Link + +# Plugin: Client 1.1 +* Redaxo Backend Verzeichnis wird mit übertragen + + ## Version 1.2.16 // 08.01.2021 # Plugin: Server 1.2.10 diff --git a/package.yml b/package.yml index 571e294..5039d55 100644 --- a/package.yml +++ b/package.yml @@ -1,5 +1,5 @@ package: project_manager -version: '1.2.16' +version: '1.3.0' author: 'Friends Of REDAXO' supportpage: https://github.com/FriendsOfREDAXO/project_manager @@ -28,7 +28,7 @@ plugins: requires: redaxo: '^5.2' # benötigt mindestens REDAXO 5.2 php: - version: '^7.0' # benötigt mindestens PHP 7 + version: '>=7.0' # benötigt mindestens PHP 7 # Plugins die automatisch installiert werden sollen #system_plugins: diff --git a/plugins/client/install/client/redaxo_4/project_manager_client.php b/plugins/client/install/client/redaxo_4/project_manager_client.php index 783d0a7..b39758a 100644 --- a/plugins/client/install/client/redaxo_4/project_manager_client.php +++ b/plugins/client/install/client/redaxo_4/project_manager_client.php @@ -7,6 +7,8 @@ $project_manager["client_version"] = "1.0.4-legacy"; $project_manager["status"] = 1; + error_reporting(E_ALL & ~E_NOTICE); + $rex_master_file = "redaxo/include/master.inc.php"; if(file_exists($rex_master_file)) { include($rex_master_file); diff --git a/plugins/client/lib/rex_api_project_manager.php b/plugins/client/lib/rex_api_project_manager.php index 5931e5c..cb4b750 100644 --- a/plugins/client/lib/rex_api_project_manager.php +++ b/plugins/client/lib/rex_api_project_manager.php @@ -35,6 +35,7 @@ public function execute() $params['rex_version'] = rex::getVersion(); $params['cms'] = "REDAXO"; $params['cms_version'] = rex::getVersion(); + $params['rex_url_backend'] = rex_url::backend(); $params['php_version'] = phpversion(); $params['mysql_version'] = rex_sql::getServerVersion(); $params['status'] = 1; diff --git a/plugins/client/package.yml b/plugins/client/package.yml index 4460db8..be67495 100644 --- a/plugins/client/package.yml +++ b/plugins/client/package.yml @@ -1,5 +1,5 @@ package: project_manager/client -version: '1.0.8' +version: '1.1.0' author: 'Friends Of REDAXO' supportpage: https://github.com/FriendsOfREDAXO/project_manager diff --git a/plugins/server/assets/css/theme.css b/plugins/server/assets/css/theme.css index e7f8724..67f519d 100644 --- a/plugins/server/assets/css/theme.css +++ b/plugins/server/assets/css/theme.css @@ -59,4 +59,9 @@ a.loading .fa-refresh { .btn-toolbar .btn.btn-project-manager-update { margin-bottom: 20px; +} + +.project-manager-server--redaxo-favicon { + height: 15px; + margin-top: -3px; } \ No newline at end of file diff --git a/plugins/server/assets/favicon/redaxo-favicon.png b/plugins/server/assets/favicon/redaxo-favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..bed3fc06bfa6fc590b1ff3fa58b66b1e0ad435d7 GIT binary patch literal 797 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>pAb7&x}hx(}5~40l9uNKw5lffwTbC z_yW1JuYyEC2&5j4(q^6kX_ zAk6rk&E*hKkiEpy*OmP-Gmo&0yh^TjDo|*$r;B5V#AV<9>q1Qq0xaJT$QU$r$#q$# z|NQU2S$x%(XQ@@s)@>_u?RhS)HC21jsxrA$oH;1a6Lb-OIySY z|Lz47Pe{zp;Cs}x?8cd>*=HJEwKkQsulupH>{DCLw*PxB2UaT_KdTbLipvnv3RNChD(OmNyo0-U&(tswJ)wB`Jv|saDBFsX&Us z$iUE2*T7iU&?v;v(#puf%Gglbz|hLTV4FIRJc@?g{FKbJO57TbS8Z7g)F276Aviy+ zq&%@Gm7%=6TrV>(yEr+qAXP8FD1G)j8!4co@T!oAlAy$Lg@U5|w9K4Tg_6pGRE5lf zl4J&kiaC!z@o*G|X=t4CKYhmYX%GXmGPhnbx3IFX_hb=fVFi~4lfx;@%9}$JPT#n4 m;>ejJGDp}?H+U@Y(qnifE?Dx($#g2v3I 3 // seconds ); foreach($websites as $website) { + $domain = $website['domain']; $cms = $website['cms']; $ssl = $website['is_ssl']; @@ -28,10 +29,10 @@ public function execute() $timestamp = time(); - $url = $protocol.urlencode($domain)."?rex-api-call=project_manager&api_key=".$website['api_key'].'&t='.$timestamp; + $url = $protocol.urlencode($domain)."/index.php?rex-api-call=project_manager&api_key=".$website['api_key'].'&t='.$timestamp; if ($cms == 5) - $url = $protocol.urlencode($domain)."?rex-api-call=project_manager&api_key=".$website['api_key'].'&t='.$timestamp; + $url = $protocol.urlencode($domain)."/index.php?rex-api-call=project_manager&api_key=".$website['api_key'].'&t='.$timestamp; if ($cms == 4) $url = $protocol.urlencode($domain)."/project_manager_client.php?rex-api-call=project_manager&api_key=".$website['api_key'].'&t='.$timestamp; @@ -54,8 +55,8 @@ public function execute() $json = json_decode($resp, true); $project_manager_domain = rex_sql::factory()->setDebug(0)->getArray('SELECT * FROM ' . rex::getTable('project_manager_domain') . ' WHERE domain = ? LIMIT 1', [$domain]); - - if(json_last_error() === JSON_ERROR_NONE && $json !== null) { + + if(json_last_error() === JSON_ERROR_NONE && $json !== null) { if ($json['status'] == 1) { diff --git a/plugins/server/lib/rex_api_project_manager_server.php b/plugins/server/lib/rex_api_project_manager_server.php index ac4063f..cac8070 100644 --- a/plugins/server/lib/rex_api_project_manager_server.php +++ b/plugins/server/lib/rex_api_project_manager_server.php @@ -92,7 +92,7 @@ public function execute() if($func == "updateData") { // reload data - $url = $protocol.urlencode($domain)."index.php?rex-api-call=project_manager&api_key=".$api_key.'&t='.$timestamp; + $url = $protocol.urlencode($domain)."/index.php?rex-api-call=project_manager&api_key=".$api_key.'&t='.$timestamp; $curl = curl_init(); curl_setopt_array($curl, array( CURLOPT_RETURNTRANSFER => 1, @@ -142,4 +142,4 @@ public function execute() } } -?> +?> \ No newline at end of file diff --git a/plugins/server/package.yml b/plugins/server/package.yml index 76106f6..3d9fb57 100644 --- a/plugins/server/package.yml +++ b/plugins/server/package.yml @@ -1,5 +1,5 @@ package: project_manager/server -version: '1.2.10' +version: '1.3.0' author: 'Friends Of REDAXO' supportpage: https://github.com/FriendsOfREDAXO/project_manager diff --git a/plugins/server/pages/project_manager.server.overview.php b/plugins/server/pages/project_manager.server.overview.php index 2206216..88c653e 100644 --- a/plugins/server/pages/project_manager.server.overview.php +++ b/plugins/server/pages/project_manager.server.overview.php @@ -210,7 +210,23 @@ $list->addColumn($this->i18n('domain'), '###domain###', 3); //$list->setColumnParams($this->i18n('domain'), ['page' => 'project_manager/server/projects', 'domain' => '###domain###']); $list->setColumnFormat($this->i18n('domain'), 'custom', function ($params) { - return ''.$params['list']->getValue('domain').''; + + $ssl = $params['list']->getValue('is_ssl'); + $protocol = ($ssl == 1) ? "https://" : "http://"; + + + if($params['list']->getValue('raw')) { + $raw= json_decode($params['list']->getValue('raw'), true); + if ($raw['rex_url_backend']) { + + $rex_url_backend = ' + + '; + } + } + + + return ''.$params['list']->getValue('domain').''. $rex_url_backend; }); $list->setColumnLabel('is_ssl', $this->i18n('is_ssl')); diff --git a/plugins/server/pages/project_manager.server.projects.php b/plugins/server/pages/project_manager.server.projects.php index a540812..f491261 100644 --- a/plugins/server/pages/project_manager.server.projects.php +++ b/plugins/server/pages/project_manager.server.projects.php @@ -131,6 +131,12 @@ if ($raw['debug'] == 0) $output .= 'Debug Modus nicht aktiv'; } + + if ($raw['client_version'] >= "1.1.0") { + if (!empty($raw['rex_url_backend'])) + $output .= 'REDAXO Backend '.$raw['rex_url_backend'].''; + } + $output .= ''; $fragment = new rex_fragment();