Merge pull request #6 from YunoHost-Apps/testing

Upgrade to 1.14.2

README.md

@@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 osTicket is a widely-used open source support ticket system. It seamlessly integrates inquiries created via email, phone and web-based forms into a simple easy-to-use multi-user web interface. Manage, organize and archive all your support requests and responses in one place while providing your customers with accountability and responsiveness they deserve.
 
-**Shipped version:** 1.14.1
+**Shipped version:** 1.14.2
 
 ## Screenshots
 
@@ -56,9 +56,13 @@ LDAP and HTTP auth are supported through plugins
   - Ticket Rewriter
 
 * The package include several languages:
+  - Albanian (shqip)
   - Arabic - Egypt (مصر)
   - Arabic - Saudi Arabia (المملكة العربية السعودية)
   - Azerbaijani (azərbaycanca)
+  - Basque (euskara)
+  - Bengali (বাংলা)
+  - Bosnian (bosanski)
   - Bulgarian (български)
   - Catalan (Català)
   - Chinese (China) (中文 (中国))
@@ -72,17 +76,23 @@ LDAP and HTTP auth are supported through plugins
   - Estonian (eesti)
   - Finnish (suomi)
   - French (français)
+  - Galician (galego)
+  - Georgian (ქართული)
   - German (Deutsch)
   - Greek (Ελληνικά)
   - Hebrew (עברית)
+  - Hindi (हिन्दी)
   - Hungarian (magyar)
+  - Icelandic (íslenska)
   - Indonesian
   - Italian (italiano)
   - Japanese (日本語)
+  - Khmer (ខ្មែរ)
   - Korean (한국어)
+  - Latvian (latviešu)
   - Lithuanian (lietuvių)
   - Macedonian (македонски)
-  - Malay
+  - Malay (Melayu)
   - Mongolian (монгол)
   - Norwegian (norsk)
   - Persian (فارسی)
@@ -91,16 +101,20 @@ LDAP and HTTP auth are supported through plugins
   - Portuguese, Brazil (Português — BR)
   - Romanian (română)
   - Russian (русский язык)
+  - Serbian (Cyrillic)
   - Serbian (Serbia) (српски (Србија))
   - Slovak (slovenčina)
   - Slovenian (slovenščina)
   - Spanish (Argentina)
   - Spanish (español)
   - Spanish - Mexico (Méjico)
+  - Swahili (Kiswahili)
   - Swedish (svenska)
   - Thai (ไทย)
   - Turkish (Türkçe)
   - Ukrainian (українська)
+  - Urdu (India) (اردو (بھارت
+  - Urdu (Pakistan) اردو (پاکستان)
   - Vietnamese (Tiếng Việt)
 
 ## Links

check_process

@@ -19,7 +19,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=CommitHash
+		# 1.14.1
+		upgrade=1	from_commit=81e4075468d035b12ad70936d016d45d0f124720
 		backup_restore=1
 		multi_instance=1
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
@@ -33,7 +34,5 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
-
+	; commit=81e4075468d035b12ad70936d016d45d0f124720
+		name=1.14.1

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/osTicket/osTicket/releases/download/v1.14.1/osTicket-v1.14.1.zip
-SOURCE_SUM=fa751b78fe84212376ab25e867b93c8a45d426917ae7d946f4be216d9b23505f
+SOURCE_URL=https://github.com/osTicket/osTicket/releases/download/v1.14.2/osTicket-v1.14.2.zip
+SOURCE_SUM=b972833f89856ec254f09af901eca848c7278a0e7d3c9c6e214c62a65aabcabd
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

conf/core-plugins.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/04fbd9ae96c39eb9e522409d2fe10323105748db.tar.gz
-SOURCE_SUM=9226fb66af5433f6ed8c29ee3f579e05bca4003449d08a763043341e6d630e52
+SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/14f4778904fd2aba707497e9a45dcecbb2129c9a.tar.gz
+SOURCE_SUM=7bde26e1e08ffa9f7225b73744991594841eb4e9dd8b3e172975628cb00d9bd1
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/plugin-attachment_preview.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/clonemeagain/attachment_preview/archive/be660d24e2cb8f757b89810e3a1f0cb77f79a4a7.tar.gz
-SOURCE_SUM=a15a94461407376efae078e25df1a5d7d2914501222763d22dfdc77aea2202a1
+SOURCE_URL=https://github.com/clonemeagain/attachment_preview/archive/0a3e293f4c296981e9eb7252f29ebbea173fcf9f.tar.gz
+SOURCE_SUM=4258cdd2781d84e0329aaa95938fb4c2baff2606c15b0faec85bd18be790f11e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

issue_template.md

@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all.
+
+---
+
+**How to post a meaningful bug report**
+1. *Read this whole template first.*
+2. *Determine if you are on the right place:*
+   - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!*
+   - *Otherwise, the issue may be due to osticket itself. Refer to its documentation or repository for help.*
+   - *If you have a doubt, post here, we will figure it out together.*
+3. *Delete the italic comments as you write over them below, and remove this guide.*
+--- 
+
+**Describe the bug**
+*A clear and concise description of what the bug is.*
+
+**Versions**
+- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...*
+- YunoHost version: x.x.x
+- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...*
+- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes*
+  - If yes, please explain:
+- Using, or trying to install package version/branch:
+- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
+
+**To Reproduce**
+*Steps to reproduce the behavior.*
+- *If you performed a command from the CLI, the command itself is enough. For example:*
+    ```sh
+    sudo yunohost app install osticket
+    ```
+- *If you used the webadmin, please perform the equivalent command from the CLI first.*
+- *If the error occurs in your browser, explain what you did:*
+   1. *Go to '...'*
+   2. *Click on '....'*
+   3. *Scroll down to '....'*
+   4. *See error*
+
+**Expected behavior**
+*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.*
+
+**Logs**
+*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.*
+*If applicable and useful, add screenshots to help explain your problem.*

manifest.json

@@ -3,10 +3,10 @@
     "id": "osticket",
     "packaging_format": 1,
     "description": {
-        "en": "osTicket is a open source support ticket system",
-        "fr": "osTicket est un système de ticket de support open source"
+        "en": "Open source support ticket system",
+        "fr": "Système de ticket de support open source"
     },
-    "version": "1.14.1~ynh1",
+    "version": "1.14.2~ynh1",
     "url": "https://osticket.com/",
     "license": "GPL-2.0-or-later",
     "maintainer": {
@@ -47,7 +47,7 @@
                 "type": "user",
                 "ask": {
                     "en": "Choose an admin user",
-                    "fr": "Choisissez l’administrateur"
+                    "fr": "Choisissez l'administrateur"
                 },
                 "example": "johndoe"
             },
@@ -67,7 +67,7 @@
                     "en": "Choose the application language",
                     "fr": "Choisissez la langue de l'application"
                 },
-                "choices": ["en_US","fr","ar_EG","ar_SA","az","bg","ca","cs","da","de","el","en_GB","es_AR","es_ES","es_MX","et","fa","fi","he","hr","hu","id","it","ja","ko","lt","mk","mn","ms","nl","no","pl","pt_BR","pt_PT","ro","sk","sl","sr_CS","sv_SE","th","tr","uk","vi","zh_CN","zh_TW"],
+                "choices": ["en_US","fr","ar_EG","ar_SA","az","bg","bn","bs","ca","cs","da","de","el","en_GB","es_AR","es_ES","es_MX","et","eu","fa","fi","he","hi","hr","hu","id","is","it","ja","ka","km","ko","lt","lv","mk","mn","ms","nl","no","pl","pt_BR","pt_PT","ro","ru","sk","sl","sq","sr","sr_CS","sv_SE","sw","th","tr","uk","ur_IN","ur_PK","vi","zh_CN","zh_TW"],
                 "default": "fr"
             },
             {

scripts/backup

@@ -33,28 +33,36 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 
 #=================================================
-# STANDARD BACKUP STEPS
+# DECLARE DATA AND CONF FILES TO BACKUP
+#=================================================
+ynh_print_info --message="Declaring files to be backed up..."
+
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
-ynh_print_info --message="Backing up the main app directory..."
 
 ynh_backup --src_path="$final_path"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
-ynh_print_info --message="Backing up nginx web server configuration..."
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_print_info --message="Backing up php-fpm configuration..."
 
 ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"
 
+#=================================================
+# SPECIFIC BACKUP
+#=================================================
+# BACKUP A CRON FILE
+#=================================================
+
+ynh_backup --src_path="/etc/cron.d/$app"
+
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
@@ -62,15 +70,6 @@ ynh_print_info --message="Backing up the MySQL database..."
 
 ynh_mysql_dump_db --database="$db_name" > db.sql
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP A CRON FILE
-#=================================================
-ynh_print_info --message="Backing up a cron file..."
-
-ynh_backup --src_path="/etc/cron.d/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/install

@@ -96,9 +96,6 @@ ynh_setup_source --dest_dir="$final_path/include/plugins/build/microsoft-teams"
 ynh_setup_source --dest_dir="$final_path/include/plugins/build/slack" --source_id="plugin-slack"
 ynh_setup_source --dest_dir="$final_path/include/plugins/build/preventautoscroll" --source_id="plugin-preventautoscroll"
 
-# Woraround for https://github.com/osTicket/osTicket-plugins/pull/174
-ynh_replace_string --match_string="https://getcomposer.org/composer.phar" --replace_string="https://getcomposer.org/composer-stable.phar" --target_file="$final_path/include/plugins/build/make.php"
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================

scripts/upgrade

@@ -105,10 +105,6 @@ then
 	ynh_setup_source --dest_dir="$final_path/include/plugins/build/slack" --source_id="plugin-slack"
 	ynh_setup_source --dest_dir="$final_path/include/plugins/build/preventautoscroll" --source_id="plugin-preventautoscroll"
 
-	# Woraround for https://github.com/osTicket/osTicket-plugins/pull/174
-	ynh_replace_string --match_string="https://getcomposer.org/composer.phar" --replace_string="https://getcomposer.org/composer-stable.phar" --target_file="$final_path/include/plugins/build/make.php"
-
-
 	rsync -a "$tmpdir/plugins" "$final_path/include/."
 	rsync -a "$tmpdir/ost-config.php" "$final_path/include/."
 	ynh_secure_remove --file="$tmpdir"