.gitlab-ci.yml

@@ -1,21 +0,0 @@
-# This file is only necessary for the gitlab to github sync and does not belong to the webapp plugin code.
-
-#before_script:
-#  - ssh-keyscan -t rsa,dsa,ecdsa github.com > /etc/ssh/ssh_known_hosts
-stages:
-  - mirror
-  
-variables:
-  MIRROR_REPOSITORY: "git@github.com:h44z/kopano_webapp_contactimporter.git"
-
-mirror-github:
-  stage: mirror
-  cache: {}
-  script:
-    # Do a mirror clone of the repository
-    - git clone --mirror $CI_REPOSITORY_URL
-    # Mirror push it to the destination
-    - cd $CI_PROJECT_NAME.git
-    - git push --mirror $MIRROR_REPOSITORY
-    # Cleanup
-    - cd ..; rm -rf $CI_PROJECT_NAME.git

LICENSE

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

changelog.txt

@@ -1,8 +1,4 @@
-v2.0.5: 14.06.2018
+v2.0.4: 08.02.2018
- - Fixed JS error, thanks to hartois
- - Fixed manifest.xml structure (validation now succeeds)
-
-v2.0.4: 08.03.2018
  - Small bugfixes
  - Updated documentation
  

js/data/Actions.js

@@ -125,7 +125,7 @@ Zarafa.plugins.contactimporter.data.Actions = {
         var inbox = container.getHierarchyStore().getDefaultStore();
         var pub = container.getHierarchyStore().getPublicStore();
 
-        if (!Ext.isEmpty(inbox) && !Ext.isEmpty(inbox.subStores)) {
+        if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
             for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
                 var folder = inbox.subStores.folders.getAt(i);
                 if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
@@ -146,7 +146,7 @@ Zarafa.plugins.contactimporter.data.Actions = {
             }
         }
 
-        if (!Ext.isEmpty(pub) && !Ext.isEmpty(pub.subStores)) {
+        if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
             for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
                 var folder = pub.subStores.folders.getAt(j);
                 if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {

languages/ru_RU.UTF-8/LC_MESSAGES/plugin_contactimporter.po

@@ -1,189 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Plugin Contactimporter\n"
-"POT-Creation-Date: 2018-06-16 12:34+0100\n"
-"PO-Revision-Date: 2018-06-16 12:34+0100\n"
-"Last-Translator: \n"
-"Language-Team: Christoph Haas <christoph.h@sprinternet.at>\n"
-"Language: ru_RU\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
-"X-Poedit-Basepath: ../../..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-SearchPath-0: php\n"
-"X-Poedit-SearchPath-1: js\n"
-
-#: js/dialogs/ImportContentPanel.js:45
-msgid "Import Contacts"
-msgstr "Импортировать Контакты"
-
-#: js/dialogs/ImportPanel.js:98
-msgid "Loading..."
-msgstr "Загрузка..."
-
-#: js/dialogs/ImportPanel.js:290
-msgid "Select contacts to import"
-msgstr "Выберите контакты для импорта"
-
-#: js/dialogs/ImportPanel.js:301
-msgid "Displayname"
-msgstr "Отображаемое имя"
-
-#: js/dialogs/ImportPanel.js:302
-msgid "Firstname"
-msgstr "Имя"
-
-#: js/dialogs/ImportPanel.js:303
-msgid "Lastname"
-msgstr "Фамилия"
-
-#: js/dialogs/ImportPanel.js:304
-msgid "Company"
-msgstr "Компания"
-
-#: js/dialogs/ImportPanel.js:325
-msgid "Select folder"
-msgstr "Выбор каталога"
-
-#: js/dialogs/ImportPanel.js:348
-msgid "Select an .vcf addressbook"
-msgstr "Выбор .vcf адресной книги"
-
-#: js/dialogs/ImportPanel.js:372
-msgid "Import"
-msgstr "Импорт"
-
-#: js/dialogs/ImportPanel.js:391
-msgid "Import All"
-msgstr "Импорт всех"
-
-#: js/dialogs/ImportPanel.js:408
-msgid "Cancel"
-msgstr "Отмена"
-
-#: js/dialogs/ImportPanel.js:426
-msgid "Uploading and parsing contacts..."
-msgstr "Загрузка и парсинг контактов..."
-
-#: js/dialogs/ImportPanel.js:432 js/dialogs/ImportPanel.js:531
-#: js/dialogs/ImportPanel.js:539 js/dialogs/ImportPanel.js:586
-#: js/plugin.contactimporter.js:169
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/dialogs/ImportPanel.js:487
-msgid "Parser Error"
-msgstr "Ошибка парсинга"
-
-#: js/dialogs/ImportPanel.js:532
-msgid "You have to choose an addressbook!"
-msgstr "Нужно выбрать адресную книгу!"
-
-#: js/dialogs/ImportPanel.js:540
-msgid "You have to choose at least one contact to import!"
-msgstr "Нужно выбрать хотя бы один контакт для импорта!"
-
-#. TRANSLATORS: {0} will be replaced by the number of contacts that were imported
-#: js/dialogs/ImportPanel.js:583
-msgid "Imported"
-msgstr "Импортировано"
-
-#: js/dialogs/ImportPanel.js:583
-msgid "Imported {0} contacts. Please reload your addressbook!"
-msgstr "Импортировано {0} контактов. Пожалуйста перезагрузите адресную книгу!"
-
-#. TRANSLATORS: {0} will be replaced by the error message
-#: js/dialogs/ImportPanel.js:588
-msgid "Import failed: {0}"
-msgstr "Ошибки импорта: {0}"
-
-#: js/plugin.contactimporter.js:64 js/ui/ContextMenu.js:78
-msgid "Export vCard"
-msgstr "Экспорт vCard"
-
-#. TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
-#. TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
-#: js/plugin.contactimporter.js:93 js/ui/ContextMenu.js:104
-msgid "Contact Export"
-msgstr "Экспорт Контактов"
-
-#: js/plugin.contactimporter.js:93 js/ui/ContextMenu.js:104
-msgid "Exporting {0} contacts. Please wait..."
-msgstr "Экспортировано {0} контактов. Пожалуйста подождите..."
-
-#: js/plugin.contactimporter.js:115 js/ui/ContextMenu.js:139
-msgid "Warning"
-msgstr "Внимание"
-
-#: js/plugin.contactimporter.js:144
-msgid "Import to Contacts"
-msgstr "Импорт в Контакты"
-
-#: js/plugin.contactimporter.js:183
-msgid "Please wait"
-msgstr "Пожалуйста подождите"
-
-#: js/plugin.contactimporter.js:184
-msgid "Loading attachment..."
-msgstr "Загрузка вложения..."
-
-#: js/plugin.contactimporter.js:185
-msgid "Initializing..."
-msgstr "Инициализация..."
-
-#. TRANSLATORS: {0} will be replaced by the percentage value (0-100)
-#: js/plugin.contactimporter.js:198
-msgid "{0}% loaded"
-msgstr "{0}% загружено"
-
-#: js/plugin.contactimporter.js:310
-msgid "Contactimporter Plugin"
-msgstr "Contactimporter Plugin"
-
-#: js/ui/ContextMenu.js:66
-msgid "Import vCard"
-msgstr "Импорт vCard"
-
-#: php/module.contact.php:245
-msgid "VCF file is empty!"
-msgstr "VCF файл пустой!"
-
-#. TRANSLATORS: Filename suffix for exported files
-#: php/module.contact.php:448
-msgid "_contacts.vcf"
-msgstr "_contacts.vcf"
-
-#: php/module.contact.php:451
-msgid "No contacts found. Export skipped!"
-msgstr "Контакты не найдены. Экспорт пропущен!"
-
-#: php/module.contact.php:728
-msgid "No contacts in vcf file"
-msgstr "Нет контактов в vcf файле"
-
-#: php/module.contact.php:739
-msgid "File could not be read by server"
-msgstr "Файл не может быть прочитан сервером"
-
-#: php/module.contact.php:1141
-msgid "Store could not be opened!"
-msgstr "Невозможно открыть хранилище!"
-
-#: php/module.contact.php:1147
-msgid "Wrong call, store and entryid have to be set!"
-msgstr "Неправильный вызов, store и entryid должны быть установлены!"
-
-#: php/upload.php:69
-msgid ""
-"File could not be moved to TMP path! Check plugin config and folder "
-"permissions!"
-msgstr ""
-"Файл не может быть перемещён в TMP путь! Проверьте конфигурацию плагина"
-"права на каталог!"
-
-#: php/upload.php:72
-msgid "File could not be read by server, upload error!"
-msgstr "Файл не может быть прочитан сервером, ошибка загрузки!"

languages/ru_RU.UTF-8/language.txt

@@ -1 +0,0 @@
-Русский

manifest.xml

@@ -2,19 +2,19 @@
 <!DOCTYPE plugin SYSTEM "manifest.dtd">
 <plugin version="2">
 	<info>
-		<version>2.0.5</version>
+		<version>2.0.4</version>
 		<name>contactimporter</name>
 		<title>VCF Contact Importer/Exporter</title>
 		<author>Christoph Haas</author>
 		<authorURL>http://www.sprinternet.at</authorURL>
 		<description>Import or export a VCF file to/from the Kopano WebApp address-book</description>
 	</info>
-	<config>
-		<configfile>config.php</configfile>
-	</config>
 	<translations>
 		<translationsdir>languages</translationsdir>
 	</translations>
+	<config>
+		<configfile>config.php</configfile>
+	</config>
 	<components>
 		<component>
 			<files>