diff --git a/.gitignore b/.gitignore index 12983e5dfd8..1efe4f4bb82 100755 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,10 @@ doxygen_warnings.log *.iml Thumbs.db # Vagrant generated files -.vagrant \ No newline at end of file +.vagrant +# Composer installed repositories +/htdocs/includes/**/.git +# Composer autoloader and unwanted files +htdocs/includes/autoload.php +htdocs/includes/bin/ +htdocs/includes/composer/ diff --git a/.tx/config b/.tx/config index a8ac07f0c8b..e6fbdc34190 100644 --- a/.tx/config +++ b/.tx/config @@ -332,6 +332,12 @@ source_file = htdocs/langs/en_US/suppliers.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.supplier_proposal] +file_filter = htdocs/langs//supplier_proposal.lang +source_file = htdocs/langs/en_US/supplier_proposal.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.trips] file_filter = htdocs/langs//trips.lang source_file = htdocs/langs/en_US/trips.lang diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 304924fe150..ab328c8e785 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ How to contribute to Dolibarr Bug reports and feature requests -------------------------------- -*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum). +*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum). Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). @@ -13,9 +13,9 @@ Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). 4. Tell us the version you are using! 3. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible). -We're still figuring out how to migrate old issues to GitHub. In the meantime, they are still available at [Doliforge](https://doliforge.org/projects/dolibarr). -Code + +Code --------------------- ### Basic workflow @@ -26,7 +26,7 @@ We're still figuring out how to migrate old issues to GitHub. In the meantime, t 4. Commit and push your changes. 5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request). -### Branches +### Branches Unless you're fixing a bug, all pull requests should be made against the *develop* branch. @@ -38,9 +38,9 @@ We officially support versions N, N − 1 and N − 2 for N the latest version a Choose your base branch accordingly. ### General rules -Please don't edit the ChangeLog file. A project manager will update it from your commit messages. +Please don't edit the ChangeLog file. File will be generated from your commit messages during release process by the project manager. -### Commits +### Commits Use clear commit messages with the following structure: ``` @@ -50,7 +50,7 @@ LONGDESC ``` #### Keyword -In uppercase to appear in ChangeLog when generated. +In uppercase if you want to have the log comment appears into the generated ChangeLog file. The keyword can be ommitted if your commit does not fit in any of the following categories: - Fix: for a bug fix @@ -97,6 +97,13 @@ When submitting a pull request, use same rule as [Commits](#commits) for the mes If your pull request only contains one commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing. +Your Pull Request must pass the Continuous Integration checks. +Also, some code changes need a prior approbation: + +* if you want to include a new external library (into htdocs/includes directory), please ask before to the project leader to see if such a library can be accepted. + +* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project leader if the new data model you plan to add can be accepted as you suggest. + ### Resources [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation) diff --git a/COPYRIGHT b/COPYRIGHT index 4862ab1b339..b89c5d23e60 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -12,7 +12,7 @@ Dolibarr uses some external libraries released under different licenses. This is Component Version License GPL Compatible Usage ------------------------------------------------------------------------------------- PHP libraries: -AdoDb-Date 0.33 Modified BSD License Yes Date convertion (not into rpm package) +AdoDb-Date 0.36 Modified BSD License Yes Date convertion (not into rpm package) ChromePHP 4.1.0 Apache Software License 2.0 Yes Return server log to chrome browser console CKEditor 4.3.3 LGPL-2.1+ Yes Editor WYSIWYG EvalMath 1.0 BSD Yes Safe math expressions evaluation @@ -24,7 +24,7 @@ Mobiledetect 2.8.3 MIT License Yes NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package) PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency odtPHP 1.0.1 GPL-2+ b Yes Library to build/edit ODT files -PHPExcel 1.8.0 LGPL-2.1+ Yes Read/Write XLS files, read ODS files +PHPExcel 1.8.1 LGPL-2.1+ Yes Read/Write XLS files, read ODS files php-iban 1.4.7 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP PHPoAuthLib 0.8.2 MIT License Yes Library to provide oauth1 and oauth2 to different service PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests @@ -54,7 +54,7 @@ jQuery TableDnD 0.6 GPL and MIT License Yes jQuery Timepicker 1.1.0 GPL and MIT License Yes JS library Timepicker addon for Datepicker jQuery Tiptip 1.3 GPL and MIT License Yes JS library for tooltips jsGantt 1.2 BSD License Yes JS library (to build Gantt reports) -JsTimezoneDetect 1.0.4 MIT License Yes JS library to detect user timezone +JsTimezoneDetect 1.0.6 MIT License Yes JS library to detect user timezone Raven.js 1.1.19 MIT License Yes Used for client-side error logging with Sentry logger For licenses compatibility informations: diff --git a/ChangeLog b/ChangeLog index 4cf2322adbb..9cb28633bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,63 @@ This is list of hooks modified: +***** ChangeLog for 3.8.2 compared to 3.8.1 ***** +FIX: Add a protection to not make release if ChangeLog was not generated. +FIX: 1/ update_extra() function must not be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test. 2/ Reindented code +FIX: #3240 +FIX: #3541 Bypass authentication when user was created using LDAP +FIX: #3605 deleting a shipping +FIX: #3661 Margin is not selected correctly when adding a product +FIX: #3689 Bug on workflow module +FIX: #3724 Bug: Blank page after cloning proposal if we changed client +FIX: #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO +FIX: #3726 Not showing images on product card +FIX: #3757 Can't set amount in a social contribution with some languages +FIX: #3786 Translation of select box. +FIX: #3841 creation of a task completed has not status set to finished by default +FIX: #3878 Storing and deleting files on emailing was done at wrong place +FIX: #3880 +FIX: #3882 +FIX: action not appear before an update because of a lack of line in action ressource +FIX: add tag myuser_job into ODT replacement +FIX: Avoid changing the state to a thirdparty who shouldn't be contacted anymore +FIX: bad calculation for stock value +FIX: Bad parameters +FIX: Bad picto for expense report +FIX: bad property so after creating an event from calendar, filter were lost. +FIX: bad stock valorisation +FIX: better fix to generate a PROV ref after clone +FIX: bug invoice classified in propale next update commonobject class in 3.8 +FIX: Can export a field into task time table with export project profile +FIX: change order date on clone (as everywhere else) +FIX: clone customer order create new order with validate ref and not with PROV +FIX: Contacts are not added to the list with the status "no contact" +FIX: Default thirdparty when cloning invoice was not set. +FIX: double db escape add too quote +FIX: event's data lost on user assign update +FIX: Filter in customer price per product of a thirdparty returned error +FIX: filters on supplier invoices list are not used, search_status instead +FIX: fix HTML into formconfirm box +FIX: IF autocomplete was set on thirdparty list, it was not possible to open list of extrafields. +FIX: If no end date is set on survey, we should be able to vote. +FIX: loss data also if update was cancel by error of ended state with no end date, try a generic patch +FIX: no need to remove file into mail form, the temp dir will be deleted after any sending +FIX: pmp calculation +FIX: Preview pages was not using correct style for ref +FIX: project was not retrieved on invoice creation form +FIX: Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED for better compatibility with old versions +FIX: Search status not saved into list +FIX: search_status not used in mergefusiontool +FIX: Show category selector if we have permission to view products or services +FIX: Show product image on getNomUrl() +FIX: skeleton class must use db->order rather than ORDER BY into fetchAll +FIX: Societe::set_parent() function needs societe object to be fetched to update parent +FIX: supplier rights for orderToInvoice +FIX: tag object_total_vat_x need x to be a string with unknown decimal lenght. Now use for x the real vat real with no more decimal (x = 20 or x = 8.5 or x = 5.99, ...) +FIX: The preview of PDF was never refreshed if PDF document was changed +FIX: The thumb of user into top menu was using the image in full size. This make a large download at each page call. We must use the mini thumbs. +FIX: Total in summary was not same than into detail on the referrer page. + ***** ChangeLog for 3.8.1 compared to 3.8.0 ***** FIX: #3521 postgresql migration error FIX: #3524 @@ -315,25 +372,94 @@ Dolibarr better: to make difference between creation from contact or not. - Function get_exdir require now 6 parameters. This is to prepare a future feature. + ***** ChangeLog for 3.7.2 compared to 3.7.1 ***** -FIX [ bug #2855 ] Wrong translation key in localtax report page -FIX [ bug #1852 ] JS error when editing a customer order line -FIX [ bug #2900 ] Courtesy title is not stored in create thirdparty form -FIX [ bug #3055 ] Product image thumbnails were not deleted after deleting the image -FIX [ bug 1634 ] Error deleting a project when it had many linked objects -FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly -FIX [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne -FIX: Not showing delivery date on rouget pdf +FIX: #2957 : missing $langs object for trigger +FIX: #2983 Load gravatar avatar images securely over HTTPS +FIX: #3009: Better filtering to prevent SQL injection +FIX: #3091 TotalHT amount in supplier order is bold unlike the rest of Dolibarr +FIX: #3262 Webservice getProductsForCategory() +FIX: #3318 +FIX: [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice +FIX: #3530 +FIX: #3630 - Wrong balance report when module salaries and donation disabled +FIX: #3679 Error when deleting a Localtax2 special payment +FIX: #3707 Thirdparty bank account page table has a glitch +FIX: #3724 Bug: Blank page after cloning proposal with changed client +FIX: #3836 Unable to upload a document to an invoice under some circunstances +FIX: #3841 creation of a task completed has not status set to finished by default +FIX: Add a protection to not make release if ChangeLog was not generated. +FIX: adjusted test for affecting supplier reference +FIX: Admin fiche inter page do not take good action +FIX: Avoid warning strict mode when hosting server do not have php5_curl installed +FIX: bad calculation for stock value +FIX: Bad condition into invoice export request making reporting too many rows. +FIX: bad stock valorisation +FIX: Bad visualization of suppliers name on Incomes-Expenses mode +FIX: Better management error into the color conversion functions +FIX: [ bug 1634 ] Error deleting a project when it had many linked objects +FIX: [ bug 1925 ] "Link to order" option in supplier invoices is not working properly +FIX: [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask +FIX: [ bug #3211 ] Error about sold to pay (Montant encours) +FIX: [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights +FIX: [ bug #3358 ] Tasks box does not work with PostgreSQL +FIX: [ bug #3383 ] Company name is overlapped with company direction in PDF models +FIX: [ bug #3426 ] Unable to create an invoice from a contract with extrafields +FIX: [ bug #3431 ] Invoice bank account is not respected +FIX: [ bug #3432 ] Spaces should be removed from IBAN when formatting it +FIX: Can create Proposal on close thridparty #3526 +FIX: change order date on clone (as everywhere else) +FIX: Close #2835 Customer prices of a product shows incorrect history order +FIX: Close #2837 Product list table column header does not match column body +FIX: Close bug #2855 Wrong translation key in localtax report page +FIX: Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 +FIX: Close bug #2891 Category hooks do not work +FIX: Close bug #2900 Courtesy title is not stored in create thirdparty form +FIX: Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI +FIX: contact country had wrong display if the country dont have translate +FIX: Display country name instead of country id (display country id makes no sense on vcard files) +FIX: display error on extrafields on ficheinter +FIX: double db escape add too quote +FIX: Email selector contact must not include inactive contact +FIX: End log must use same level then start log. +FIX: error in SQL due to a previous fix +FIX: event's data lost on user assign update +FIX: Export of tags for contact and member +FIX: facturestat bad sql when customer view is limited +FIX: if multicompany enabled, call to undifend method _setCookie instead of setCookie +FIX: If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values) +FIX: keep filter by category or by not enough stock if we switch page +FIX: Line break display as a block +FIX: load propal langs for availability traduction +FIX: loss data also if update was cancel by error of ended state with no end date, try a generic patch +FIX: Mass Mailing activity don't display all status +FIX: Missing to set context into workflow actions, so triggers can't know we are creating an invoice from order or an order from a proposal. +FIX: multientity warehouse management +FIX: New adherent from, always redirect on entity +FIX: No check warehouse is provided if module stock is not enabled. +FIX: no need to remove file into mail form, the temp dir will be deleted after any sending +FIX: no projet_task_time id from trigger TASK_TIMESPENT_CREATE FIX: Not showing task extrafields when creating from left menu -FIX [ bug #3288 ] Tasks box is not properly drawn -FIX [ bug #3211 ] Outstading bill amount of a client showed wrong amounts -FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights -FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields -FIX [ bug #3431 ] Invoice bank account is not respected -FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it -FIX [ bug #3358 ] Tasks box does not work with PostgreSQL -FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models -FIX [ bug #3460 ] Bank account is not saved when creating a customer invoice and facing an error message +FIX: only active customer should be return into new invoice creation select list +FIX: Payed invoices are showed as canceled FIX: Bad date filter on customer order +FIX: WAP calculation +FIX: Save of filters into export profiles failed. +FIX: supplier rights for orderToInvoice +FIX: Syntax error in Debian Apache configuration +FIX: The hours of date filter aren't correct +FIX: tool export handle the type "select" extrafields and return the value instead of id +FIX: total amount in tpl linked object are not reset +FIX: translate Jabberid on contact page with edit view +FIX: translation for 1 word do not work if product/service module are disabled because the translation search in products.lang +FIX: update2.php test res befre assign it +FIX: When delete actioncomm also delete actioncomm_resources +FIX: when fetch_optionnal_by_label in Extrafields with $this->db cannot work because this->db is never instanciated +FIX: when mailing is deleted, the targets list was kept in database +FIX: when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask) +FIX: When we add an user on event in create mode, we lose linked object +FIX: When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table. +FIX: When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third. +FIX: XSS security using the onerror and missing escapement on type of member page. NEW: Created new ContratLigne::insert function @@ -559,9 +685,43 @@ Dolibarr better: warehouse module and your Point Of Sale module setup if you use one. - Replaced USER_UPDATE_SESSION trigger with an updateSession hook may break modules using it. + ***** ChangeLog for 3.6.5 compared to 3.6.4 ***** -- Fix: [ bug #1776 ] Undefined $deliverycompany variable in pdf_build_address -- Fix: [ bug #1794 ] Error when cloning Proposal gives error in a malformed page +FIX: #2957 : missing $langs object for trigger +FIX: #2983 Load gravatar avatar images securely over HTTPS +FIX: #3009: Better filtering to prevent SQL injection +FIX: #3841 creation of a task completed has not status set to finished by default +FIX: #3890 Expected transactions bank account page, shows negative numbers +FIX: #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card +FIX: bad calculation for stock value +FIX: bad stock valo +FIX: bad stock valorisation +FIX: [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask +FIX: button create payment hide if tax amount is less than 1 +FIX: change object statut on close shipping and remove erratic db commit +FIX: change order date on clone (as everywhere else) +FIX: Close #2835 Customer prices of a product shows incorrect history order +FIX: Close #2837 Product list table column header does not match column body +FIX: Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 +FIX: Close bug #2891 Category hooks do not work +FIX: Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI +FIX: contact country had wrong display if the country dont have translate +FIX: double db escape add too quote +FIX: End log must use same level then start log. +FIX: error in SQL due to a previous fix +FIX: event for restricted user was restricted if company null +FIX: facturestat bad sql when customer view is limited +FIX: If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values) +FIX: keep filter by category or by not enough stock if we switch page +FIX: no need to remove file into mail form, the temp dir will be deleted after any sending +FIX: no projet_task_time id from trigger TASK_TIMESPENT_CREATE +FIX: pmp +FIX: send mail, copy sendto don't read the list of contact +FIX: The hours of date filter aren't correct +FIX: tool export handle the type "select" extrafields and return the value instead of id +FIX: top links menu have target attribute with wrong value +FIX: total amount in tpl linked object are not reset +FIX: when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask) ***** ChangeLog for 3.6.4 compared to 3.6.3 ***** - Fix: [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask diff --git a/README-FR.md b/README-FR.md index 53ae1be8e8d..b3ce951c975 100644 --- a/README-FR.md +++ b/README-FR.md @@ -133,12 +133,19 @@ Voici un liste de fonctionnalites pas encore gérées par Dolibarr: - Dolibarr ne fait pas le café (pas encore). -## RESEAUX SOCIAUX +## ACTUALITES ET RESEAUX SOCIAUX -Suivez le projet Dolibarr project sur +Suivez le projet Dolibarr project sur les réseaux francophones -Facebook: +- Facebook: +- Google+: +- Twitter: -Google+: +ou sur les réseaux anglophones -Twitter: +- [Facebook](https://www.facebook.com/dolibarr) +- [Google+](https://plus.google.com/+DolibarrOrg) +- [Twitter](http://www.twitter.com/dolibarr) +- [LinkedIn](https://www.linkedin.com/company/association-dolibarr) +- [YouTube](https://www.youtube.com/user/DolibarrERPCRM) +- [GitHub](https://github.com/Dolibarr/dolibarr) diff --git a/README.md b/README.md index f6f4b8be34f..0c3507f62f6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # DOLIBARR ERP & CRM -![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dd/dolibarr.svg) +![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg) Dolibarr ERP & CRM is a modern software to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...). @@ -16,9 +16,9 @@ You can use it as a standalone application or as a web application to be able to Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+). -See the [COPYING](COPYING) file for a full copy of the license. +See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) file for a full copy of the license. -Other licenses apply for some included dependencies. See [COPYRIGHT](COPYRIGHT) for a full list. +Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list. ## INSTALLING @@ -65,9 +65,9 @@ You can use a Web server and a supported database (MySQL recommended) to install *Note: migration process can safely be done multiple times.* -## NEWS +## WHAT'S NEW -See the [ChangeLog](ChangeLog) file. +See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file. ## FEATURES @@ -149,13 +149,17 @@ These are features that Dolibarr does **not** yet fully support: Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](http://wiki.dolibarr.org). +## CONTRIBUTING + +See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/CONTRIBUTING.md) + ## CREDITS Dolibarr is the work of many contributors over the years and uses some fine libraries. -See [COPYRIGHT](COPYRIGHT) file. +See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file. -## SOCIAL NETWORKS +## NEWS AND SOCIAL NETWORKS Follow Dolibarr project on: diff --git a/build/debian/README.howto b/build/debian/README.howto index 92397130a3a..1889c7b633e 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -239,7 +239,7 @@ http://packages.qa.debian.org/t/tcpdf.html ##### Create/Maintain dolibarr package -To update dolibarr debian package when upstream version has changed +To update dolibarr debian package when upstream (official version of external project) has changed: * You can git clone debian git repo > git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian] @@ -284,10 +284,10 @@ Then check/modify also the user/date signature: - Name and email must match value into debian/control file (Entry added here is used by next step). -To update dolibarr debian package when only files into debian has changed +To update dolibarr debian package when only files into debian has changed, or if you include manually backport: * Change files and commit. -* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2) +* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...) Once files has been prepared, it's time to test: diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 99ec7b3543a..fbae52f9726 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -22,7 +22,8 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr"; $PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files"; -@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages +#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages +@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT"); # Possible packages %REQUIREMENTPUBLISH=( "SF"=>"git ssh rsync", "ASSO"=>"git ssh rsync" @@ -351,6 +352,28 @@ if ($nboftargetok) { print "Go to directory $SOURCE\n"; $olddir=getcwd(); chdir("$SOURCE"); + + # Test that the ChangeLog is ok + $ret=`grep "ChangeLog for $MAJOR.$MINOR\.$BUILD" "$SOURCE/ChangeLog" 2>&1`; + if (! $ret) + { + print "Error: The ChangeLogFile was not updated. Run the following command first:\n"; + if (! $BUILD) + { + print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa'; + } + else + { + print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa'; + } + print "\n"; + exit; + } + else + { + print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'\n"; + } + print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n"; $ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`; if ($ret =~ /already exists/) diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 953e207d28d..2bf516dfe88 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -9,8 +9,8 @@ beta version of Dolibarr, step by step. - Check all files are commited. - Update version/info in ChangeLog. -To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git merge-base x-1.y-1.0 origin/develop`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" -To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log `git merge-base x.y.z-1 origin/develop`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" +To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" +To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" - Update version number with x.y.z-w in htdocs/filefunc.inc.php - Commit all changes. @@ -31,8 +31,8 @@ complete release of Dolibarr, step by step. - Check all files are commited. - Update version/info in ChangeLog. -To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git merge-base x-1.y-1.0 origin/develop`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" -To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log `git merge-base x.y.z-1 origin/develop`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" +To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" +To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" - Update version number with x.y.z in htdocs/filefunc.inc.php - Commit all changes. diff --git a/composer.json b/composer.json index c5fab8bf290..9061efb3bfe 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ "php": ">=5.3.0", "ext-curl": "*", "ccampbell/chromephp": "^4.1", - "ckeditor/ckeditor": "4.3.3", + "ckeditor/ckeditor": "dev-full/4.3.x#0b7c3f1", "mike42/escpos-php": "dev-master", "mobiledetect/mobiledetectlib": "2.8.3", - "phpoffice/phpexcel": "1.8.0", + "phpoffice/phpexcel": "1.8.1", "restler/framework": "^3.0", - "tecnick.com/tcpdf": "6.2.6", + "tecnickcom/tcpdf": "6.2.6", "raven/raven": "^0.12.0", "firephp/firephp-core": "^0.4.0" }, diff --git a/composer.lock b/composer.lock index 47122ebe431..99bf8d6fa10 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d88b5c84a9ea1af354d867ba2e2ab251", - "content-hash": "85e60ec7f8ab593387c7bd10d8db860d", + "hash": "335eb7bd5c2eb116fd2da80b4f48e857", "packages": [ { "name": "ccampbell/chromephp", @@ -52,16 +51,16 @@ }, { "name": "ckeditor/ckeditor", - "version": "4.3.3", + "version": "dev-full/4.3.x", "source": { "type": "git", "url": "https://github.com/ckeditor/ckeditor-releases.git", - "reference": "0068dd540ce8bf1815abb7b5455c55354bc56334" + "reference": "0b7c3f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/0068dd540ce8bf1815abb7b5455c55354bc56334", - "reference": "0068dd540ce8bf1815abb7b5455c55354bc56334", + "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/252e512e911f21d880ea542fe162c4643885b317", + "reference": "0b7c3f1", "shasum": "" }, "type": "library", @@ -89,7 +88,7 @@ "text", "wysiwyg" ], - "time": "2014-02-26 15:34:37" + "time": "2014-02-26 15:43:10" }, { "name": "firephp/firephp-core", @@ -239,16 +238,16 @@ }, { "name": "phpoffice/phpexcel", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/PHPOffice/PHPExcel.git", - "reference": "e69a5e4d0ffa7fb6f171859e0a04346e580df30b" + "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/e69a5e4d0ffa7fb6f171859e0a04346e580df30b", - "reference": "e69a5e4d0ffa7fb6f171859e0a04346e580df30b", + "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32", + "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32", "shasum": "" }, "require": { @@ -292,7 +291,7 @@ "xls", "xlsx" ], - "time": "2014-03-02 15:22:49" + "time": "2015-05-01 07:00:55" }, { "name": "raven/raven", @@ -423,7 +422,7 @@ "time": "2015-08-04 07:52:49" }, { - "name": "tecnick.com/tcpdf", + "name": "tecnickcom/tcpdf", "version": "6.2.6", "source": { "type": "git", @@ -483,7 +482,6 @@ "pdf417", "qrcode" ], - "abandoned": "tecnickcom/tcpdf", "time": "2015-01-28 18:51:40" } ], @@ -491,6 +489,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "ckeditor/ckeditor": 20, "mike42/escpos-php": 20 }, "prefer-stable": false, diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt index 9d449070a5f..f761bc940db 100644 --- a/dev/dolibarr_changes.txt +++ b/dev/dolibarr_changes.txt @@ -69,7 +69,7 @@ Add tcpdi.php Add tcpdi_parser.php and replace: require_once(dirname(__FILE__).'/include/tcpdf_filters.php'); with: -require_once(dirname(__FILE__).'/../tecnick.com/tcpdf/include/tcpdf_filters.php'); +require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php'); diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-invoice.php similarity index 95% rename from dev/initdata/generate-facture.php rename to dev/initdata/generate-invoice.php index 97f00f7d6d6..321cc6af06a 100755 --- a/dev/initdata/generate-facture.php +++ b/dev/initdata/generate-invoice.php @@ -19,8 +19,8 @@ */ /** - * \file dev/intdata/generate-facture.php - * \brief Script de generation de donnees aleatoires pour les factures + * \file dev/intdata/generate-invoice.php + * \brief Script example to inject random customer invoices (for load tests) */ // Test si mode batch diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-order.php similarity index 97% rename from dev/initdata/generate-commande.php rename to dev/initdata/generate-order.php index 785c0544876..6ba813c5135 100755 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-order.php @@ -20,8 +20,8 @@ */ /** - * \file dev/initdata/generate-commande.php - * \brief Script de generation de donnees aleatoires pour les commandes + * \file dev/initdata/generate-order.php + * \brief Script example to inject random orders (for load tests) */ // Test si mode batch diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-product.php similarity index 96% rename from dev/initdata/generate-produit.php rename to dev/initdata/generate-product.php index 6e7ea6dd05f..38c0e755db3 100755 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-product.php @@ -20,8 +20,8 @@ */ /** - * \file dev/initdata/generate-produit.php - * \brief Script de generation de donnees aleatoires pour les produits + * \file dev/initdata/generate-product.php + * \brief Script example to inject random products (for load tests) */ // Test si mode batch diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-proposal.php similarity index 96% rename from dev/initdata/generate-propale.php rename to dev/initdata/generate-proposal.php index b7b76ec2c02..8e17e673b86 100755 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-proposal.php @@ -20,8 +20,8 @@ */ /** - * \file dev/initdata/generate-propale.php - * \brief Script de generation de donnees aleatoires pour les propales + * \file dev/initdata/generate-proposal.php + * \brief Script example to inject random proposals (for load tests) */ // Test si mode batch diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-thirdparty.php similarity index 97% rename from dev/initdata/generate-societe.php rename to dev/initdata/generate-thirdparty.php index 72e4d9b1e84..9d928db6ac0 100755 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-thirdparty.php @@ -20,8 +20,8 @@ */ /** - * \file dev/initdata/generate-societe.php - * \brief Script de generation de donnees aleatoires pour les societes + * \file dev/initdata/generate-thirdparty.php + * \brief Script example to inject random thirdparties (for load tests) */ // Test si mode batch diff --git a/dev/initdata/sftpget_and_loaddump.php b/dev/initdata/sftpget_and_loaddump.php index c91ddcc3e17..72a33cf197c 100755 --- a/dev/initdata/sftpget_and_loaddump.php +++ b/dev/initdata/sftpget_and_loaddump.php @@ -15,6 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * or see http://www.gnu.org/ + * + * Get a distant dump file and load it into a mysql database */ $sapi_type = php_sapi_name(); @@ -32,9 +34,10 @@ $error=0; $sourceserver=isset($argv[1])?$argv[1]:''; // user@server:/src/file $password=isset($argv[2])?$argv[2]:''; -$database=isset($argv[3])?$argv[3]:''; -$loginbase=isset($argv[4])?$argv[4]:''; -$passwordbase=isset($argv[5])?$argv[5]:''; +$dataserver=isset($argv[3])?$argv[3]:''; +$database=isset($argv[4])?$argv[4]:''; +$loginbase=isset($argv[5])?$argv[5]:''; +$passwordbase=isset($argv[6])?$argv[6]:''; // Include Dolibarr environment $res=0; @@ -64,7 +67,7 @@ if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg)) } if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase)) { - print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh database loginbase passbase\n"; + print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n"; print "Return code: 0 if success, <>0 if error\n"; print "Warning, this script may take a long time.\n"; exit(-1); @@ -108,14 +111,14 @@ if ($connection) print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n"; ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile); - $fullcommand="cat ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database; + $fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; if (preg_match('/\.bz2$/',$targetfile)) { - $fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database; + $fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; } if (preg_match('/\.gz$/',$targetfile)) { - $fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database; + $fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; } print "Load dump with ".$fullcommand."\n"; $output=array(); diff --git a/dev/mail/source_email_from_thirdparty.txt b/dev/mail/source_email_from_thirdparty.txt new file mode 100644 index 00000000000..e17afa19414 --- /dev/null +++ b/dev/mail/source_email_from_thirdparty.txt @@ -0,0 +1,48 @@ +Content-Type: multipart/mixed; boundary="===============4543832834454763172==" +Date: Thu, 12 Nov 2015 17:58:00 -0000 +From: Administrator +MIME-Version: 1.0 +Message-ID: 5nLkUQEIn50FnlwxWDkh59NfLof1ode0uC5cZEgm9Y4=@mailhog.example +Message-Id: <1447351080.369951963424683.576889035053436-dolibarr-7-thirdparty@PCHOME-LD> +Received: from pchome-ld by mailhog.example (Go-MailHog) + id 5nLkUQEIn50FnlwxWDkh59NfLof1ode0uC5cZEgm9Y4=@mailhog.example; Thu, 12 Nov 2015 18:58:00 +0100 +Reply-To: Administrator +Return-Path: +Subject: A test email from thirdparty card +To: Thirdparty company + +--===============4543832834454763172== +Content-Type: multipart/alternative; + boundary="===============8764907306434163361==" +MIME-Version: 1.0 + +--===============8764907306434163361== +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 + +dGVzdDIKCi0tCkFkbWluaXN0cmF0b3IKClNlbnQgYnkgWW91ckNvbXBhbnkgWzFdIHVzaW5nIE9k +b28gWzJdCgosICBhY2Nlc3MgZGlyZWN0bHkgdG8gUGFydG5lciBBZ3JvbGFpdCBbM10KCgpbMV0g +aHR0cDovL3d3dy5leGFtcGxlLmNvbQpbMl0gaHR0cHM6Ly93d3cub2Rvby5jb20vClszXSBodHRw +Oi8vbG9jYWxob3N0OjgxNjkvd2ViL3NpZ251cD9yZWRpcmVjdD0lMkZ3ZWIlMjNhY3Rpb24lM0Rt +YWlsLmFjdGlvbl9tYWlsX3JlZGlyZWN0JTI2bW9kZWwlM0RyZXMucGFydG5lciUyNmlkJTNENyZ0 +b2tlbj1nM0s0QWU1T0Q5a3UxaEVubVZUQiZkYj1vZG9vX3Y4Cg== + +--===============8764907306434163361== +Content-Type: text/html; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 + +PHA+dGVzdDI8L3A+Cgo8c3Bhbj4tLTxicj4KQWRtaW5pc3RyYXRvcjwvc3Bhbj4KCjxiciAvPjxz +bWFsbD5TZW50IGJ5IDxhIHN0eWxlPSdjb2xvcjppbmhlcml0JyBocmVmPSdodHRwOi8vd3d3LmV4 +YW1wbGUuY29tJz5Zb3VyQ29tcGFueTwvYT4gdXNpbmcgPGEgc3R5bGU9J2NvbG9yOmluaGVyaXQn +IGhyZWY9J2h0dHBzOi8vd3d3Lm9kb28uY29tLyc+T2RvbzwvYT48L3NtYWxsPgoKCiwgPHNwYW4g +Y2xhc3M9J29lX21haWxfZm9vdGVyX2FjY2Vzcyc+PHNtYWxsPmFjY2VzcyBkaXJlY3RseSB0byA8 +YSBzdHlsZT0nY29sb3I6aW5oZXJpdCcgaHJlZj0naHR0cDovL2xvY2FsaG9zdDo4MTY5L3dlYi9z +aWdudXA/cmVkaXJlY3Q9JTJGd2ViJTIzYWN0aW9uJTNEbWFpbC5hY3Rpb25fbWFpbF9yZWRpcmVj +dCUyNm1vZGVsJTNEcmVzLnBhcnRuZXIlMjZpZCUzRDcmdG9rZW49ZzNLNEFlNU9EOWt1MWhFbm1W +VEImZGI9b2Rvb192OCc+UGFydG5lciBBZ3JvbGFpdDwvYT48L3NtYWxsPjwvc3Bhbj4K + +--===============8764907306434163361==-- + +--===============4543832834454763172==-- \ No newline at end of file diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php index 6025f6a1f4e..803a6c8b8f5 100755 --- a/dev/skeletons/build_class_from_table.php +++ b/dev/skeletons/build_class_from_table.php @@ -619,17 +619,28 @@ foreach ($skeletonfiles as $skeletonfile => $outfile) $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print ''.\$obj->field1.'';",'/').'/', $varprop, $targetcontent); $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print ''.\$obj->field2.'';",'/').'/', '', $targetcontent); - // LIST_OF_TD_LABEL_FIELDS_CREATE and EDIT - List of td for card view + // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view $varprop="\n"; $cleanparam=''; foreach($property as $key => $prop) { if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime']) { - $varprop.="print ''.\$langs->trans(\"Field".$prop['field']."\").'';\n"; + $varprop.="print ''.\$langs->trans(\"Field".$prop['field']."\").'';\n"; } } $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent); + + // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view + $varprop="\n"; + $cleanparam=''; + foreach($property as $key => $prop) + { + if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime']) + { + $varprop.="print ''.\$langs->trans(\"Field".$prop['field']."\").'".$prop['field'].".'\">';\n"; + } + } $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent); // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php index 22958c9c833..7f0ff1fc7d4 100644 --- a/dev/skeletons/skeleton_card.php +++ b/dev/skeletons/skeleton_card.php @@ -112,7 +112,7 @@ if (empty($reshook)) if (empty($object->ref)) { $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'errors'); + setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors'); } if (! $error) @@ -152,7 +152,7 @@ if (empty($reshook)) if (empty($object->ref)) { $error++; - setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),null,'errors'); + setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors'); } if (! $error) @@ -189,8 +189,8 @@ if (empty($reshook)) } else { - if (! empty($object->errors)) setEventMessages(null,$object->errors,'errors'); - else setEventMessages($object->error,null,'errors'); + if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors'); + else setEventMessages($object->error, null, 'errors'); } } } @@ -281,12 +281,17 @@ if (($id || $ref) && $action == 'edit') // Part to show record -if ($id && (empty($action) || $action == 'view')) +if ($id && (empty($action) || $action == 'view' || $action == 'delete')) { print load_fiche_titre($langs->trans("MyModule")); dol_fiche_head(); + if ($action == 'delete') { + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1); + print $formconfirm; + } + print ''."\n"; // print ''; // LIST_OF_TD_LABEL_FIELDS_VIEW @@ -310,14 +315,7 @@ if ($id && (empty($action) || $action == 'view')) if ($user->rights->mymodule->delete) { - if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) // We can't use preloaded confirm form with jmobile - { - print '
'.$langs->trans('Delete').'
'."\n"; - } - else - { - print '
'.$langs->trans('Delete').'
'."\n"; - } + print '
'.$langs->trans('Delete').'
'."\n"; } } print ''."\n"; diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php index 3018a23fdea..686549f19a8 100644 --- a/dev/skeletons/skeleton_list.php +++ b/dev/skeletons/skeleton_list.php @@ -96,6 +96,23 @@ if (($id > 0 || ! empty($ref)) && $action != 'add') if ($result < 0) dol_print_error($db); } +// Definition of fields for list +$arrayfields=array( + 't.field1'=>array('label'=>$langs->trans("Field1"), 'checked'=>1), + 't.field2'=>array('label'=>$langs->trans("Field2"), 'checked'=>1), + //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))), + 't.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), + 't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), + //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), +); +// Extra fields +if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) +{ + foreach($extrafields->attribute_label as $key => $val) + { + $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); + } +} @@ -267,22 +284,6 @@ if ($resql) print ''; } - $arrayfields=array( - 't.field1'=>array('label'=>$langs->trans("Field1"), 'checked'=>1), - 't.field2'=>array('label'=>$langs->trans("Field2"), 'checked'=>1), - //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))), - 't.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), - 't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), - //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), - ); - // Extra fields - if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) - { - foreach($extrafields->attribute_label as $key => $val) - { - $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); - } - } $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields diff --git a/dev/test/testtcpdf.php b/dev/test/testtcpdf.php index 6b600c630d3..ad67bce8af9 100755 --- a/dev/test/testtcpdf.php +++ b/dev/test/testtcpdf.php @@ -27,8 +27,8 @@ * @since 2008-03-04 */ -require_once('../../htdocs/includes/tecnick.com/tcpdf/config/tcpdf_config.php'); -require_once('../../htdocs/includes/tecnick.com/tcpdf/tcpdf.php'); +require_once('../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php'); +require_once('../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php'); // create new PDF document $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); diff --git a/dev/test/testutf.php b/dev/test/testutf.php index f60f9d195a3..cb83f431b93 100644 --- a/dev/test/testutf.php +++ b/dev/test/testutf.php @@ -47,8 +47,8 @@ print 'Files has been created. Check its name from your explorer'."\n"; * @since 2008-09-15 */ -require_once('../../htdocs/includes/tecnick.com/tcpdf/config/tcpdf_config.php'); -require_once('../../htdocs/includes/tecnick.com/tcpdf/tcpdf.php'); +require_once('../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php'); +require_once('../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php'); // create new PDF document $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); diff --git a/htdocs/.gitignore b/htdocs/.gitignore index b0b84be129e..bf0c3b10ffa 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -15,3 +15,8 @@ /teclib* /test.php /ultimatepdf* +/lead +/dolimed* +/allscreens* +/ecommerce/ +/cabinetmed* \ No newline at end of file diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index a3e179c1701..964e39efebf 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -1,4 +1,4 @@ - * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2013-2015 Alexandre Spangaro @@ -19,7 +19,7 @@ /** * \file htdocs/accountancy/customer/card.php - * \ingroup Accounting Expert + * \ingroup Accountancy * \brief Card customer ventilation */ @@ -88,7 +88,6 @@ if (! empty($id)) { $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid"; $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture"; $sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id; - if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 3af8d012d76..820596de166 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -21,7 +21,7 @@ /** * \file htdocs/accountancy/customer/list.php - * \ingroup Accounting Expert + * \ingroup Accountancy * \brief Ventilation page from customers invoices */ require '../../main.inc.php'; @@ -166,16 +166,27 @@ if ($action == 'ventil' && !empty($btn_ventil)) { * Customer Invoice lines */ -$sql = "SELECT f.facnumber, f.rowid as facid, f.datef, f.type as ftype, l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation,"; -$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod"; -$sql .= " , aa.rowid as aarowid"; -$sql .= " , l.product_type as type_l, l.tva_tx as tva_tx_line"; +if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) { + $limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION; +} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) { + $limit = $conf->liste_limit; +} else { + $limit = $conf->liste_limit; +} + +$offset = $limit * $page; + +$sql = "SELECT f.facnumber, f.rowid as facid, f.datef, f.type as ftype, l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line,"; +$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,"; +$sql .= " aa.rowid as aarowid"; $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f"; $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as l ON f.rowid = l.fk_facture"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountancy_code_sell = aa.account_number"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version"; -$sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation <= 0"; +$sql .= " WHERE f.fk_statut > 0"; +$sql .= " AND fk_code_ventilation <= 0"; +$sql .= " AND product_type <= 2"; $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')"; // Add search filter like diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index 61b225fbc16..d11d72951dc 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -23,7 +23,7 @@ */ /** * \file htdocs/accountancy/supplier/card.php - * \ingroup Accounting Expert + * \ingroup Accountancy * \brief Card supplier ventilation */ @@ -88,7 +88,6 @@ if (! empty($id)) { $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid"; $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn "; $sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id; - if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index b0a3fe50d98..891d8b1439e 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -21,7 +21,7 @@ /** * \file htdocs/accountancy/supplier/list.php - * \ingroup Accounting Expert + * \ingroup Accountancy * \brief Ventilation page from suppliers invoices */ require '../../main.inc.php'; @@ -171,19 +171,27 @@ if ($action == 'ventil' && !empty($btn_ventil)) { * */ -$sql = "SELECT f.ref, f.rowid as facid, f.ref_supplier, l.fk_product, l.description, l.total_ht as price, l.rowid, l.fk_code_ventilation, l.tva_tx as tva_tx_line, "; +if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) { + $limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION; +} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) { + $limit = $conf->liste_limit; +} else { + $limit = $conf->liste_limit; +} + +$offset = $limit * $page; + +$sql = "SELECT f.ref, f.rowid as facid, f.ref_supplier, f.datef, l.fk_product, l.description, l.total_ht as price, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, "; $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod"; $sql .= " , aa.rowid as aarowid"; -$sql .= " , f.datef"; -$sql .= " , l.product_type as type_l"; $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f"; $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn_det as l ON f.rowid = l.fk_facture_fourn"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountancy_code_buy = aa.account_number"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version"; $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation <= 0"; +$sql .= " AND product_type <= 2"; $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_buy ='')"; - // Add search filter like if (strlen(trim($search_invoice))) { $sql .= " AND (f.ref like '%" . $search_invoice . "%')"; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 5b6d64801b5..9e09bf87b1d 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -48,7 +48,8 @@ $boxes = array(); if ($action == 'addconst') { - dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", $_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"],'chaine',0,'',$conf->entity); } if ($action == 'add') { @@ -456,8 +457,8 @@ $var=false; print ''; print ''; print ''; -print ''; print ''; + print ''; print ''."\n"; print ''; -print ''."\n"; print ''; +// Activate FileCache - Developement +if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) { + $var=!$var; + print ''; + print ''; +} + print '
'.$langs->trans("Label").'
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print $langs->trans("MaxNbOfLinesForBoxes"); @@ -465,12 +466,21 @@ print ''; print ''; print ''; -print ''; -print '
'.$langs->trans("EnableFileCache").''; + print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1); + print '
'; + +print '
'; + print ''; print "\n".''."\n"; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index e84bdf2a3fa..be7756e5900 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -594,7 +594,7 @@ if ($action == 'edit' || $action == 'updateedit') // Note: When option is not set, it must not appears as set on on, because there is no default value for this option print "global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).""; print ''; - print ""; + print '
'; print ""; $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code); print ($example!="LocalTax1IsUsedExample"?"\n":""); @@ -602,8 +602,8 @@ if ($action == 'edit' || $action == 'updateedit') { print ''; } - print ''; $opcions=array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"),$langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"),$langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc")); @@ -614,7 +614,7 @@ if ($action == 'edit' || $action == 'updateedit') print "\n"; $var=!$var; - print ""; + print ""; print '
".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."
: '; $formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1"); + print '
global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."
global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."'; print ""; print ""; @@ -639,14 +639,14 @@ if ($action == 'edit' || $action == 'updateedit') // Note: When option is not set, it must not appears as set on on, because there is no default value for this option print ""; print '
global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."'; - print ""; + print '
'; print ""; $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code); print ($example!="LocalTax2IsUsedExample"?"\n":""); - print ''; } print '\n"; $var=!$var; - print ""; + print ""; print ''; - else print ''; + else print ''; } else { print ''; } - print ''; + print ''; print ''; print '
".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."
: '; if(! isOnlyOneLocalTax(2)) { - $formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2"); + print '
: '; + $formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2"); print '
: '; @@ -656,7 +656,7 @@ if ($action == 'edit' || $action == 'updateedit') print "
global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."
global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."'; print ""; print ""; @@ -965,7 +965,7 @@ else $var=true; $var=!$var; - print ""; + print ""; print ' ? if ($row == $theadStart) { $html .= ' ' . PHP_EOL; + $cellType = 'th'; } // ? if ($row == $tbodyStart) { $html .= ' ' . PHP_EOL; + $cellType = 'td'; } // Write row if there are HTML table cells in it @@ -433,7 +435,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ $rowData[$column] = ''; } } - $html .= $this->_generateRow($sheet, $rowData, $row - 1); + $html .= $this->_generateRow($sheet, $rowData, $row - 1, $cellType); } // ? @@ -670,7 +672,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ /** * Generate CSS styles * - * @param boolean $generateSurroundingHTML Generate surrounding HTML tags? () + * @param boolean $generateSurroundingHTML Generate surrounding HTML tags? (<style> and </style>) * @return string * @throws PHPExcel_Writer_Exception */ @@ -751,6 +753,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ // .gridlines td { } $css['.gridlines td']['border'] = '1px dotted black'; + $css['.gridlines th']['border'] = '1px dotted black'; // .b {} $css['.b']['text-align'] = 'center'; // BOOL @@ -773,6 +776,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ // Calculate cell style hashes foreach ($this->_phpExcel->getCellXfCollection() as $index => $style) { $css['td.style' . $index] = $this->_createCSSStyle( $style ); + $css['th.style' . $index] = $this->_createCSSStyle( $style ); } // Fetch sheets @@ -1077,7 +1081,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ * @return string * @throws PHPExcel_Writer_Exception */ - private function _generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0) { + private function _generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0, $cellType = 'td') { if (is_array($pValues)) { // Construct HTML $html = ''; @@ -1122,9 +1126,15 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ $cssClass = 'column' . $colNum; } else { $cssClass = array(); - if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) { - $this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum]; - } + if ($cellType == 'th') { + if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) { + $this->_cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum]; + } + } else { + if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) { + $this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum]; + } + } } $colSpan = 1; $rowSpan = 1; @@ -1176,7 +1186,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ array($this, 'formatColor') ); } else { - $cellData = PHPExcel_Style_NumberFormat::ToFormattedString( + $cellData = PHPExcel_Style_NumberFormat::toFormattedString( $cell->getValue(), $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(), array($this, 'formatColor') @@ -1202,9 +1212,15 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ $cssClass .= ' style' . $cell->getXfIndex(); $cssClass .= ' ' . $cell->getDataType(); } else { - if (isset($this->_cssStyles['td.style' . $cell->getXfIndex()])) { - $cssClass = array_merge($cssClass, $this->_cssStyles['td.style' . $cell->getXfIndex()]); - } + if ($cellType == 'th') { + if (isset($this->_cssStyles['th.style' . $cell->getXfIndex()])) { + $cssClass = array_merge($cssClass, $this->_cssStyles['th.style' . $cell->getXfIndex()]); + } + } else { + if (isset($this->_cssStyles['td.style' . $cell->getXfIndex()])) { + $cssClass = array_merge($cssClass, $this->_cssStyles['td.style' . $cell->getXfIndex()]); + } + } // General horizontal alignment: Actual horizontal alignment depends on dataType $sharedStyle = $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() ); @@ -1244,7 +1260,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ // Write if ($writeCell) { // Column start - $html .= ' _useInlineCss) { $html .= ' class="' . $cssClass . '"'; } else { @@ -1291,7 +1307,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_ $html .= $cellData; // Column end - $html .= '' . PHP_EOL; + $html .= '' . PHP_EOL; } // Next column diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php new file mode 100644 index 00000000000..2cbe6f90424 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php @@ -0,0 +1,200 @@ + + * @link http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os.html + */ +class PHPExcel_Writer_OpenDocument extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter +{ + /** + * Private writer parts + * + * @var PHPExcel_Writer_OpenDocument_WriterPart[] + */ + private $_writerParts = array(); + + /** + * Private PHPExcel + * + * @var PHPExcel + */ + private $_spreadSheet; + + /** + * Create a new PHPExcel_Writer_OpenDocument + * + * @param PHPExcel $pPHPExcel + */ + public function __construct(PHPExcel $pPHPExcel = null) + { + $this->setPHPExcel($pPHPExcel); + + $writerPartsArray = array( + 'content' => 'PHPExcel_Writer_OpenDocument_Content', + 'meta' => 'PHPExcel_Writer_OpenDocument_Meta', + 'meta_inf' => 'PHPExcel_Writer_OpenDocument_MetaInf', + 'mimetype' => 'PHPExcel_Writer_OpenDocument_Mimetype', + 'settings' => 'PHPExcel_Writer_OpenDocument_Settings', + 'styles' => 'PHPExcel_Writer_OpenDocument_Styles', + 'thumbnails' => 'PHPExcel_Writer_OpenDocument_Thumbnails' + ); + + foreach ($writerPartsArray as $writer => $class) { + $this->_writerParts[$writer] = new $class($this); + } + } + + /** + * Get writer part + * + * @param string $pPartName Writer part name + * @return PHPExcel_Writer_Excel2007_WriterPart + */ + public function getWriterPart($pPartName = '') + { + if ($pPartName != '' && isset($this->_writerParts[strtolower($pPartName)])) { + return $this->_writerParts[strtolower($pPartName)]; + } else { + return null; + } + } + + /** + * Save PHPExcel to file + * + * @param string $pFilename + * @throws PHPExcel_Writer_Exception + */ + public function save($pFilename = NULL) + { + if (!$this->_spreadSheet) { + throw new PHPExcel_Writer_Exception('PHPExcel object unassigned.'); + } + + // garbage collect + $this->_spreadSheet->garbageCollect(); + + // If $pFilename is php://output or php://stdout, make it a temporary file... + $originalFilename = $pFilename; + if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') { + $pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp'); + if ($pFilename == '') { + $pFilename = $originalFilename; + } + } + + $objZip = $this->_createZip($pFilename); + + $objZip->addFromString('META-INF/manifest.xml', $this->getWriterPart('meta_inf')->writeManifest()); + $objZip->addFromString('Thumbnails/thumbnail.png', $this->getWriterPart('thumbnails')->writeThumbnail()); + $objZip->addFromString('content.xml', $this->getWriterPart('content')->write()); + $objZip->addFromString('meta.xml', $this->getWriterPart('meta')->write()); + $objZip->addFromString('mimetype', $this->getWriterPart('mimetype')->write()); + $objZip->addFromString('settings.xml', $this->getWriterPart('settings')->write()); + $objZip->addFromString('styles.xml', $this->getWriterPart('styles')->write()); + + // Close file + if ($objZip->close() === false) { + throw new PHPExcel_Writer_Exception("Could not close zip file $pFilename."); + } + + // If a temporary file was used, copy it to the correct file stream + if ($originalFilename != $pFilename) { + if (copy($pFilename, $originalFilename) === false) { + throw new PHPExcel_Writer_Exception("Could not copy temporary zip file $pFilename to $originalFilename."); + } + @unlink($pFilename); + } + } + + /** + * Create zip object + * + * @param string $pFilename + * @throws PHPExcel_Writer_Exception + * @return ZipArchive + */ + private function _createZip($pFilename) + { + // Create new ZIP file and open it for writing + $zipClass = PHPExcel_Settings::getZipClass(); + $objZip = new $zipClass(); + + // Retrieve OVERWRITE and CREATE constants from the instantiated zip class + // This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP + $ro = new ReflectionObject($objZip); + $zipOverWrite = $ro->getConstant('OVERWRITE'); + $zipCreate = $ro->getConstant('CREATE'); + + if (file_exists($pFilename)) { + unlink($pFilename); + } + // Try opening the ZIP file + if ($objZip->open($pFilename, $zipOverWrite) !== true) { + if ($objZip->open($pFilename, $zipCreate) !== true) { + throw new PHPExcel_Writer_Exception("Could not open $pFilename for writing."); + } + } + + return $objZip; + } + + /** + * Get PHPExcel object + * + * @return PHPExcel + * @throws PHPExcel_Writer_Exception + */ + public function getPHPExcel() + { + if ($this->_spreadSheet !== null) { + return $this->_spreadSheet; + } else { + throw new PHPExcel_Writer_Exception('No PHPExcel assigned.'); + } + } + + /** + * Set PHPExcel object + * + * @param PHPExcel $pPHPExcel PHPExcel object + * @throws PHPExcel_Writer_Exception + * @return PHPExcel_Writer_Excel2007 + */ + public function setPHPExcel(PHPExcel $pPHPExcel = null) + { + $this->_spreadSheet = $pPHPExcel; + return $this; + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php new file mode 100644 index 00000000000..88406ed1ad2 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php @@ -0,0 +1,63 @@ + + */ +class PHPExcel_Writer_OpenDocument_Cell_Comment +{ + public static function write(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Cell $cell) + { + $comments = $cell->getWorksheet()->getComments(); + if (!isset($comments[$cell->getCoordinate()])) { + return; + } + $comment = $comments[$cell->getCoordinate()]; + + $objWriter->startElement('office:annotation'); + //$objWriter->writeAttribute('draw:style-name', 'gr1'); + //$objWriter->writeAttribute('draw:text-style-name', 'P1'); + $objWriter->writeAttribute('svg:width', $comment->getWidth()); + $objWriter->writeAttribute('svg:height', $comment->getHeight()); + $objWriter->writeAttribute('svg:x', $comment->getMarginLeft()); + $objWriter->writeAttribute('svg:y', $comment->getMarginTop()); + //$objWriter->writeAttribute('draw:caption-point-x', $comment->getMarginLeft()); + //$objWriter->writeAttribute('draw:caption-point-y', $comment->getMarginTop()); + $objWriter->writeElement('dc:creator', $comment->getAuthor()); + // TODO: Not realized in PHPExcel_Comment yet. + //$objWriter->writeElement('dc:date', $comment->getDate()); + $objWriter->writeElement('text:p', $comment->getText()->getPlainText()); + //$objWriter->writeAttribute('draw:text-style-name', 'P1'); + $objWriter->endElement(); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php new file mode 100644 index 00000000000..625b3541747 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php @@ -0,0 +1,272 @@ + + */ +class PHPExcel_Writer_OpenDocument_Content extends PHPExcel_Writer_OpenDocument_WriterPart +{ + const NUMBER_COLS_REPEATED_MAX = 1024; + const NUMBER_ROWS_REPEATED_MAX = 1048576; + + /** + * Write content.xml to XML format + * + * @param PHPExcel $pPHPExcel + * @return string XML Output + * @throws PHPExcel_Writer_Exception + */ + public function write(PHPExcel $pPHPExcel = null) + { + if (!$pPHPExcel) { + $pPHPExcel = $this->getParentWriter()->getPHPExcel(); /* @var $pPHPExcel PHPExcel */ + } + + $objWriter = null; + if ($this->getParentWriter()->getUseDiskCaching()) { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory()); + } else { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY); + } + + // XML header + $objWriter->startDocument('1.0', 'UTF-8'); + + // Content + $objWriter->startElement('office:document-content'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); + $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); + $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); + $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); + $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); + $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); + $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); + $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); + $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); + $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); + $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); + $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); + $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); + $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); + $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms'); + $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema'); + $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance'); + $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); + $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); + $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); + $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); + $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); + $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0'); + $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); + $objWriter->writeAttribute('office:version', '1.2'); + + $objWriter->writeElement('office:scripts'); + $objWriter->writeElement('office:font-face-decls'); + $objWriter->writeElement('office:automatic-styles'); + + $objWriter->startElement('office:body'); + $objWriter->startElement('office:spreadsheet'); + $objWriter->writeElement('table:calculation-settings'); + $this->_writeSheets($objWriter); + $objWriter->writeElement('table:named-expressions'); + $objWriter->endElement(); + $objWriter->endElement(); + $objWriter->endElement(); + + return $objWriter->getData(); + } + + /** + * Write sheets + * + * @param PHPExcel_Shared_XMLWriter $objWriter + */ + private function _writeSheets(PHPExcel_Shared_XMLWriter $objWriter) + { + $pPHPExcel = $this->getParentWriter()->getPHPExcel(); /* @var $pPHPExcel PHPExcel */ + + $sheet_count = $pPHPExcel->getSheetCount(); + for ($i = 0; $i < $sheet_count; $i++) { + //$this->getWriterPart('Worksheet')->writeWorksheet()); + $objWriter->startElement('table:table'); + $objWriter->writeAttribute('table:name', $pPHPExcel->getSheet($i)->getTitle()); + $objWriter->writeElement('office:forms'); + $objWriter->startElement('table:table-column'); + $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); + $objWriter->endElement(); + $this->_writeRows($objWriter, $pPHPExcel->getSheet($i)); + $objWriter->endElement(); + } + } + + /** + * Write rows of the specified sheet + * + * @param PHPExcel_Shared_XMLWriter $objWriter + * @param PHPExcel_Worksheet $sheet + */ + private function _writeRows(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Worksheet $sheet) + { + $number_rows_repeated = self::NUMBER_ROWS_REPEATED_MAX; + $span_row = 0; + $rows = $sheet->getRowIterator(); + while ($rows->valid()) { + $number_rows_repeated--; + $row = $rows->current(); + if ($row->getCellIterator()->valid()) { + if ($span_row) { + $objWriter->startElement('table:table-row'); + if ($span_row > 1) { + $objWriter->writeAttribute('table:number-rows-repeated', $span_row); + } + $objWriter->startElement('table:table-cell'); + $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); + $objWriter->endElement(); + $objWriter->endElement(); + $span_row = 0; + } + $objWriter->startElement('table:table-row'); + $this->_writeCells($objWriter, $row); + $objWriter->endElement(); + } else { + $span_row++; + } + $rows->next(); + } + } + + /** + * Write cells of the specified row + * + * @param PHPExcel_Shared_XMLWriter $objWriter + * @param PHPExcel_Worksheet_Row $row + * @throws PHPExcel_Writer_Exception + */ + private function _writeCells(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Worksheet_Row $row) + { + $number_cols_repeated = self::NUMBER_COLS_REPEATED_MAX; + $prev_column = -1; + $cells = $row->getCellIterator(); + while ($cells->valid()) { + $cell = $cells->current(); + $column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1; + + $this->_writeCellSpan($objWriter, $column, $prev_column); + $objWriter->startElement('table:table-cell'); + + switch ($cell->getDataType()) { + case PHPExcel_Cell_DataType::TYPE_BOOL: + $objWriter->writeAttribute('office:value-type', 'boolean'); + $objWriter->writeAttribute('office:value', $cell->getValue()); + $objWriter->writeElement('text:p', $cell->getValue()); + break; + + case PHPExcel_Cell_DataType::TYPE_ERROR: + throw new PHPExcel_Writer_Exception('Writing of error not implemented yet.'); + break; + + case PHPExcel_Cell_DataType::TYPE_FORMULA: + try { + $formula_value = $cell->getCalculatedValue(); + } catch (Exception $e) { + $formula_value = $cell->getValue(); + } + $objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue()); + if (is_numeric($formula_value)) { + $objWriter->writeAttribute('office:value-type', 'float'); + } else { + $objWriter->writeAttribute('office:value-type', 'string'); + } + $objWriter->writeAttribute('office:value', $formula_value); + $objWriter->writeElement('text:p', $formula_value); + break; + + case PHPExcel_Cell_DataType::TYPE_INLINE: + throw new PHPExcel_Writer_Exception('Writing of inline not implemented yet.'); + break; + + case PHPExcel_Cell_DataType::TYPE_NUMERIC: + $objWriter->writeAttribute('office:value-type', 'float'); + $objWriter->writeAttribute('office:value', $cell->getValue()); + $objWriter->writeElement('text:p', $cell->getValue()); + break; + + case PHPExcel_Cell_DataType::TYPE_STRING: + $objWriter->writeAttribute('office:value-type', 'string'); + $objWriter->writeElement('text:p', $cell->getValue()); + break; + } + PHPExcel_Writer_OpenDocument_Cell_Comment::write($objWriter, $cell); + $objWriter->endElement(); + $prev_column = $column; + $cells->next(); + } + $number_cols_repeated = $number_cols_repeated - $prev_column - 1; + if ($number_cols_repeated > 0) { + if ($number_cols_repeated > 1) { + $objWriter->startElement('table:table-cell'); + $objWriter->writeAttribute('table:number-columns-repeated', $number_cols_repeated); + $objWriter->endElement(); + } else { + $objWriter->writeElement('table:table-cell'); + } + } + } + + /** + * Write span + * + * @param PHPExcel_Shared_XMLWriter $objWriter + * @param integer $curColumn + * @param integer $prevColumn + */ + private function _writeCellSpan(PHPExcel_Shared_XMLWriter $objWriter, $curColumn, $prevColumn) + { + $diff = $curColumn - $prevColumn - 1; + if (1 === $diff) { + $objWriter->writeElement('table:table-cell'); + } elseif ($diff > 1) { + $objWriter->startElement('table:table-cell'); + $objWriter->writeAttribute('table:number-columns-repeated', $diff); + $objWriter->endElement(); + } + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php new file mode 100644 index 00000000000..7f39e558924 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php @@ -0,0 +1,98 @@ + + */ +class PHPExcel_Writer_OpenDocument_Meta extends PHPExcel_Writer_OpenDocument_WriterPart +{ + /** + * Write meta.xml to XML format + * + * @param PHPExcel $pPHPExcel + * @return string XML Output + * @throws PHPExcel_Writer_Exception + */ + public function write(PHPExcel $pPHPExcel = null) + { + if (!$pPHPExcel) { + $pPHPExcel = $this->getParentWriter()->getPHPExcel(); + } + + $objWriter = null; + if ($this->getParentWriter()->getUseDiskCaching()) { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory()); + } else { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY); + } + + // XML header + $objWriter->startDocument('1.0', 'UTF-8'); + + // Meta + $objWriter->startElement('office:document-meta'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); + $objWriter->writeAttribute('office:version', '1.2'); + + $objWriter->startElement('office:meta'); + $objWriter->writeElement('meta:initial-creator', $pPHPExcel->getProperties()->getCreator()); + $objWriter->writeElement('dc:creator', $pPHPExcel->getProperties()->getCreator()); + $objWriter->writeElement('meta:creation-date', date(DATE_W3C, $pPHPExcel->getProperties()->getCreated())); + $objWriter->writeElement('dc:date', date(DATE_W3C, $pPHPExcel->getProperties()->getCreated())); + $objWriter->writeElement('dc:title', $pPHPExcel->getProperties()->getTitle()); + $objWriter->writeElement('dc:description', $pPHPExcel->getProperties()->getDescription()); + $objWriter->writeElement('dc:subject', $pPHPExcel->getProperties()->getSubject()); + $keywords = explode(' ', $pPHPExcel->getProperties()->getKeywords()); + foreach ($keywords as $keyword) { + $objWriter->writeElement('meta:keyword', $keyword); + } + // + $objWriter->startElement('meta:user-defined'); + $objWriter->writeAttribute('meta:name', 'Company'); + $objWriter->writeRaw($pPHPExcel->getProperties()->getCompany()); + $objWriter->endElement(); + $objWriter->startElement('meta:user-defined'); + $objWriter->writeAttribute('meta:name', 'category'); + $objWriter->writeRaw($pPHPExcel->getProperties()->getCategory()); + $objWriter->endElement(); + $objWriter->endElement(); + $objWriter->endElement(); + + return $objWriter->getData(); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php new file mode 100644 index 00000000000..301d39db99f --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php @@ -0,0 +1,96 @@ + + */ +class PHPExcel_Writer_OpenDocument_MetaInf extends PHPExcel_Writer_OpenDocument_WriterPart +{ + /** + * Write META-INF/manifest.xml to XML format + * + * @param PHPExcel $pPHPExcel + * @return string XML Output + * @throws PHPExcel_Writer_Exception + */ + public function writeManifest(PHPExcel $pPHPExcel = null) + { + if (!$pPHPExcel) { + $pPHPExcel = $this->getParentWriter()->getPHPExcel(); + } + + $objWriter = null; + if ($this->getParentWriter()->getUseDiskCaching()) { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory()); + } else { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY); + } + + // XML header + $objWriter->startDocument('1.0', 'UTF-8'); + + // Manifest + $objWriter->startElement('manifest:manifest'); + $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'); + $objWriter->writeAttribute('manifest:version', '1.2'); + + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', '/'); + $objWriter->writeAttribute('manifest:version', '1.2'); + $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'meta.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'settings.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'content.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png'); + $objWriter->writeAttribute('manifest:media-type', 'image/png'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'styles.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->endElement(); + + return $objWriter->getData(); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php new file mode 100644 index 00000000000..99ff638a9bb --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php @@ -0,0 +1,50 @@ + + */ +class PHPExcel_Writer_OpenDocument_Mimetype extends PHPExcel_Writer_OpenDocument_WriterPart +{ + /** + * Write mimetype to plain text format + * + * @param PHPExcel $pPHPExcel + * @return string XML Output + * @throws PHPExcel_Writer_Exception + */ + public function write(PHPExcel $pPHPExcel = null) + { + return 'application/vnd.oasis.opendocument.spreadsheet'; + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php new file mode 100644 index 00000000000..557e748d419 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php @@ -0,0 +1,85 @@ + + */ +class PHPExcel_Writer_OpenDocument_Settings extends PHPExcel_Writer_OpenDocument_WriterPart +{ + /** + * Write settings.xml to XML format + * + * @param PHPExcel $pPHPExcel + * @return string XML Output + * @throws PHPExcel_Writer_Exception + */ + public function write(PHPExcel $pPHPExcel = null) + { + if (!$pPHPExcel) { + $pPHPExcel = $this->getParentWriter()->getPHPExcel(); + } + + $objWriter = null; + if ($this->getParentWriter()->getUseDiskCaching()) { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory()); + } else { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY); + } + + // XML header + $objWriter->startDocument('1.0', 'UTF-8'); + + // Settings + $objWriter->startElement('office:document-settings'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('office:version', '1.2'); + + $objWriter->startElement('office:settings'); + $objWriter->startElement('config:config-item-set'); + $objWriter->writeAttribute('config:name', 'ooo:view-settings'); + $objWriter->startElement('config:config-item-map-indexed'); + $objWriter->writeAttribute('config:name', 'Views'); + $objWriter->endElement(); + $objWriter->endElement(); + $objWriter->startElement('config:config-item-set'); + $objWriter->writeAttribute('config:name', 'ooo:configuration-settings'); + $objWriter->endElement(); + $objWriter->endElement(); + $objWriter->endElement(); + + return $objWriter->getData(); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php new file mode 100644 index 00000000000..d886736328f --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php @@ -0,0 +1,101 @@ + + */ +class PHPExcel_Writer_OpenDocument_Styles extends PHPExcel_Writer_OpenDocument_WriterPart +{ + /** + * Write styles.xml to XML format + * + * @param PHPExcel $pPHPExcel + * @return string XML Output + * @throws PHPExcel_Writer_Exception + */ + public function write(PHPExcel $pPHPExcel = null) + { + if (!$pPHPExcel) { + $pPHPExcel = $this->getParentWriter()->getPHPExcel(); + } + + $objWriter = null; + if ($this->getParentWriter()->getUseDiskCaching()) { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory()); + } else { + $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY); + } + + // XML header + $objWriter->startDocument('1.0', 'UTF-8'); + + // Content + $objWriter->startElement('office:document-styles'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); + $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); + $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); + $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); + $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); + $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); + $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); + $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); + $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); + $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); + $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); + $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); + $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); + $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); + $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); + $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); + $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); + $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); + $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); + $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); + $objWriter->writeAttribute('office:version', '1.2'); + + $objWriter->writeElement('office:font-face-decls'); + $objWriter->writeElement('office:styles'); + $objWriter->writeElement('office:automatic-styles'); + $objWriter->writeElement('office:master-styles'); + $objWriter->endElement(); + + return $objWriter->getData(); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php new file mode 100644 index 00000000000..a7e85c45604 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php @@ -0,0 +1,50 @@ + + */ +class PHPExcel_Writer_OpenDocument_Thumbnails extends PHPExcel_Writer_OpenDocument_WriterPart +{ + /** + * Write Thumbnails/thumbnail.png to PNG format + * + * @param PHPExcel $pPHPExcel + * @return string XML Output + * @throws PHPExcel_Writer_Exception + */ + public function writeThumbnail(PHPExcel $pPHPExcel = null) + { + return ''; + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php new file mode 100644 index 00000000000..e6e713a1b3a --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php @@ -0,0 +1,38 @@ +_renderer, $name), $arguments); } + /** + * {@inheritdoc} + */ + public function save($pFilename = null) + { + $this->_renderer->save($pFilename); + } } diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php index 9ba97efcf22..01e4e0122a8 100644 --- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php @@ -83,6 +83,9 @@ class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHP $printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins(); } + + $orientation = ($orientation == 'L') ? 'landscape' : 'portrait'; + // Override Page Orientation if (!is_null($this->getOrientation())) { $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) @@ -98,7 +101,6 @@ class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHP $paperSize = self::$_paperSizes[$printPaperSize]; } - $orientation = ($orientation == 'L') ? 'landscape' : 'portrait'; // Create PDF $pdf = new DOMPDF(); diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/01simple-download-ods.php b/htdocs/includes/phpoffice/phpexcel/Examples/01simple-download-ods.php new file mode 100644 index 00000000000..574fb0113eb --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/01simple-download-ods.php @@ -0,0 +1,89 @@ +getProperties()->setCreator("Maarten Balliauw") + ->setLastModifiedBy("Maarten Balliauw") + ->setTitle("Office 2007 XLSX Test Document") + ->setSubject("Office 2007 XLSX Test Document") + ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.") + ->setKeywords("office 2007 openxml php") + ->setCategory("Test result file"); + + +// Add some data +$objPHPExcel->setActiveSheetIndex(0) + ->setCellValue('A1', 'Hello') + ->setCellValue('B2', 'world!') + ->setCellValue('C1', 'Hello') + ->setCellValue('D2', 'world!'); + +// Miscellaneous glyphs, UTF-8 +$objPHPExcel->setActiveSheetIndex(0) + ->setCellValue('A4', 'Miscellaneous glyphs') + ->setCellValue('A5', 'éàèùâêîôûëïüÿäöüç'); + +// Rename worksheet +$objPHPExcel->getActiveSheet()->setTitle('Simple'); + + +// Set active sheet index to the first sheet, so Excel opens this as the first sheet +$objPHPExcel->setActiveSheetIndex(0); + + +// Redirect output to a client’s web browser (OpenDocument) +header('Content-Type: application/vnd.oasis.opendocument.spreadsheet'); +header('Content-Disposition: attachment;filename="01simple.ods"'); +header('Cache-Control: max-age=0'); +// If you're serving to IE 9, then the following may be needed +header('Cache-Control: max-age=1'); + +// If you're serving to IE over SSL, then the following may be needed +header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past +header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified +header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1 +header ('Pragma: public'); // HTTP/1.0 + +$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'OpenDocument'); +$objWriter->save('php://output'); +exit; diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/05featuredemo.inc.php b/htdocs/includes/phpoffice/phpexcel/Examples/05featuredemo.inc.php index 00a8b8729b3..b543ca46bb7 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/05featuredemo.inc.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/05featuredemo.inc.php @@ -267,12 +267,13 @@ echo date('H:i:s') , " Unprotect a cell" , EOL; $objPHPExcel->getActiveSheet()->getStyle('B1')->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED); // Add a hyperlink to the sheet -echo date('H:i:s') , " Add a hyperlink to the sheet" , EOL; +echo date('H:i:s') , " Add a hyperlink to an external website" , EOL; $objPHPExcel->getActiveSheet()->setCellValue('E26', 'www.phpexcel.net'); $objPHPExcel->getActiveSheet()->getCell('E26')->getHyperlink()->setUrl('http://www.phpexcel.net'); $objPHPExcel->getActiveSheet()->getCell('E26')->getHyperlink()->setTooltip('Navigate to website'); $objPHPExcel->getActiveSheet()->getStyle('E26')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); +echo date('H:i:s') , " Add a hyperlink to another cell on a different worksheet within the workbook" , EOL; $objPHPExcel->getActiveSheet()->setCellValue('E27', 'Terms and conditions'); $objPHPExcel->getActiveSheet()->getCell('E27')->getHyperlink()->setUrl("sheet://'Terms and conditions'!A1"); $objPHPExcel->getActiveSheet()->getCell('E27')->getHyperlink()->setTooltip('Review terms and conditions'); diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/13calculation.php b/htdocs/includes/phpoffice/phpexcel/Examples/13calculation.php index db149489d59..01e63ea7751 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/13calculation.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/13calculation.php @@ -34,6 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); +mt_srand(1234567890); /** Include PHPExcel */ require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-area.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-area.php index 52ee36b96b9..53fe52398d2 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-area.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-area.php @@ -59,7 +59,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -92,13 +92,13 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_AREACHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_PERCENT_STACKED, // plotGrouping range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues // plotValues ); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, NULL, false); @@ -111,7 +111,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar-stacked.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar-stacked.php index 755fa78ee87..cac29f29f55 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar-stacked.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar-stacked.php @@ -59,7 +59,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -92,7 +92,7 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_BARCHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_STACKED, // plotGrouping range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues // plotValues ); @@ -101,7 +101,7 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_BAR); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -114,7 +114,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar.php index 84f8cf78c43..14fd5d485f9 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-bar.php @@ -59,7 +59,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -92,7 +92,7 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_BARCHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_CLUSTERED, // plotGrouping range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues // plotValues ); @@ -101,7 +101,7 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_BAR); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -114,7 +114,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column-2.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column-2.php index 1d8d689bcdb..00bf0d71b50 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column-2.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column-2.php @@ -67,7 +67,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 'Budget' new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 'Forecast' new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$E$1', NULL, 1), // 'Actual' @@ -100,7 +100,7 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_BARCHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_CLUSTERED, // plotGrouping range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues // plotValues ); @@ -109,7 +109,7 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_COL); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_BOTTOM, NULL, false); @@ -123,7 +123,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs $xAxisLabel, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column.php index eb3d7e21119..ae9c6185e26 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-column.php @@ -59,7 +59,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -92,7 +92,7 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_BARCHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_STANDARD, // plotGrouping range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues // plotValues ); @@ -101,7 +101,7 @@ $series = new PHPExcel_Chart_DataSeries( $series->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_COL); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -114,7 +114,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-composite.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-composite.php index 0b512f09d4c..8ea72126ccb 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-composite.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-composite.php @@ -68,13 +68,13 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels1 = array( +$dataSeriesLabels1 = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // Temperature ); -$dataseriesLabels2 = array( +$dataSeriesLabels2 = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // Rainfall ); -$dataseriesLabels3 = array( +$dataSeriesLabels3 = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // Humidity ); @@ -106,7 +106,7 @@ $series1 = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_BARCHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_CLUSTERED, // plotGrouping range(0, count($dataSeriesValues1)-1), // plotOrder - $dataseriesLabels1, // plotLabel + $dataSeriesLabels1, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues1 // plotValues ); @@ -131,7 +131,7 @@ $series2 = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_LINECHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_STANDARD, // plotGrouping range(0, count($dataSeriesValues2)-1), // plotOrder - $dataseriesLabels2, // plotLabel + $dataSeriesLabels2, // plotLabel NULL, // plotCategory $dataSeriesValues2 // plotValues ); @@ -153,14 +153,14 @@ $series3 = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_AREACHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_STANDARD, // plotGrouping range(0, count($dataSeriesValues2)-1), // plotOrder - $dataseriesLabels3, // plotLabel + $dataSeriesLabels3, // plotLabel NULL, // plotCategory $dataSeriesValues3 // plotValues ); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series1, $series2, $series3)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series1, $series2, $series3)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -172,7 +172,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-line.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-line.php index dce75e06bbf..145ae72e8fd 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-line.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-line.php @@ -59,7 +59,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -92,13 +92,13 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_LINECHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_STACKED, // plotGrouping range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues // plotValues ); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, NULL, false); @@ -111,7 +111,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-multiple-charts.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-multiple-charts.php index 7da2fa289a9..a95c2763323 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-multiple-charts.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-multiple-charts.php @@ -60,7 +60,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels1 = array( +$dataSeriesLabels1 = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -93,13 +93,13 @@ $series1 = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_AREACHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_PERCENT_STACKED, // plotGrouping range(0, count($dataSeriesValues1)-1), // plotOrder - $dataseriesLabels1, // plotLabel + $dataSeriesLabels1, // plotLabel $xAxisTickValues1, // plotCategory $dataSeriesValues1 // plotValues ); // Set the series in the plot area -$plotarea1 = new PHPExcel_Chart_PlotArea(NULL, array($series1)); +$plotArea1 = new PHPExcel_Chart_PlotArea(NULL, array($series1)); // Set the chart legend $legend1 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, NULL, false); @@ -112,7 +112,7 @@ $chart1 = new PHPExcel_Chart( 'chart1', // name $title1, // title $legend1, // legend - $plotarea1, // plotArea + $plotArea1, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel @@ -134,7 +134,7 @@ $objWorksheet->addChart($chart1); // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels2 = array( +$dataSeriesLabels2 = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -167,7 +167,7 @@ $series2 = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_BARCHART, // plotType PHPExcel_Chart_DataSeries::GROUPING_STANDARD, // plotGrouping range(0, count($dataSeriesValues2)-1), // plotOrder - $dataseriesLabels2, // plotLabel + $dataSeriesLabels2, // plotLabel $xAxisTickValues2, // plotCategory $dataSeriesValues2 // plotValues ); @@ -176,7 +176,7 @@ $series2 = new PHPExcel_Chart_DataSeries( $series2->setPlotDirection(PHPExcel_Chart_DataSeries::DIRECTION_COL); // Set the series in the plot area -$plotarea2 = new PHPExcel_Chart_PlotArea(NULL, array($series2)); +$plotArea2 = new PHPExcel_Chart_PlotArea(NULL, array($series2)); // Set the chart legend $legend2 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -189,7 +189,7 @@ $chart2 = new PHPExcel_Chart( 'chart2', // name $title2, // title $legend2, // legend - $plotarea2, // plotArea + $plotArea2, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-pie.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-pie.php index 1a4f1df4a25..5af02905bfc 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-pie.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-pie.php @@ -60,7 +60,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels1 = array( +$dataSeriesLabels1 = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 ); // Set the X-Axis Labels @@ -87,9 +87,9 @@ $dataSeriesValues1 = array( // Build the dataseries $series1 = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_PIECHART, // plotType - PHPExcel_Chart_DataSeries::GROUPING_STANDARD, // plotGrouping + NULL, // plotGrouping (Pie charts don't have any grouping) range(0, count($dataSeriesValues1)-1), // plotOrder - $dataseriesLabels1, // plotLabel + $dataSeriesLabels1, // plotLabel $xAxisTickValues1, // plotCategory $dataSeriesValues1 // plotValues ); @@ -100,7 +100,7 @@ $layout1->setShowVal(TRUE); $layout1->setShowPercent(TRUE); // Set the series in the plot area -$plotarea1 = new PHPExcel_Chart_PlotArea($layout1, array($series1)); +$plotArea1 = new PHPExcel_Chart_PlotArea($layout1, array($series1)); // Set the chart legend $legend1 = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -112,7 +112,7 @@ $chart1 = new PHPExcel_Chart( 'chart1', // name $title1, // title $legend1, // legend - $plotarea1, // plotArea + $plotArea1, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel @@ -134,7 +134,7 @@ $objWorksheet->addChart($chart1); // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels2 = array( +$dataSeriesLabels2 = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 ); // Set the X-Axis Labels @@ -161,9 +161,9 @@ $dataSeriesValues2 = array( // Build the dataseries $series2 = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_DONUTCHART, // plotType - PHPExcel_Chart_DataSeries::GROUPING_STANDARD, // plotGrouping + NULL, // plotGrouping (Donut charts don't have any grouping) range(0, count($dataSeriesValues2)-1), // plotOrder - $dataseriesLabels2, // plotLabel + $dataSeriesLabels2, // plotLabel $xAxisTickValues2, // plotCategory $dataSeriesValues2 // plotValues ); @@ -174,7 +174,7 @@ $layout2->setShowVal(TRUE); $layout2->setShowCatName(TRUE); // Set the series in the plot area -$plotarea2 = new PHPExcel_Chart_PlotArea($layout2, array($series2)); +$plotArea2 = new PHPExcel_Chart_PlotArea($layout2, array($series2)); $title2 = new PHPExcel_Chart_Title('Test Donut Chart'); @@ -184,7 +184,7 @@ $chart2 = new PHPExcel_Chart( 'chart2', // name $title2, // title NULL, // legend - $plotarea2, // plotArea + $plotArea2, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-radar.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-radar.php index 29fb2200ff5..b8b427f3b12 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-radar.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-radar.php @@ -68,7 +68,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 ); @@ -98,9 +98,9 @@ $dataSeriesValues = array( // Build the dataseries $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_RADARCHART, // plotType - NULL, // plotGrouping + NULL, // plotGrouping (Radar charts don't have any grouping) range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues, // plotValues NULL, // smooth line @@ -111,7 +111,7 @@ $series = new PHPExcel_Chart_DataSeries( $layout = new PHPExcel_Chart_Layout(); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea($layout, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea($layout, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -123,7 +123,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-scatter.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-scatter.php index 53851ad46c0..250c61d7e4c 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-scatter.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-scatter.php @@ -59,7 +59,7 @@ $objWorksheet->fromArray( // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), // 2010 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011 new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012 @@ -86,7 +86,7 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART, // plotType NULL, // plotGrouping (Scatter charts don't have any grouping) range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues, // plotValues NULL, // smooth line @@ -94,7 +94,7 @@ $series = new PHPExcel_Chart_DataSeries( ); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_TOPRIGHT, NULL, false); @@ -107,7 +107,7 @@ $chart = new PHPExcel_Chart( 'chart1', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs NULL, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-stock.php b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-stock.php index dfc8d5cdd97..b38fd518153 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-stock.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/33chartcreate-stock.php @@ -62,7 +62,7 @@ $objWorksheet->getStyle('B2:E6')->getNumberFormat()->setFormatCode(PHPExcel_Styl // Number of datapoints in series // Data values // Data Marker -$dataseriesLabels = array( +$dataSeriesLabels = array( new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1), //Max / Open new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), //Min / Close new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), //Min Threshold / Min @@ -97,13 +97,13 @@ $series = new PHPExcel_Chart_DataSeries( PHPExcel_Chart_DataSeries::TYPE_STOCKCHART, // plotType null, // plotGrouping - if we set this to not null, then xlsx throws error range(0, count($dataSeriesValues)-1), // plotOrder - $dataseriesLabels, // plotLabel + $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues // plotValues ); // Set the series in the plot area -$plotarea = new PHPExcel_Chart_PlotArea(NULL, array($series)); +$plotArea = new PHPExcel_Chart_PlotArea(NULL, array($series)); // Set the chart legend $legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, NULL, false); @@ -116,7 +116,7 @@ $chart = new PHPExcel_Chart( 'stock-chart', // name $title, // title $legend, // legend - $plotarea, // plotArea + $plotArea, // plotArea true, // plotVisibleOnly 0, // displayBlanksAs $xAxisLabel, // xAxisLabel diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/34chartupdate.php b/htdocs/includes/phpoffice/phpexcel/Examples/34chartupdate.php index 84f8a922174..cb586a31867 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/34chartupdate.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/34chartupdate.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -include '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; if (!file_exists("33chartcreate-bar.xlsx")) { exit("Please run 33chartcreate-bar.php first." . EOL); diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/35chartrender.php b/htdocs/includes/phpoffice/phpexcel/Examples/35chartrender.php index 710cddb49a5..f0e79636b11 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/35chartrender.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/35chartrender.php @@ -46,7 +46,7 @@ include 'PHPExcel/IOFactory.php'; // Change these values to select the Rendering library that you wish to use // and its directory location on your server $rendererName = PHPExcel_Settings::CHART_RENDERER_JPGRAPH; -$rendererLibrary = 'jpgraph3.5.0b1/src'; +$rendererLibrary = 'jpgraph3.5.0b1/src/'; $rendererLibraryPath = '/php/libraries/Charts/' . $rendererLibrary; diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/39dropdown.php b/htdocs/includes/phpoffice/phpexcel/Examples/39dropdown.php new file mode 100644 index 00000000000..5dadc09922f --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/39dropdown.php @@ -0,0 +1,175 @@ +'); + +/** Include PHPExcel */ +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; + + +// Create new PHPExcel object +echo date('H:i:s') , " Create new PHPExcel object" , EOL; +$objPHPExcel = new PHPExcel(); + +// Set document properties +echo date('H:i:s') , " Set document properties" , EOL; +$objPHPExcel->getProperties() + ->setCreator("PHPOffice") + ->setLastModifiedBy("PHPOffice") + ->setTitle("PHPExcel Test Document") + ->setSubject("PHPExcel Test Document") + ->setDescription("Test document for PHPExcel, generated using PHP classes.") + ->setKeywords("Office PHPExcel php") + ->setCategory("Test result file"); + + +function transpose($value) { + return array($value); +} + +// Add some data +$continentColumn = 'D'; +$column = 'F'; + +// Set data for dropdowns +foreach(glob('./data/continents/*') as $key => $filename) { + $continent = pathinfo($filename, PATHINFO_FILENAME); + echo "Loading $continent", EOL; + $continent = str_replace(' ','_',$continent); + $countries = file($filename, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); + $countryCount = count($countries); + + // Transpose $countries from a row to a column array + $countries = array_map('transpose', $countries); + $objPHPExcel->getActiveSheet() + ->fromArray($countries, null, $column . '1'); + $objPHPExcel->addNamedRange( + new PHPExcel_NamedRange( + $continent, + $objPHPExcel->getActiveSheet(), $column . '1:' . $column . $countryCount + ) + ); + $objPHPExcel->getActiveSheet() + ->getColumnDimension($column) + ->setVisible(false); + + $objPHPExcel->getActiveSheet() + ->setCellValue($continentColumn . ($key+1), $continent); + + ++$column; +} + +// Hide the dropdown data +$objPHPExcel->getActiveSheet() + ->getColumnDimension($continentColumn) + ->setVisible(false); + +$objPHPExcel->addNamedRange( + new PHPExcel_NamedRange( + 'Continents', + $objPHPExcel->getActiveSheet(), $continentColumn . '1:' . $continentColumn . ($key+1) + ) +); + + +// Set selection cells +$objPHPExcel->getActiveSheet() + ->setCellValue('A1', 'Continent:'); +$objPHPExcel->getActiveSheet() + ->setCellValue('B1', 'Select continent'); +$objPHPExcel->getActiveSheet() + ->setCellValue('B3', '=' . $column . 1); +$objPHPExcel->getActiveSheet() + ->setCellValue('B3', 'Select country'); +$objPHPExcel->getActiveSheet() + ->getStyle('A1:A3') + ->getFont()->setBold(true); + +// Set linked validators +$objValidation = $objPHPExcel->getActiveSheet() + ->getCell('B1') + ->getDataValidation(); +$objValidation->setType( PHPExcel_Cell_DataValidation::TYPE_LIST ) + ->setErrorStyle( PHPExcel_Cell_DataValidation::STYLE_INFORMATION ) + ->setAllowBlank(false) + ->setShowInputMessage(true) + ->setShowErrorMessage(true) + ->setShowDropDown(true) + ->setErrorTitle('Input error') + ->setError('Continent is not in the list.') + ->setPromptTitle('Pick from the list') + ->setPrompt('Please pick a continent from the drop-down list.') + ->setFormula1('=Continents'); + +$objPHPExcel->getActiveSheet() + ->setCellValue('A3', 'Country:'); +$objPHPExcel->getActiveSheet() + ->getStyle('A3') + ->getFont()->setBold(true); + +$objValidation = $objPHPExcel->getActiveSheet() + ->getCell('B3') + ->getDataValidation(); +$objValidation->setType( PHPExcel_Cell_DataValidation::TYPE_LIST ) + ->setErrorStyle( PHPExcel_Cell_DataValidation::STYLE_INFORMATION ) + ->setAllowBlank(false) + ->setShowInputMessage(true) + ->setShowErrorMessage(true) + ->setShowDropDown(true) + ->setErrorTitle('Input error') + ->setError('Country is not in the list.') + ->setPromptTitle('Pick from the list') + ->setPrompt('Please pick a country from the drop-down list.') + ->setFormula1('=INDIRECT($B$1)'); + + +$objPHPExcel->getActiveSheet()->getColumnDimension('A')->setWidth(12); +$objPHPExcel->getActiveSheet()->getColumnDimension('B')->setWidth(30); + + +// Set active sheet index to the first sheet, so Excel opens this as the first sheet +$objPHPExcel->setActiveSheetIndex(0); + +// Save Excel 2007 file +// This linked validation list method only seems to work for Excel2007, not for Excel5 +echo date('H:i:s') , " Write to Excel2007 format" , EOL; +$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007'); +$objWriter->save(str_replace('.php', '.xlsx', __FILE__)); +echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL; + +// Echo memory peak usage +echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL; + +// Echo done +echo date('H:i:s') , " Done writing files" , EOL; +echo 'Files have been created in ' , getcwd() , EOL; diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/41password.php b/htdocs/includes/phpoffice/phpexcel/Examples/41password.php new file mode 100644 index 00000000000..7b03e4f9a1f --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/41password.php @@ -0,0 +1,84 @@ +'); + +date_default_timezone_set('Europe/London'); + +include "05featuredemo.inc.php"; + +/** Include PHPExcel_IOFactory */ +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; + + +// Set password against the spreadsheet file +$objPHPExcel->getSecurity()->setLockWindows(true); +$objPHPExcel->getSecurity()->setLockStructure(true); +$objPHPExcel->getSecurity()->setWorkbookPassword('secret'); + + +// Save Excel 2007 file +echo date('H:i:s') , " Write to Excel2007 format" , EOL; +$callStartTime = microtime(true); + +$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007'); +$objWriter->save(str_replace('.php', '.xlsx', __FILE__)); +$callEndTime = microtime(true); +$callTime = $callEndTime - $callStartTime; + +echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL; +echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL; +// Echo memory usage +echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL; + + +// Save Excel 95 file +echo date('H:i:s') , " Write to Excel5 format" , EOL; +$callStartTime = microtime(true); + +$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); +$objWriter->save(str_replace('.php', '.xls', __FILE__)); +$callEndTime = microtime(true); +$callTime = $callEndTime - $callStartTime; + +echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL; +echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL; +// Echo memory usage +echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL; + + +// Echo memory peak usage +echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL; + +// Echo done +echo date('H:i:s') , " Done writing files" , EOL; +echo 'Files have been created in ' , getcwd() , EOL; diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/42richText.php b/htdocs/includes/phpoffice/phpexcel/Examples/42richText.php new file mode 100644 index 00000000000..4e99b853544 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/42richText.php @@ -0,0 +1,159 @@ +'); + +/** Include PHPExcel */ +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; + + +// Create new PHPExcel object +echo date('H:i:s') , " Create new PHPExcel object" , EOL; +$objPHPExcel = new PHPExcel(); + +// Set document properties +echo date('H:i:s') , " Set document properties" , EOL; +$objPHPExcel->getProperties()->setCreator("Maarten Balliauw") + ->setLastModifiedBy("Maarten Balliauw") + ->setTitle("PHPExcel Test Document") + ->setSubject("PHPExcel Test Document") + ->setDescription("Test document for PHPExcel, generated using PHP classes.") + ->setKeywords("office PHPExcel php") + ->setCategory("Test result file"); + + +// Add some data +echo date('H:i:s') , " Add some data" , EOL; + +$html1=' +

My very first example of rich text
generated from html markup

+

+ +This block contains an italicized word; +while this block uses an underline. + +

+

+I want to eat healthy foodpizza. + +'; + +$html2='

+ + 100°C is a hot temperature + +
+ + 10°F is cold + +

'; + +$html3='23 equals 8'; + +$html4='H2SO4 is the chemical formula for Sulphuric acid'; + + +$wizard = new PHPExcel_Helper_HTML; +$richText = $wizard->toRichTextObject($html1); + +$objPHPExcel->setActiveSheetIndex(0) + ->setCellValue('A1', $richText); + +$objPHPExcel->getActiveSheet()->getColumnDimension('A')->setWidth(48); +$objPHPExcel->getActiveSheet()->getRowDimension(1)->setRowHeight(-1); +$objPHPExcel->getActiveSheet()->getStyle('A1') + ->getAlignment() + ->setWrapText(true); + +$richText = $wizard->toRichTextObject($html2); + +$objPHPExcel->setActiveSheetIndex(0) + ->setCellValue('A2', $richText); + +$objPHPExcel->getActiveSheet()->getRowDimension(1)->setRowHeight(-1); +$objPHPExcel->getActiveSheet()->getStyle('A2') + ->getAlignment() + ->setWrapText(true); + +$objPHPExcel->setActiveSheetIndex(0) + ->setCellValue('A3', $wizard->toRichTextObject($html3)); + +$objPHPExcel->setActiveSheetIndex(0) + ->setCellValue('A4', $wizard->toRichTextObject($html4)); + + +// Rename worksheet +echo date('H:i:s') , " Rename worksheet" , EOL; +$objPHPExcel->getActiveSheet()->setTitle('Simple'); + + +// Set active sheet index to the first sheet, so Excel opens this as the first sheet +$objPHPExcel->setActiveSheetIndex(0); + + +// Save Excel 2007 file +echo date('H:i:s') , " Write to Excel2007 format" , EOL; +$callStartTime = microtime(true); + +$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007'); +$objWriter->save(str_replace('.php', '.xlsx', __FILE__)); +$callEndTime = microtime(true); +$callTime = $callEndTime - $callStartTime; + +echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL; +echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL; +// Echo memory usage +echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL; + + +// Save Excel 95 file +echo date('H:i:s') , " Write to Excel5 format" , EOL; +$callStartTime = microtime(true); + +$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); +$objWriter->save(str_replace('.php', '.xls', __FILE__)); +$callEndTime = microtime(true); +$callTime = $callEndTime - $callStartTime; + +echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL; +echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL; +// Echo memory usage +echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL; + + +// Echo memory peak usage +echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL; + +// Echo done +echo date('H:i:s') , " Done writing files" , EOL; +echo 'Files have been created in ' , getcwd() , EOL; diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Africa.txt b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Africa.txt new file mode 100644 index 00000000000..407fa769aa3 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Africa.txt @@ -0,0 +1,54 @@ +Algeria +Angola +Benin +Botswana +Burkina +Burundi +Cameroon +Cape Verde +Central African Republic +Chad +Comoros +Congo +Congo, Democratic Republic of +Djibouti +Egypt +Equatorial Guinea +Eritrea +Ethiopia +Gabon +Gambia +Ghana +Guinea +Guinea-Bissau +Ivory Coast +Kenya +Lesotho +Liberia +Libya +Madagascar +Malawi +Mali +Mauritania +Mauritius +Morocco +Mozambique +Namibia +Niger +Nigeria +Rwanda +Sao Tome and Principe +Senegal +Seychelles +Sierra Leone +Somalia +South Africa +South Sudan +Sudan +Swaziland +Tanzania +Togo +Tunisia +Uganda +Zambia +Zimbabwe diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Asia.txt b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Asia.txt new file mode 100644 index 00000000000..9ce006c53c8 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Asia.txt @@ -0,0 +1,44 @@ +Afghanistan +Bahrain +Bangladesh +Bhutan +Brunei +Burma (Myanmar) +Cambodia +China +East Timor +India +Indonesia +Iran +Iraq +Israel +Japan +Jordan +Kazakhstan +Korea, North +Korea, South +Kuwait +Kyrgyzstan +Laos +Lebanon +Malaysia +Maldives +Mongolia +Nepal +Oman +Pakistan +Philippines +Qatar +Russian Federation +Saudi Arabia +Singapore +Sri Lanka +Syria +Tajikistan +Thailand +Turkey +Turkmenistan +United Arab Emirates +Uzbekistan +Vietnam +Yemen diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Europe.txt b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Europe.txt new file mode 100644 index 00000000000..70c11607ab9 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Europe.txt @@ -0,0 +1,47 @@ +Albania +Andorra +Armenia +Austria +Azerbaijan +Belarus +Belgium +Bosnia and Herzegovina +Bulgaria +Croatia +Cyprus +Czech Republic +Denmark +Estonia +Finland +France +Georgia +Germany +Greece +Hungary +Iceland +Ireland +Italy +Latvia +Liechtenstein +Lithuania +Luxembourg +Macedonia +Malta +Moldova +Monaco +Montenegro +Netherlands +Norway +Poland +Portugal +Romania +San Marino +Serbia +Slovakia +Slovenia +Spain +Sweden +Switzerland +Ukraine +United Kingdom +Vatican City diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/North America.txt b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/North America.txt new file mode 100644 index 00000000000..5881ae132ab --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/North America.txt @@ -0,0 +1,23 @@ +Antigua and Barbuda +Bahamas +Barbados +Belize +Canada +Costa Rica +Cuba +Dominica +Dominican Republic +El Salvador +Grenada +Guatemala +Haiti +Honduras +Jamaica +Mexico +Nicaragua +Panama +Saint Kitts and Nevis +Saint Lucia +Saint Vincent and the Grenadines +Trinidad and Tobago +United States diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Oceania.txt b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Oceania.txt new file mode 100644 index 00000000000..cbdc896c1ca --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/Oceania.txt @@ -0,0 +1,14 @@ +Australia +Fiji +Kiribati +Marshall Islands +Micronesia +Nauru +New Zealand +Palau +Papua New Guinea +Samoa +Solomon Islands +Tonga +Tuvalu +Vanuatu diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/South America.txt b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/South America.txt new file mode 100644 index 00000000000..777ffbfb94b --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/Examples/data/continents/South America.txt @@ -0,0 +1,12 @@ +Argentina +Bolivia +Brazil +Chile +Colombia +Ecuador +Guyana +Paraguay +Peru +Suriname +Uruguay +Venezuela diff --git a/htdocs/includes/phpoffice/phpexcel/Examples/runall.php b/htdocs/includes/phpoffice/phpexcel/Examples/runall.php index 395e83e248b..b2af1ccd0be 100644 --- a/htdocs/includes/phpoffice/phpexcel/Examples/runall.php +++ b/htdocs/includes/phpoffice/phpexcel/Examples/runall.php @@ -59,6 +59,7 @@ $aTests = array( , '11documentsecurity-xls.php' , '12cellProtection.php' , '13calculation.php' + , '13calculationCyclicFormulae.php' , '14excel5.php' , '15datavalidation.php' , '15datavalidation-xls.php' @@ -97,7 +98,10 @@ $aTests = array( , '36chartreadwritePDF.php' , '37page_layout_view.php' , '38cloneWorksheet.php' + , '39dropdown.php' , '40duplicateStyle.php' + , '41password.php' + , '42richText.php' , 'OOCalcReader.php' , 'OOCalcReaderPCLZip.php' , 'SylkReader.php' @@ -106,7 +110,7 @@ $aTests = array( , 'GnumericReader.php' ); -// First, clear all results +// First, clear all previous run results foreach ($aTests as $sTest) { @unlink( str_replace('.php', '.xls', $sTest) ); @unlink( str_replace('.php', '.xlsx', $sTest) ); diff --git a/htdocs/includes/phpoffice/phpexcel/changelog.txt b/htdocs/includes/phpoffice/phpexcel/changelog.txt index 3177106f5ea..29377308d80 100644 --- a/htdocs/includes/phpoffice/phpexcel/changelog.txt +++ b/htdocs/includes/phpoffice/phpexcel/changelog.txt @@ -19,11 +19,49 @@ * * @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL -* @version ##VERSION##, ##DATE## +* @version 1.8.1, 2015-04-30 ************************************************************************************** +2015-04-30 (v1.8.1): +- Bugfix: (goncons) Work Item GH-397 - Fix for Writing an Open Document cell with non-numeric formula +- Bugfix: (sarciszewski) Work Item GH-329 - Avoid potential divide by zero in basedrawing +- Bugfix: (ymaerschalck) Work Item GH-405 - XML External Entity (XXE) Processing, different behaviour between simplexml_load_string() and simplexml_load_file(). +- Bugfix: (MBaker) - Fix to ensure that current cell is maintained when executing formula calculations +- Bugfix: (MBaker) Work Item GH-350 - Keep/set the value on Reader _loadSheetsOnly as NULL, courtesy of Restless-ET +- Bugfix: (MBaker) Work Item CP18105 - Loading an Excel 2007 spreadsheet throws an "Autofilter must be set on a range of cells" exception +- Bugfix: (MBaker) Work Item GH-388 - Fix to autoloader registration for backward compatibility with PHP 5.2.0 not accepting the prepend flag +- Bugfix: (MBaker) Work Item GH-384 - DOM loadHTMLFile() failing with options flags when using PHP < 5.4.0 +- Bugfix: (MBaker) - Fix for percentage operator in formulae for BIFF Writer +- Bugfix: (MBaker) - Fix to getStyle() call for cell object +- Bugfix: (MBaker) - Discard Autofilters in Excel2007 Reader when filter range isn't a valid range +- Bugfix: (frozenstupidity) Work Item GH-423 - Fix invalid NA return in VLOOKUP +- Bugfix: (wiseloren) Work Item CP21454 - "No Impact" conditional formatting fix for NumberFormat +- Bugfix: (bobwitlox) Work Item GH-467 - Bug in Excel2003XML reader, parsing merged cells +- Bugfix: (MBaker) Work Item GH-302 - Fix for CEIL() and FLOOR() when number argument is zero +- Bugfix: (MBaker) - Remove cells cleanly when calling RemoveRow() or RemoveColumn() +- General: (MBaker) - Small performance improvement for autosize columns +- General: (frost-nzcr4) Work Item GH-379 - Change the getter/setter for zeroHeight to camel case +- General: (MBaker) Work Item GH-394 - DefaultValueBinder is too much aggressive when converting string to numeric +- General: (MBaker) - Default precalculate formulas to false for writers +- General: (MBaker) - Set default Cyclic Reference behaviour to 1 to eliminate exception when using a single cyclic iteration in formulae +- General: (MBaker) Work Item GH-396 - Some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE +- Feature: (WiktrzGE) Work Item GH-404 - Methods to manage most of the existing options for Chart Axis, Major Grid-lines and Minor Grid-lines +- Feature: (frost-nzcr4) Work Item GH-403 - ODS read/write comments in the cell +- Feature: (CQD) Work Item GH-389 - Additional Mac CJK codepage definitions +- Feature: (bolovincev) Work Item GH-269 - Update Worksheet.php getStyleByColumnAndRow() to allow a range of cells rather than just a single cell +- Feature: (MBaker) - New methods added for testing cell status within merge groups +- Feature: (cifren/MBaker) Work Item GH-205 - Handling merge cells in HTML Reader +- Feature: (MBaker) - Helper to convert basic HTML markup to a Rich Text object +- Feature: (MBaker) - Improved Iterators + New Column Iterator + Support for row and column ranges + Improved handling for next/prev +- Security: (MBaker) - XML filescan in XML-based Readers to prevent XML Entity Expansion (XEE) + (see http://projects.webappsec.org/w/page/13247002/XML%20Entity%20Expansion for an explanation of XEE injection) attacks + Reference CVE-2015-3542 - Identification of problem courtesy of Dawid Golunski (Pentest Ltd.) -2014-03-02 (v1.8.0): + + 2014-03-02 (v1.8.0): - Bugfix: (MBaker) Work item CP19830 - Undefined variable: fileHandle in CSV Reader - Bugfix: (MBaker) Work item CP19968 - Out of memory in style/supervisor.php - Bugfix: (MBaker) - Style error with merged cells in PDF Writer diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/DateTimeTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/DateTimeTest.php index 57692a34167..d4bdc5abff2 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/DateTimeTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/DateTimeTest.php @@ -13,6 +13,8 @@ class DateTimeTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } /** diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/EngineeringTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/EngineeringTest.php index 647da09f40c..1f511ffacc0 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/EngineeringTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/EngineeringTest.php @@ -17,6 +17,8 @@ class EngineeringTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } /** diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FinancialTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FinancialTest.php index b27a6a7dfa7..f5689c95048 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FinancialTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FinancialTest.php @@ -13,6 +13,8 @@ class FinancialTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } /** diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FunctionsTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FunctionsTest.php index 5e6ef962a42..013332940ff 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FunctionsTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/FunctionsTest.php @@ -13,6 +13,8 @@ class FunctionsTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } public function testDUMMY() diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LogicalTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LogicalTest.php index 46749d12c51..cc8f8b33383 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LogicalTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LogicalTest.php @@ -13,6 +13,8 @@ class LogicalTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } public function testTRUE() diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LookupRefTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LookupRefTest.php index 454422a1534..6450b082244 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LookupRefTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/LookupRefTest.php @@ -13,6 +13,8 @@ class LookupRefTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } /** diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/MathTrigTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/MathTrigTest.php index e3d8c9d985b..0059ed08e6c 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/MathTrigTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/MathTrigTest.php @@ -13,6 +13,8 @@ class MathTrigTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } /** diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/TextDataTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/TextDataTest.php index 717e8fefbd0..4b1caf5179d 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/TextDataTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Calculation/TextDataTest.php @@ -13,6 +13,8 @@ class TextDataTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } /** @@ -340,4 +342,24 @@ class TextDataTest extends PHPUnit_Framework_TestCase return new testDataFileIterator('rawTestData/Calculation/TextData/TEXT.data'); } + /** + * @dataProvider providerVALUE + */ + public function testVALUE() + { + call_user_func(array('PHPExcel_Shared_String','setDecimalSeparator'),'.'); + call_user_func(array('PHPExcel_Shared_String','setThousandsSeparator'),' '); + call_user_func(array('PHPExcel_Shared_String','setCurrencyCode'),'$'); + + $args = func_get_args(); + $expectedResult = array_pop($args); + $result = call_user_func_array(array('PHPExcel_Calculation_TextData','VALUE'),$args); + $this->assertEquals($expectedResult, $result, NULL, 1E-8); + } + + public function providerVALUE() + { + return new testDataFileIterator('rawTestData/Calculation/TextData/VALUE.data'); + } + } diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/CalculationTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/CalculationTest.php index 8f8ce7e0a77..1de827ca815 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/CalculationTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/CalculationTest.php @@ -11,6 +11,8 @@ class CalculationTest extends PHPUnit_Framework_TestCase define('PHPEXCEL_ROOT', APPLICATION_PATH . '/'); } require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); + + PHPExcel_Calculation_Functions::setCompatibilityMode(PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL); } /** diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Cell/DefaultValueBinderTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Cell/DefaultValueBinderTest.php new file mode 100644 index 00000000000..1c74d96f6f8 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Cell/DefaultValueBinderTest.php @@ -0,0 +1,85 @@ +cellStub = $this->getMockBuilder('PHPExcel_Cell') + ->disableOriginalConstructor() + ->getMock(); + // Configure the stub. + $this->cellStub->expects($this->any()) + ->method('setValueExplicit') + ->will($this->returnValue(true)); + + } + + /** + * @dataProvider binderProvider + */ + public function testBindValue($value) + { + $this->createCellStub(); + $binder = new PHPExcel_Cell_DefaultValueBinder(); + $result = $binder->bindValue($this->cellStub, $value); + $this->assertTrue($result); + } + + public function binderProvider() + { + return array( + array(null), + array(''), + array('ABC'), + array('=SUM(A1:B2)'), + array(true), + array(false), + array(123), + array(-123.456), + array('123'), + array('-123.456'), + array('#REF!'), + array(new DateTime()), + ); + } + + /** + * @dataProvider providerDataTypeForValue + */ + public function testDataTypeForValue() + { + $args = func_get_args(); + $expectedResult = array_pop($args); + $result = call_user_func_array(array('PHPExcel_Cell_DefaultValueBinder','dataTypeForValue'), $args); + $this->assertEquals($expectedResult, $result); + } + + public function providerDataTypeForValue() + { + return new testDataFileIterator('rawTestData/Cell/DefaultValueBinder.data'); + } + + public function testDataTypeForRichTextObject() + { + $objRichText = new PHPExcel_RichText(); + $objRichText->createText('Hello World'); + + $expectedResult = PHPExcel_Cell_DataType::TYPE_INLINE; + $result = call_user_func(array('PHPExcel_Cell_DefaultValueBinder','dataTypeForValue'), $objRichText); + $this->assertEquals($expectedResult, $result); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Reader/XEEValidatorTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Reader/XEEValidatorTest.php new file mode 100644 index 00000000000..f635dbb8764 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Reader/XEEValidatorTest.php @@ -0,0 +1,55 @@ +getMockForAbstractClass('PHPExcel_Reader_Abstract'); + $expectedResult = 'FAILURE: Should throw an Exception rather than return a value'; + $result = $reader->securityScanFile($filename); + $this->assertEquals($expectedResult, $result); + } + + public function providerInvalidXML() + { + $tests = []; + foreach(glob('rawTestData/Reader/XEETestInvalid*.xml') as $file) { + $tests[] = [realpath($file), true]; + } + return $tests; + } + + /** + * @dataProvider providerValidXML + */ + public function testValidXML($filename, $expectedResult) + { + $reader = $this->getMockForAbstractClass('PHPExcel_Reader_Abstract'); + $result = $reader->securityScanFile($filename); + $this->assertEquals($expectedResult, $result); + } + + public function providerValidXML() + { + $tests = []; + foreach(glob('rawTestData/Reader/XEETestValid*.xml') as $file) { + $tests[] = [realpath($file), file_get_contents($file)]; + } + return $tests; + } + +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/AutoFilter/ColumnTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/AutoFilter/ColumnTest.php index c8411f5e369..3c1821bad9b 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/AutoFilter/ColumnTest.php +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/AutoFilter/ColumnTest.php @@ -1,7 +1,7 @@ mockCell = $this->getMockBuilder('PHPExcel_Cell') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet = $this->getMockBuilder('PHPExcel_Worksheet') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet->expects($this->any()) + ->method('getHighestRow') + ->will($this->returnValue(5)); + $this->mockWorksheet->expects($this->any()) + ->method('getCellByColumnAndRow') + ->will($this->returnValue($this->mockCell)); + } + + + public function testIteratorFullRange() + { + $iterator = new PHPExcel_Worksheet_ColumnCellIterator($this->mockWorksheet, 'A'); + $ColumnCellIndexResult = 1; + $this->assertEquals($ColumnCellIndexResult, $iterator->key()); + + foreach($iterator as $key => $ColumnCell) { + $this->assertEquals($ColumnCellIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Cell', $ColumnCell); + } + } + + public function testIteratorStartEndRange() + { + $iterator = new PHPExcel_Worksheet_ColumnCellIterator($this->mockWorksheet, 'A', 2, 4); + $ColumnCellIndexResult = 2; + $this->assertEquals($ColumnCellIndexResult, $iterator->key()); + + foreach($iterator as $key => $ColumnCell) { + $this->assertEquals($ColumnCellIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Cell', $ColumnCell); + } + } + + public function testIteratorSeekAndPrev() + { + $iterator = new PHPExcel_Worksheet_ColumnCellIterator($this->mockWorksheet, 'A', 2, 4); + $columnIndexResult = 4; + $iterator->seek(4); + $this->assertEquals($columnIndexResult, $iterator->key()); + + for($i = 1; $i < $columnIndexResult-1; $i++) { + $iterator->prev(); + $this->assertEquals($columnIndexResult - $i, $iterator->key()); + } + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testSeekOutOfRange() + { + $iterator = new PHPExcel_Worksheet_ColumnCellIterator($this->mockWorksheet, 'A', 2, 4); + $iterator->seek(1); + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testPrevOutOfRange() + { + $iterator = new PHPExcel_Worksheet_ColumnCellIterator($this->mockWorksheet, 'A', 2, 4); + $iterator->prev(); + } + +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/ColumnIteratorTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/ColumnIteratorTest.php new file mode 100644 index 00000000000..7d78b61791d --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/ColumnIteratorTest.php @@ -0,0 +1,89 @@ +mockColumn = $this->getMockBuilder('PHPExcel_Worksheet_Column') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet = $this->getMockBuilder('PHPExcel_Worksheet') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet->expects($this->any()) + ->method('getHighestColumn') + ->will($this->returnValue('E')); + $this->mockWorksheet->expects($this->any()) + ->method('current') + ->will($this->returnValue($this->mockColumn)); + } + + + public function testIteratorFullRange() + { + $iterator = new PHPExcel_Worksheet_ColumnIterator($this->mockWorksheet); + $columnIndexResult = 'A'; + $this->assertEquals($columnIndexResult, $iterator->key()); + + foreach($iterator as $key => $column) { + $this->assertEquals($columnIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Worksheet_Column', $column); + } + } + + public function testIteratorStartEndRange() + { + $iterator = new PHPExcel_Worksheet_ColumnIterator($this->mockWorksheet, 'B', 'D'); + $columnIndexResult = 'B'; + $this->assertEquals($columnIndexResult, $iterator->key()); + + foreach($iterator as $key => $column) { + $this->assertEquals($columnIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Worksheet_Column', $column); + } + } + + public function testIteratorSeekAndPrev() + { + $ranges = range('A','E'); + $iterator = new PHPExcel_Worksheet_ColumnIterator($this->mockWorksheet, 'B', 'D'); + $columnIndexResult = 'D'; + $iterator->seek('D'); + $this->assertEquals($columnIndexResult, $iterator->key()); + + for($i = 1; $i < array_search($columnIndexResult, $ranges); $i++) { + $iterator->prev(); + $expectedResult = $ranges[array_search($columnIndexResult, $ranges) - $i]; + $this->assertEquals($expectedResult, $iterator->key()); + } + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testSeekOutOfRange() + { + $iterator = new PHPExcel_Worksheet_ColumnIterator($this->mockWorksheet, 'B', 'D'); + $iterator->seek('A'); + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testPrevOutOfRange() + { + $iterator = new PHPExcel_Worksheet_ColumnIterator($this->mockWorksheet, 'B', 'D'); + $iterator->prev(); + } + +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/RowCellIteratorTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/RowCellIteratorTest.php new file mode 100644 index 00000000000..cdd3c84d4bd --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/RowCellIteratorTest.php @@ -0,0 +1,89 @@ +mockCell = $this->getMockBuilder('PHPExcel_Cell') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet = $this->getMockBuilder('PHPExcel_Worksheet') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet->expects($this->any()) + ->method('getHighestColumn') + ->will($this->returnValue('E')); + $this->mockWorksheet->expects($this->any()) + ->method('getCellByColumnAndRow') + ->will($this->returnValue($this->mockCell)); + } + + + public function testIteratorFullRange() + { + $iterator = new PHPExcel_Worksheet_RowCellIterator($this->mockWorksheet); + $RowCellIndexResult = 'A'; + $this->assertEquals($RowCellIndexResult, $iterator->key()); + + foreach($iterator as $key => $RowCell) { + $this->assertEquals($RowCellIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Cell', $RowCell); + } + } + + public function testIteratorStartEndRange() + { + $iterator = new PHPExcel_Worksheet_RowCellIterator($this->mockWorksheet, 2, 'B', 'D'); + $RowCellIndexResult = 'B'; + $this->assertEquals($RowCellIndexResult, $iterator->key()); + + foreach($iterator as $key => $RowCell) { + $this->assertEquals($RowCellIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Cell', $RowCell); + } + } + + public function testIteratorSeekAndPrev() + { + $ranges = range('A','E'); + $iterator = new PHPExcel_Worksheet_RowCellIterator($this->mockWorksheet, 2, 'B', 'D'); + $RowCellIndexResult = 'D'; + $iterator->seek('D'); + $this->assertEquals($RowCellIndexResult, $iterator->key()); + + for($i = 1; $i < array_search($RowCellIndexResult, $ranges); $i++) { + $iterator->prev(); + $expectedResult = $ranges[array_search($RowCellIndexResult, $ranges) - $i]; + $this->assertEquals($expectedResult, $iterator->key()); + } + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testSeekOutOfRange() + { + $iterator = new PHPExcel_Worksheet_RowCellIterator($this->mockWorksheet, 2, 'B', 'D'); + $iterator->seek(1); + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testPrevOutOfRange() + { + $iterator = new PHPExcel_Worksheet_RowCellIterator($this->mockWorksheet, 2, 'B', 'D'); + $iterator->prev(); + } + +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/RowIteratorTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/RowIteratorTest.php new file mode 100644 index 00000000000..48d8b6bb1cf --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/RowIteratorTest.php @@ -0,0 +1,87 @@ +mockRow = $this->getMockBuilder('PHPExcel_Worksheet_Row') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet = $this->getMockBuilder('PHPExcel_Worksheet') + ->disableOriginalConstructor() + ->getMock(); + + $this->mockWorksheet->expects($this->any()) + ->method('getHighestRow') + ->will($this->returnValue(5)); + $this->mockWorksheet->expects($this->any()) + ->method('current') + ->will($this->returnValue($this->mockRow)); + } + + + public function testIteratorFullRange() + { + $iterator = new PHPExcel_Worksheet_RowIterator($this->mockWorksheet); + $rowIndexResult = 1; + $this->assertEquals($rowIndexResult, $iterator->key()); + + foreach($iterator as $key => $row) { + $this->assertEquals($rowIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Worksheet_Row', $row); + } + } + + public function testIteratorStartEndRange() + { + $iterator = new PHPExcel_Worksheet_RowIterator($this->mockWorksheet, 2, 4); + $rowIndexResult = 2; + $this->assertEquals($rowIndexResult, $iterator->key()); + + foreach($iterator as $key => $row) { + $this->assertEquals($rowIndexResult++, $key); + $this->assertInstanceOf('PHPExcel_Worksheet_Row', $row); + } + } + + public function testIteratorSeekAndPrev() + { + $iterator = new PHPExcel_Worksheet_RowIterator($this->mockWorksheet, 2, 4); + $columnIndexResult = 4; + $iterator->seek(4); + $this->assertEquals($columnIndexResult, $iterator->key()); + + for($i = 1; $i < $columnIndexResult-1; $i++) { + $iterator->prev(); + $this->assertEquals($columnIndexResult - $i, $iterator->key()); + } + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testSeekOutOfRange() + { + $iterator = new PHPExcel_Worksheet_RowIterator($this->mockWorksheet, 2, 4); + $iterator->seek(1); + } + + /** + * @expectedException PHPExcel_Exception + */ + public function testPrevOutOfRange() + { + $iterator = new PHPExcel_Worksheet_RowIterator($this->mockWorksheet, 2, 4); + $iterator->prev(); + } + +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/WorksheetColumnTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/WorksheetColumnTest.php new file mode 100644 index 00000000000..c70c38d364f --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/WorksheetColumnTest.php @@ -0,0 +1,46 @@ +mockWorksheet = $this->getMockBuilder('PHPExcel_Worksheet') + ->disableOriginalConstructor() + ->getMock(); + $this->mockWorksheet->expects($this->any()) + ->method('getHighestRow') + ->will($this->returnValue(5)); + } + + + public function testInstantiateColumnDefault() + { + $column = new PHPExcel_Worksheet_Column($this->mockWorksheet); + $this->assertInstanceOf('PHPExcel_Worksheet_Column', $column); + $columnIndex = $column->getColumnIndex(); + $this->assertEquals('A', $columnIndex); + } + + public function testInstantiateColumnSpecified() + { + $column = new PHPExcel_Worksheet_Column($this->mockWorksheet, 'E'); + $this->assertInstanceOf('PHPExcel_Worksheet_Column', $column); + $columnIndex = $column->getColumnIndex(); + $this->assertEquals('E', $columnIndex); + } + + public function testGetCellIterator() + { + $column = new PHPExcel_Worksheet_Column($this->mockWorksheet); + $cellIterator = $column->getCellIterator(); + $this->assertInstanceOf('PHPExcel_Worksheet_ColumnCellIterator', $cellIterator); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/WorksheetRowTest.php b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/WorksheetRowTest.php new file mode 100644 index 00000000000..2761b52be61 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/Classes/PHPExcel/Worksheet/WorksheetRowTest.php @@ -0,0 +1,46 @@ +mockWorksheet = $this->getMockBuilder('PHPExcel_Worksheet') + ->disableOriginalConstructor() + ->getMock(); + $this->mockWorksheet->expects($this->any()) + ->method('getHighestColumn') + ->will($this->returnValue('E')); + } + + + public function testInstantiateRowDefault() + { + $row = new PHPExcel_Worksheet_Row($this->mockWorksheet); + $this->assertInstanceOf('PHPExcel_Worksheet_Row', $row); + $rowIndex = $row->getRowIndex(); + $this->assertEquals(1, $rowIndex); + } + + public function testInstantiateRowSpecified() + { + $row = new PHPExcel_Worksheet_Row($this->mockWorksheet, 5); + $this->assertInstanceOf('PHPExcel_Worksheet_Row', $row); + $rowIndex = $row->getRowIndex(); + $this->assertEquals(5, $rowIndex); + } + + public function testGetCellIterator() + { + $row = new PHPExcel_Worksheet_Row($this->mockWorksheet); + $cellIterator = $row->getCellIterator(); + $this->assertInstanceOf('PHPExcel_Worksheet_RowCellIterator', $cellIterator); + } +} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/phpunit.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/phpunit.xml index e8fa17e387d..2c2ff360ae0 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/phpunit.xml +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/phpunit.xml @@ -13,6 +13,9 @@ stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false"> + + + ./Classes diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MINVERSE.data b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MINVERSE.data index 2f8fd637696..8c9a962fa6d 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MINVERSE.data +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MINVERSE.data @@ -1,4 +1,4 @@ -{1|2|3;4|5|6;7|8|9}, {-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15;9.00719925474100E+15|-1.80143985094820E+16|9.00719925474099E+15;-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15} +{1|2|3;4|5|6;7|8|9}, {-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15;9.00719925474100E+15|-1.80143985094820E+16|9.00719925474099E+15;-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15} {10|20|30;40|50|60;70|80|90}, {7.03687441776639E+13|-1.40737488355328E+14|7.03687441776640E+13;-1.40737488355328E+14|2.81474976710656E+14|-1.40737488355328E+14;7.03687441776641E+13|-1.40737488355328E+14|7.03687441776640E+13} {8|1|6;3|5|7;4|9|2}, {1.47222222222222E-01|-1.44444444444444E-01|6.38888888888889E-02;-6.11111111111111E-02|2.22222222222222E-02|1.05555555555556E-01;-1.94444444444444E-02|1.88888888888889E-01|-1.02777777777778E-01} {4|-1;2|0}, {0|0.5;-1|2} @@ -8,3 +8,8 @@ {0.2|1|-0.9;0.35|10.8|4;-3.15|5}, "#VALUE!" {1|2;3|4}, {-2|1;1.5|-0.5} {1|2|1;3|4|2;1|1|2}, {-2|1|0;1.33333333333333|-0.33333333333333|-0.33333333333333;0.33333333333333|-0.33333333333333|0.66666666666667} +{2|3;4|5}, {-2.5|1.5;2|-1} +{5|8;7|9}, {-0.818181818181818|0.727272727272727;0.636363636363636|-0.454545454545455} +{45|78;17|50}, {0.054112554112554|-0.084415584415584;-0.018398268398268|0.048701298701299} +{2|2;2|1}, {-0.5|1.0;1|-1} +{1|4|6;7|4|10;15|16|20}, {-0.2941176470588230|0.0588235294117647|0.0588235294117647;0.0367647058823529|-0.2573529411764710|0.1176470588235290;0.1911764705882350|0.1617647058823530|-0.0882352941176471} \ No newline at end of file diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MMULT.data b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MMULT.data index dec3d890b47..86c9bfdb416 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MMULT.data +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/MathTrig/MMULT.data @@ -1,11 +1,12 @@ {1|2;3|4}, {1|2;3|4}, {7|10;15|22} {1|2|3;4|5|6;7|8|9}, {1|2|3;4|5|6;7|8|9}, {30|36|42;66|81|96;102|126|150} -{1|2;3|4}, 2, {2|4;6|8} -{1|2;3|4}, {2}, {2|4;6|8} -2, {1|2;3|4}, {2|4;6|8} -{2}, {1|2;3|4}, {2|4;6|8} -{1|2;3|4}, {2|4}, {2|4;6|8} -{1|2;3|4}, {2;4}, {2|4;6|8} -{2|4}, {1|2;3|4}, {2|4;6|8} -{2;4}, {1|2;3|4}, {2|4;6|8} -{1|2;3|4;5|6}, {1|2|3;4|5|6}, {1|2|3;4|5|6;7|8|9} +{1|2;3|4}, 2, "#VALUE!" // Mismatched dimensions +{1|2;3|4}, {2}, "#VALUE!" // Mismatched dimensions +{1.2;2.4}, {3.6|4.5}, {14.43|14.43;14.43|14.43} +2, {1|2;3|4}, "#VALUE!" // Mismatched dimensions +{2}, {1|2;3|4}, "#VALUE!" // Mismatched dimensions +{1|2;3|4}, {2|4}, "#VALUE!" +{1|2;3|4}, {2;4}, {{10};{22}} +{2|4}, {1|2;3|4}, {14|20} +{2;4}, {1|2;3|4}, "#VALUE!" // Mismatched dimensions +{1|2;3|4;5|6}, {1|2|3;4|5|6}, {9|12|15;19|26|33;29|40|51} diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/TextData/TRIM.data b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/TextData/TRIM.data index ea1bd0503bd..ea800963ce9 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/TextData/TRIM.data +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/TextData/TRIM.data @@ -1,6 +1,6 @@ "HELLO ", "HELLO" " HELLO", "HELLO" -" HELLO ", "HELLO" +" HELLO ", "HELLO" " HELLO", " HELLO" "HELLO WORLD", "HELLO WORLD" TRUE, "TRUE" diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/TextData/VALUE.data b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/TextData/VALUE.data new file mode 100644 index 00000000000..505c2915b97 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Calculation/TextData/VALUE.data @@ -0,0 +1,10 @@ +"1000", "1000" +"1 000", "1000" +"$1 000", "1000" +"£1 000", "#VALUE!" +"1.1", "1.1" +"1 000.1", "1000.1" +"13 Monkeys", "#VALUE!" +"1-Jan-2014", "41640" +"12:34:56", "0.524259259259259" +"2:46 AM", "0.11527777777778" diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Cell/DefaultValueBinder.data b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Cell/DefaultValueBinder.data new file mode 100644 index 00000000000..446ded6cdb4 --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Cell/DefaultValueBinder.data @@ -0,0 +1,19 @@ +NULL, "null" +, "null" +"#NULL!", "e" +FALSE, "b" +TRUE, "b" +"FALSE", "s" +"TRUE", "s" +"", "s" +"ABC", "s" +"123", "n" +123, "n" +0.123, "n" +"-123", "n" +"1.23E4", "n" +"-1.23E4", "n" +"1.23E-4", "n" +"000123", "s" +"=123", "f" +"#DIV/0!", "e" diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16.xml new file mode 100644 index 00000000000..94eaedfc2ae Binary files /dev/null and b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16.xml differ diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16BE.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16BE.xml new file mode 100644 index 00000000000..1d186ff4434 Binary files /dev/null and b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16BE.xml differ diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16LE.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16LE.xml new file mode 100644 index 00000000000..c3913f71bb8 Binary files /dev/null and b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-16LE.xml differ diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-8.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-8.xml new file mode 100644 index 00000000000..212003fd4fb --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestInvalidUTF-8.xml @@ -0,0 +1,8 @@ + + +]> + + + test: (&x0;) + \ No newline at end of file diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16.xml new file mode 100644 index 00000000000..6473fe6b638 Binary files /dev/null and b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16.xml differ diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16BE.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16BE.xml new file mode 100644 index 00000000000..677e712f99d Binary files /dev/null and b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16BE.xml differ diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16LE.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16LE.xml new file mode 100644 index 00000000000..64353bfbab1 Binary files /dev/null and b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-16LE.xml differ diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-8.xml b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-8.xml new file mode 100644 index 00000000000..c400ae88b5c --- /dev/null +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Reader/XEETestValidUTF-8.xml @@ -0,0 +1,4 @@ + + + test: Valid + \ No newline at end of file diff --git a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Style/NumberFormat.data b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Style/NumberFormat.data index 3f5901a59a5..49acaccfc7d 100644 --- a/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Style/NumberFormat.data +++ b/htdocs/includes/phpoffice/phpexcel/unitTests/rawTestData/Style/NumberFormat.data @@ -32,3 +32,6 @@ 123456789, '(000) 0-0000-000', "(001) 2-3456-789" 123456789, '0 (+00) 0000 00 00 00', "0 (+00) 0123 45 67 89" 123456789, '0000:00:00', "12345:67:89" +-123456789, '0000:00:00', "-12345:67:89" +1234567.89, '0000:00.00', "12345:67.89" +-1234567.89,'0000:00.00', "-12345:67.89" diff --git a/htdocs/includes/tcpdi/tcpdi_parser.php b/htdocs/includes/tcpdi/tcpdi_parser.php index 3059bc2c479..c97d9c74dac 100644 --- a/htdocs/includes/tcpdi/tcpdi_parser.php +++ b/htdocs/includes/tcpdi/tcpdi_parser.php @@ -48,7 +48,7 @@ */ // include class for decoding filters -require_once(dirname(__FILE__).'/../tecnick.com/tcpdf/include/tcpdf_filters.php'); +require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php'); if (!defined ('PDF_TYPE_NULL')) define ('PDF_TYPE_NULL', 0); diff --git a/htdocs/includes/tecnick.com/tcpdf/CHANGELOG.TXT b/htdocs/includes/tecnickcom/tcpdf/CHANGELOG.TXT similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/CHANGELOG.TXT rename to htdocs/includes/tecnickcom/tcpdf/CHANGELOG.TXT diff --git a/htdocs/includes/tecnick.com/tcpdf/LICENSE.TXT b/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/LICENSE.TXT rename to htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT diff --git a/htdocs/includes/tecnick.com/tcpdf/README.TXT b/htdocs/includes/tecnickcom/tcpdf/README.TXT similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/README.TXT rename to htdocs/includes/tecnickcom/tcpdf/README.TXT diff --git a/htdocs/includes/tecnick.com/tcpdf/composer.json b/htdocs/includes/tecnickcom/tcpdf/composer.json similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/composer.json rename to htdocs/includes/tecnickcom/tcpdf/composer.json diff --git a/htdocs/includes/tecnick.com/tcpdf/config/tcpdf_config.php b/htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/config/tcpdf_config.php rename to htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_html.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_html.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_html.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_html.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_png.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_png.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_png.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_png.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_svg.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_svg.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_svg.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_svg.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_svgi.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_svgi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_1d_svgi.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_1d_svgi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_html.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_html.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_html.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_html.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_png.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_png.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_png.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_png.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_html.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_html.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_html.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_html.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_png.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_png.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_png.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_png.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_svg.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_svg.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_svg.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_svg.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_html.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_html.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_html.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_html.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_png.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_png.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_png.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_png.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_svg.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_svg.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_svg.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_svg.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/barcodes/tcpdf_barcodes_2d_include.php b/htdocs/includes/tecnickcom/tcpdf/examples/barcodes/tcpdf_barcodes_2d_include.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/barcodes/tcpdf_barcodes_2d_include.php rename to htdocs/includes/tecnickcom/tcpdf/examples/barcodes/tcpdf_barcodes_2d_include.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/config/tcpdf_config_alt.php b/htdocs/includes/tecnickcom/tcpdf/examples/config/tcpdf_config_alt.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/config/tcpdf_config_alt.php rename to htdocs/includes/tecnickcom/tcpdf/examples/config/tcpdf_config_alt.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/data/cert/tcpdf.crt b/htdocs/includes/tecnickcom/tcpdf/examples/data/cert/tcpdf.crt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/data/cert/tcpdf.crt rename to htdocs/includes/tecnickcom/tcpdf/examples/data/cert/tcpdf.crt diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/data/cert/tcpdf.fdf b/htdocs/includes/tecnickcom/tcpdf/examples/data/cert/tcpdf.fdf similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/data/cert/tcpdf.fdf rename to htdocs/includes/tecnickcom/tcpdf/examples/data/cert/tcpdf.fdf diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/data/cert/tcpdf.p12 b/htdocs/includes/tecnickcom/tcpdf/examples/data/cert/tcpdf.p12 similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/data/cert/tcpdf.p12 rename to htdocs/includes/tecnickcom/tcpdf/examples/data/cert/tcpdf.p12 diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/data/chapter_demo_1.txt b/htdocs/includes/tecnickcom/tcpdf/examples/data/chapter_demo_1.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/data/chapter_demo_1.txt rename to htdocs/includes/tecnickcom/tcpdf/examples/data/chapter_demo_1.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/data/chapter_demo_2.txt b/htdocs/includes/tecnickcom/tcpdf/examples/data/chapter_demo_2.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/data/chapter_demo_2.txt rename to htdocs/includes/tecnickcom/tcpdf/examples/data/chapter_demo_2.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/data/table_data_demo.txt b/htdocs/includes/tecnickcom/tcpdf/examples/data/table_data_demo.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/data/table_data_demo.txt rename to htdocs/includes/tecnickcom/tcpdf/examples/data/table_data_demo.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/data/utf8test.txt b/htdocs/includes/tecnickcom/tcpdf/examples/data/utf8test.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/data/utf8test.txt rename to htdocs/includes/tecnickcom/tcpdf/examples/data/utf8test.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_001.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_001.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_001.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_001.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_002.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_002.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_002.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_002.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_003.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_003.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_003.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_003.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_004.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_004.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_004.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_004.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_005.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_005.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_005.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_005.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_006.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_006.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_006.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_006.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_007.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_007.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_007.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_007.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_008.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_008.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_008.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_008.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_009.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_009.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_009.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_009.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_010.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_010.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_010.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_010.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_011.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_011.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_011.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_011.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_012.pdf b/htdocs/includes/tecnickcom/tcpdf/examples/example_012.pdf similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_012.pdf rename to htdocs/includes/tecnickcom/tcpdf/examples/example_012.pdf diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_012.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_012.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_012.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_012.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_013.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_013.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_013.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_013.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_014.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_014.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_014.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_014.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_015.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_015.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_015.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_015.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_016.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_016.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_016.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_016.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_017.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_017.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_017.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_017.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_018.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_018.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_018.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_018.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_019.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_019.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_019.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_019.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_020.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_020.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_020.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_020.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_021.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_021.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_021.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_021.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_022.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_022.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_022.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_022.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_023.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_023.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_023.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_023.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_024.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_024.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_024.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_024.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_025.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_025.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_025.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_025.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_026.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_026.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_026.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_026.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_027.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_027.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_027.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_027.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_028.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_028.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_028.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_028.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_029.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_029.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_029.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_029.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_030.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_030.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_030.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_030.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_031.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_031.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_031.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_031.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_032.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_032.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_032.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_032.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_033.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_033.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_033.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_033.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_034.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_034.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_034.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_034.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_035.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_035.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_035.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_035.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_036.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_036.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_036.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_036.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_037.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_037.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_037.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_037.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_038.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_038.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_038.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_038.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_039.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_039.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_039.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_039.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_040.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_040.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_040.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_040.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_041.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_041.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_041.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_041.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_042.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_042.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_042.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_042.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_043.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_043.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_043.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_043.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_044.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_044.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_044.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_044.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_045.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_045.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_045.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_045.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_046.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_046.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_046.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_046.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_047.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_047.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_047.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_047.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_048.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_048.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_048.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_048.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_049.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_049.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_049.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_049.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_050.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_050.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_050.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_050.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_051.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_051.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_051.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_051.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_052.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_052.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_052.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_052.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_053.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_053.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_053.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_053.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_054.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_054.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_054.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_054.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_055.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_055.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_055.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_055.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_056.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_056.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_056.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_056.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_057.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_057.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_057.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_057.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_058.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_058.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_058.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_058.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_059.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_059.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_059.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_059.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_060.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_060.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_060.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_060.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_061.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_061.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_061.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_061.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_062.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_062.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_062.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_062.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_063.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_063.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_063.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_063.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_064.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_064.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_064.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_064.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/example_065.php b/htdocs/includes/tecnickcom/tcpdf/examples/example_065.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/example_065.php rename to htdocs/includes/tecnickcom/tcpdf/examples/example_065.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/_blank.png b/htdocs/includes/tecnickcom/tcpdf/examples/images/_blank.png similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/_blank.png rename to htdocs/includes/tecnickcom/tcpdf/examples/images/_blank.png diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/alpha.png b/htdocs/includes/tecnickcom/tcpdf/examples/images/alpha.png similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/alpha.png rename to htdocs/includes/tecnickcom/tcpdf/examples/images/alpha.png diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/image_demo.jpg b/htdocs/includes/tecnickcom/tcpdf/examples/images/image_demo.jpg similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/image_demo.jpg rename to htdocs/includes/tecnickcom/tcpdf/examples/images/image_demo.jpg diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/image_with_alpha.png b/htdocs/includes/tecnickcom/tcpdf/examples/images/image_with_alpha.png similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/image_with_alpha.png rename to htdocs/includes/tecnickcom/tcpdf/examples/images/image_with_alpha.png diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/img.png b/htdocs/includes/tecnickcom/tcpdf/examples/images/img.png similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/img.png rename to htdocs/includes/tecnickcom/tcpdf/examples/images/img.png diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/logo_example.gif b/htdocs/includes/tecnickcom/tcpdf/examples/images/logo_example.gif similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/logo_example.gif rename to htdocs/includes/tecnickcom/tcpdf/examples/images/logo_example.gif diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/logo_example.jpg b/htdocs/includes/tecnickcom/tcpdf/examples/images/logo_example.jpg similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/logo_example.jpg rename to htdocs/includes/tecnickcom/tcpdf/examples/images/logo_example.jpg diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/logo_example.png b/htdocs/includes/tecnickcom/tcpdf/examples/images/logo_example.png similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/logo_example.png rename to htdocs/includes/tecnickcom/tcpdf/examples/images/logo_example.png diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_box.ai b/htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_box.ai similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_box.ai rename to htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_box.ai diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_box.svg b/htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_box.svg similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_box.svg rename to htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_box.svg diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_cell.png b/htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_cell.png similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_cell.png rename to htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_cell.png diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_logo.jpg b/htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_logo.jpg similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_logo.jpg rename to htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_logo.jpg diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_signature.png b/htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_signature.png similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/tcpdf_signature.png rename to htdocs/includes/tecnickcom/tcpdf/examples/images/tcpdf_signature.png diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/testsvg.svg b/htdocs/includes/tecnickcom/tcpdf/examples/images/testsvg.svg similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/testsvg.svg rename to htdocs/includes/tecnickcom/tcpdf/examples/images/testsvg.svg diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/images/tux.svg b/htdocs/includes/tecnickcom/tcpdf/examples/images/tux.svg similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/images/tux.svg rename to htdocs/includes/tecnickcom/tcpdf/examples/images/tux.svg diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/index.php b/htdocs/includes/tecnickcom/tcpdf/examples/index.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/index.php rename to htdocs/includes/tecnickcom/tcpdf/examples/index.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/afr.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/afr.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/afr.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/afr.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/ara.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/ara.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/ara.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/ara.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/aze.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/aze.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/aze.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/aze.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/bel.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/bel.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/bel.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/bel.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/bra.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/bra.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/bra.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/bra.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/bul.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/bul.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/bul.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/bul.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/cat.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/cat.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/cat.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/cat.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/ces.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/ces.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/ces.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/ces.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/chi.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/chi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/chi.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/chi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/cym.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/cym.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/cym.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/cym.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/dan.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/dan.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/dan.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/dan.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/eng.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/eng.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/eng.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/eng.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/est.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/est.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/est.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/est.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/eus.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/eus.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/eus.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/eus.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/far.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/far.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/far.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/far.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/fra.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/fra.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/fra.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/fra.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/ger.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/ger.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/ger.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/ger.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/gle.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/gle.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/gle.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/gle.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/glg.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/glg.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/glg.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/glg.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/hat.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/hat.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/hat.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/hat.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/heb.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/heb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/heb.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/heb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/hrv.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/hrv.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/hrv.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/hrv.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/hun.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/hun.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/hun.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/hun.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/hye.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/hye.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/hye.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/hye.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/ind.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/ind.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/ind.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/ind.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/ita.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/ita.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/ita.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/ita.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/jpn.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/jpn.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/jpn.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/jpn.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/kat.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/kat.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/kat.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/kat.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/kor.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/kor.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/kor.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/kor.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/mkd.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/mkd.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/mkd.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/mkd.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/mlt.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/mlt.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/mlt.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/mlt.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/msa.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/msa.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/msa.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/msa.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/nld.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/nld.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/nld.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/nld.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/nob.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/nob.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/nob.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/nob.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/pol.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/pol.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/pol.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/pol.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/por.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/por.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/por.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/por.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/ron.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/ron.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/ron.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/ron.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/rus.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/rus.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/rus.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/rus.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/slv.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/slv.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/slv.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/slv.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/spa.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/spa.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/spa.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/spa.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/sqi.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/sqi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/sqi.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/sqi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/srp.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/srp.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/srp.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/srp.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/swa.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/swa.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/swa.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/swa.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/swe.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/swe.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/swe.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/swe.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/ukr.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/ukr.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/ukr.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/ukr.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/urd.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/urd.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/urd.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/urd.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/yid.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/yid.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/yid.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/yid.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/lang/zho.php b/htdocs/includes/tecnickcom/tcpdf/examples/lang/zho.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/lang/zho.php rename to htdocs/includes/tecnickcom/tcpdf/examples/lang/zho.php diff --git a/htdocs/includes/tecnick.com/tcpdf/examples/tcpdf_include.php b/htdocs/includes/tecnickcom/tcpdf/examples/tcpdf_include.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/examples/tcpdf_include.php rename to htdocs/includes/tecnickcom/tcpdf/examples/tcpdf_include.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/COPYING b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/COPYING rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/ChangeLog b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/ChangeLog rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/README b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/ae_fonts_2.0/README rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/aealarabiya.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/aealarabiya.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/aealarabiya.php b/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/aealarabiya.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/aealarabiya.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/aealarabiya.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/aefurat.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/aefurat.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/aefurat.php b/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/aefurat.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/aefurat.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/aefurat.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/cid0cs.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0cs.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/cid0cs.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0cs.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/cid0ct.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0ct.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/cid0ct.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0ct.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/cid0jp.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0jp.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/cid0jp.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0jp.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/cid0kr.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0kr.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/cid0kr.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0kr.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/courier.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courier.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/courier.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/courier.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/courierb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courierb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/courierb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/courierb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/courierbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courierbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/courierbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/courierbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/courieri.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courieri.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/courieri.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/courieri.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/README b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/README rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/README b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/README rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusans.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusans.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusans.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusans.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusans.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusans.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansb.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansbi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensed.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensed.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensed.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensed.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensed.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensed.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedb.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedbi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusanscondensedi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansextralight.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansextralight.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansextralight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansextralight.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansextralight.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansextralight.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmono.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmono.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmono.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmono.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmono.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmono.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonob.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonob.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonob.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonob.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonob.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonob.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonobi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonobi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonobi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonobi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonobi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonobi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonoi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonoi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonoi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonoi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonoi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavusansmonoi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserif.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserif.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserif.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserif.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserif.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserif.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifb.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifbi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensed.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensed.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensed.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensed.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensed.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensed.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedb.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedbi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifcondensedi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/dejavuserifi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/AUTHORS rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/COPYING b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/COPYING rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/CREDITS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/CREDITS rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/ChangeLog b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/ChangeLog rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/INSTALL b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/INSTALL rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/README b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20100919/README rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/AUTHORS rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/COPYING b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/COPYING rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/CREDITS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/CREDITS rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/ChangeLog b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/ChangeLog rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/INSTALL b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/INSTALL rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/README b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/README rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/USAGE b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freefont-20120503/USAGE rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemono.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemono.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemono.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemono.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemono.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemono.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemono.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemono.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonob.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonob.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonob.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonob.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonob.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonob.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonobi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonobi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonobi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonobi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonobi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonobi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonoi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonoi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonoi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonoi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freemonoi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freemonoi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesans.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesans.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesans.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesans.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesans.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesans.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesans.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesans.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansb.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansbi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freesansi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freesansi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserif.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserif.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserif.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserif.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserif.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserif.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifb.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifbi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifi.ctg.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/freeserifi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/freeserifi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/helvetica.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helvetica.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/helvetica.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/helvetica.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/helveticab.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helveticab.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/helveticab.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/helveticab.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/helveticabi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helveticabi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/helveticabi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/helveticabi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/helveticai.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helveticai.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/helveticai.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/helveticai.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/hysmyeongjostdmedium.php b/htdocs/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/hysmyeongjostdmedium.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/kozgopromedium.php b/htdocs/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/kozgopromedium.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/kozminproregular.php b/htdocs/includes/tecnickcom/tcpdf/fonts/kozminproregular.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/kozminproregular.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/kozminproregular.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/msungstdlight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/msungstdlight.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/msungstdlight.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/msungstdlight.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourier.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourier.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourier.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourier.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourierbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourieri.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourieri.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourieri.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfacourieri.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelvetica.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelvetica.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelvetica.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelvetica.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticab.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticab.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticab.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticab.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticabi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticabi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticabi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticabi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticai.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticai.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticai.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfahelveticai.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfasymbol.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfasymbol.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfasymbol.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfasymbol.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimes.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimes.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimes.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimes.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesb.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesbi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfatimesi.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfazapfdingbats.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfazapfdingbats.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/pdfazapfdingbats.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/pdfazapfdingbats.z rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/stsongstdlight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/stsongstdlight.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/symbol.php b/htdocs/includes/tecnickcom/tcpdf/fonts/symbol.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/symbol.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/symbol.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/times.php b/htdocs/includes/tecnickcom/tcpdf/fonts/times.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/times.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/times.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/timesb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/timesb.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/timesb.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/timesb.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/timesbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/timesbi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/timesbi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/timesbi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/timesi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/timesi.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/timesi.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/timesi.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_ac15.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_ac15.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_ag15.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_ag15.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_aj16.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_aj16.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_ak12.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/uni2cid_ak12.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php diff --git a/htdocs/includes/tecnick.com/tcpdf/fonts/zapfdingbats.php b/htdocs/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/fonts/zapfdingbats.php rename to htdocs/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/barcodes/datamatrix.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/barcodes/datamatrix.php rename to htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/barcodes/pdf417.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/barcodes/pdf417.php rename to htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/barcodes/qrcode.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/barcodes/qrcode.php rename to htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/sRGB.icc b/htdocs/includes/tecnickcom/tcpdf/include/sRGB.icc similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/sRGB.icc rename to htdocs/includes/tecnickcom/tcpdf/include/sRGB.icc diff --git a/htdocs/includes/tecnick.com/tcpdf/include/tcpdf_colors.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/tcpdf_colors.php rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/tcpdf_filters.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_filters.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/tcpdf_filters.php rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_filters.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/tcpdf_font_data.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/tcpdf_font_data.php rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/tcpdf_fonts.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/tcpdf_fonts.php rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/tcpdf_images.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/tcpdf_images.php rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php diff --git a/htdocs/includes/tecnick.com/tcpdf/include/tcpdf_static.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/include/tcpdf_static.php rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php diff --git a/htdocs/includes/tecnick.com/tcpdf/tcpdf.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tcpdf.php rename to htdocs/includes/tecnickcom/tcpdf/tcpdf.php diff --git a/htdocs/includes/tecnick.com/tcpdf/tcpdf_autoconfig.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tcpdf_autoconfig.php rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php diff --git a/htdocs/includes/tecnick.com/tcpdf/tcpdf_barcodes_1d.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tcpdf_barcodes_1d.php rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php diff --git a/htdocs/includes/tecnick.com/tcpdf/tcpdf_barcodes_2d.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tcpdf_barcodes_2d.php rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php diff --git a/htdocs/includes/tecnick.com/tcpdf/tcpdf_import.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_import.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tcpdf_import.php rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_import.php diff --git a/htdocs/includes/tecnick.com/tcpdf/tcpdf_parser.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_parser.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tcpdf_parser.php rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_parser.php diff --git a/htdocs/includes/tecnick.com/tcpdf/tools/.htaccess b/htdocs/includes/tecnickcom/tcpdf/tools/.htaccess similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tools/.htaccess rename to htdocs/includes/tecnickcom/tcpdf/tools/.htaccess diff --git a/htdocs/includes/tecnick.com/tcpdf/tools/convert_fonts_examples.txt b/htdocs/includes/tecnickcom/tcpdf/tools/convert_fonts_examples.txt similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tools/convert_fonts_examples.txt rename to htdocs/includes/tecnickcom/tcpdf/tools/convert_fonts_examples.txt diff --git a/htdocs/includes/tecnick.com/tcpdf/tools/tcpdf_addfont.php b/htdocs/includes/tecnickcom/tcpdf/tools/tcpdf_addfont.php similarity index 100% rename from htdocs/includes/tecnick.com/tcpdf/tools/tcpdf_addfont.php rename to htdocs/includes/tecnickcom/tcpdf/tools/tcpdf_addfont.php diff --git a/htdocs/index.php b/htdocs/index.php index 818da8f9ecd..5926e4e374c 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -131,10 +131,9 @@ if (empty($user->societe_id)) print '
'; print '
global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."
global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."'; print ""; print ""; @@ -974,7 +974,7 @@ else print "\n"; $var=!$var; - print ""; + print ""; print ''; print ''; diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index a4a94fe66c9..97ca06be08a 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -52,16 +52,13 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt // Remove product id before select another product // use keyup instead change to avoid loosing the product id $("input#search_'.$htmlname.'").keydown(function() { - //console.log(\'purge_id_after_keydown\'); $("#'.$htmlname.'").val(""); }); $("input#search_'.$htmlname.'").change(function() { - //console.log(\'change\'); $("#'.$htmlname.'").trigger("change"); }); // Check when keyup $("input#search_'.$htmlname.'").keyup(function() { - //console.log(\'keyup\'); if ($(this).val().length == 0) { $("#search_'.$htmlname.'").val(""); @@ -127,7 +124,6 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt dataType: "json", minLength: '.$minLength.', select: function( event, ui ) { // Function ran when new value is selected into javascript combo - //console.log(\'set value of id with \'+ui.item.id); $("#'.$htmlname.'").val(ui.item.id).trigger("change"); // Select new value // Disable an element if (options.option_disabled) { @@ -171,8 +167,6 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt } }); } - console.log("ajax_autocompleter new value selected, we trigger change"); - $("#search_'.$htmlname.'").trigger("change"); // To tell that input text field was modified } ,delay: 500 }).data("ui-autocomplete")._renderItem = function( ul, item ) { diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php index 330d3d2ba39..76337ec2763 100644 --- a/htdocs/core/lib/doc.lib.php +++ b/htdocs/core/lib/doc.lib.php @@ -106,7 +106,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli $ref_prodserv = ""; if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this { - if ($prodser->isservice()) + if ($prodser->isService()) { $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." "; } diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index d6cadaaadec..3e35e66336f 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -2,6 +2,7 @@ /* Copyright (C) 2008-2012 Laurent Destailleur * Copyright (C) 2012-2015 Regis Houssin * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2015 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1440,6 +1441,9 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio // Define $destpath (path to file including filename) and $destfile (only filename) $destpath=$upload_dir . "/" . $_FILES[$varfiles]['name']; $destfile=$_FILES[$varfiles]['name']; + + $savingdocmask = dol_sanitizeFileName($savingdocmask); + if ($savingdocmask) { $destpath=$upload_dir . "/" . preg_replace('/__file__/',$_FILES[$varfiles]['name'],$savingdocmask); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index db59c8d966d..4a94863e8c4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -263,6 +263,10 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL) $out=trim($out); if (preg_match('/[^a-z]+/i',$out)) $out=''; break; + case 'aZ09': + $out=trim($out); + if (preg_match('/[^a-z0-9]+/i',$out)) $out=''; + break; case 'array': if (! is_array($out) || empty($out)) $out=array(); break; @@ -3084,12 +3088,18 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee */ function vatrate($rate,$addpercent=false,$info_bits=0,$usestarfornpr=0) { - // Test for compatibility - if (preg_match('/%/',$rate)) + $morelabel=''; + + if (preg_match('/%/',$rate)) { $rate=str_replace('%','',$rate); $addpercent=true; } + if (preg_match('/\((.*)\)/',$rate,$reg)) + { + $morelabel=' ('.$reg[1].')'; + $rate=preg_replace('/'.preg_quote($morelabel,'/').'/','',$rate); + } if (preg_match('/\*/',$rate) || preg_match('/'.constant('MAIN_LABEL_MENTION_NPR').'/i',$rate)) { $rate=str_replace('*','',$rate); @@ -3098,6 +3108,7 @@ function vatrate($rate,$addpercent=false,$info_bits=0,$usestarfornpr=0) $ret=price($rate,0,'',0,0).($addpercent?'%':''); if ($info_bits & 1) $ret.=' '.($usestarfornpr?'*':constant('MAIN_LABEL_MENTION_NPR')); + $ret.=$morelabel; return $ret; } @@ -3279,35 +3290,43 @@ function price2num($amount,$rounding='',$alreadysqlnb=0) } /** - * Return localtax rate for a particular vat, when selling a product with vat $tva, from a $thirdparty_buyer to a $thirdparty_seller + * Return localtax rate for a particular vat, when selling a product with vat $vatrate, from a $thirdparty_buyer to a $thirdparty_seller * Note: This function applies same rules than get_default_tva * - * @param float $tva Vat taxe + * @param float $vatrate Vat rate * @param int $local Local tax to search and return (1 or 2 return only tax rate 1 or tax rate 2) * @param Societe $thirdparty_buyer Object of buying third party * @param Societe $thirdparty_seller Object of selling third party - * @return mixed 0 if not found, localtax if found + * @return mixed 0 if not found, localtax rate if found * @see get_default_tva */ -function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="") +function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller="") { global $db, $conf, $mysoc; if (empty($thirdparty_seller) || ! is_object($thirdparty_seller)) $thirdparty_seller=$mysoc; - dol_syslog("get_localtax tva=".$tva." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')."/country_code=".(is_object($thirdparty_buyer)?$thirdparty_buyer->country_code:'')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj." thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj); + dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')."/country_code=".(is_object($thirdparty_buyer)?$thirdparty_buyer->country_code:'')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj." thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj); - if($thirdparty_buyer->country_code!=$thirdparty_seller->country_code) + $vatratecleaned = $vatrate; + if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) // If vat is "xx (yy)" + { + $vatratecleaned = $reg[1]; + $vatratecode = $reg[2]; + } + + /*if ($thirdparty_buyer->country_code != $thirdparty_seller->country_code) { return 0; - } + }*/ + // Some test to guess with no need to make database access if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe { if ($local == 1) { - if(! $mysoc->localtax1_assuj) return 0; - if ($thirdparty_seller->id==$mysoc->id) + if (! $mysoc->localtax1_assuj) return 0; + if ($thirdparty_seller->id == $mysoc->id) { if (! $thirdparty_buyer->localtax1_assuj) return 0; } @@ -3319,8 +3338,8 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="") if ($local == 2) { - if(! $mysoc->localtax2_assuj) return 0; - if ($thirdparty_seller->id==$mysoc->id ) + if (! $mysoc->localtax2_assuj) return 0; + if ($thirdparty_seller->id == $mysoc->id) { if (! $thirdparty_buyer->localtax2_assuj) return 0; } @@ -3346,63 +3365,72 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="") }*/ // Search local taxes - if ($local==1) + if ($mysoc->country_code == 'ES' || ! empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY)) { - if($thirdparty_seller!=$mysoc ) - { - if(!isOnlyOneLocalTax($local)) - { - return $thirdparty_seller->localtax1_value; - } - } - else - { - if(!isOnlyOneLocalTax($local)) - { - return $conf->global->MAIN_INFO_VALUE_LOCALTAX1; - } - } - } - if ($local==2) - { - if($thirdparty_seller!=$mysoc) - { - if(!isOnlyOneLocalTax($local)) - { - return $thirdparty_seller->localtax2_value; - } - } - else - { - if(!isOnlyOneLocalTax($local)) - { - return $conf->global->MAIN_INFO_VALUE_LOCALTAX2; - } - } + if ($local==1) + { + if ($thirdparty_seller != $mysoc) + { + if (!isOnlyOneLocalTax($local)) // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate + { + return $thirdparty_seller->localtax1_value; + } + } + else // i am the seller + { + if (!isOnlyOneLocalTax($local)) // TODO If seller is me, why not always returning this, even if there is only one locatax vat. + { + return $conf->global->MAIN_INFO_VALUE_LOCALTAX1; + } + } + } + if ($local==2) + { + if ($thirdparty_seller != $mysoc) + { + if (!isOnlyOneLocalTax($local)) // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate + // TODO We should also return value defined on thirdparty only if defined + { + return $thirdparty_seller->localtax2_value; + } + } + else // i am the seller + { + if (!isOnlyOneLocalTax($local)) // This is for spain only, we don't return value found into datbase even if there is only one locatax vat. + { + return $conf->global->MAIN_INFO_VALUE_LOCALTAX2; + } + } + } } + // By default, search value of local tax on line of common tax $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type"; - $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; - $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'"; - $sql .= " AND t.taux = ".((float) $tva)." AND t.active = 1"; - dol_syslog("get_localtax", LOG_DEBUG); - $resql=$db->query($sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - if ($local==1) return $obj->localtax1; - elseif ($local==2) return $obj->localtax2; - } + $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; + $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'"; + $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1"; + if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'"; + dol_syslog("get_localtax", LOG_DEBUG); + $resql=$db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($local==1) return $obj->localtax1; + elseif ($local==2) return $obj->localtax2; + } + return 0; } /** - * Return true if LocalTax is unique + * Return true if LocalTax (1 or 2) is unique. + * Example: If localtax1 is 5 on line with highest common vat rate, return true + * Example: If localtax1 is 5:8:15 on line with highest common vat rate, return false * - * @param int $local Local taxt to test - * @return boolean True if LocalTax have multiple values, False if not + * @param int $local Local tax to test (1 or 2) + * @return boolean True if LocalTax have multiple values, False if not */ function isOnlyOneLocalTax($local) { @@ -3410,7 +3438,7 @@ function isOnlyOneLocalTax($local) $valors=explode(":", $tax); - if(count($valors)>1) + if (count($valors)>1) { return false; } @@ -3421,7 +3449,7 @@ function isOnlyOneLocalTax($local) } /** - * Get values of localtaxes + * Get values of localtaxes (1 or 2) for company country for the common vat with the highest value * * @param int $local LocalTax to get * @return number Values of localtax @@ -3431,9 +3459,10 @@ function get_localtax_by_third($local) global $db, $mysoc; $sql ="SELECT t.localtax1, t.localtax2 "; $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays"; - $sql.=" WHERE c.code = '".$mysoc->country_code."' AND t.taux=(SELECT max(tt.taux)"; - $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays"; - $sql.=" WHERE c.code = '".$mysoc->country_code."')"; + $sql.=" WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=("; + $sql.=" SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays"; + $sql.=" WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1"; + $sql.=" )"; $resql=$db->query($sql); if ($resql) @@ -3452,7 +3481,7 @@ function get_localtax_by_third($local) * Get type and rate of localtaxes for a particular vat rate/country fo thirdparty * TODO * This function is also called to retrieve type for building PDF. Such call of function must be removed. - * Instead this function must be called when adding a line to get (array of localtax and type) and + * Instead this function must be called when adding a line to get the array of localtax and type, and then * provide it to the function calcul_price_total. * * @param float $vatrate VAT Rate @@ -3463,15 +3492,24 @@ function get_localtax_by_third($local) */ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller) { - global $db; + global $db, $mysoc; dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local); + $vatratecleaned = $vatrate; + if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) // If vat is "xx (yy)" + { + $vatratecleaned = $reg[1]; + $vatratecode = $reg[2]; + } + // Search local taxes $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy"; $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; - $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; - $sql .= " AND t.taux = ".((float) $vatrate)." AND t.active = 1"; + if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; + else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; + $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1"; + if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'"; $resql=$db->query($sql); if ($resql) @@ -5043,6 +5081,23 @@ function printCommonFooter($zone='private') if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n"; + print "\n"; + print ''."\n"; + // Google Analytics (need Google module) if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID)) { @@ -5193,6 +5248,10 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0) { global $db,$langs; + if ($mode == 0) + { + $value=preg_replace('/\*/','%',$value); // Replace * with % + } if ($mode == 1) { $value=preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"),'/').'\-])/','\1\2',$value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 651e4ea54ac..8bc635f74a8 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1608,8 +1608,8 @@ function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='') if ($objecttype == 'propal') { $classpath = 'comm/propal/class'; } - if ($objecttype == 'askpricesupplier') { - $classpath = 'comm/askpricesupplier/class'; + if ($objecttype == 'supplier_proposal') { + $classpath = 'supplier_proposal/class'; } if ($objecttype == 'shipping') { $classpath = 'expedition/class'; @@ -1842,8 +1842,8 @@ function getElementProperties($element_type) if ($element_type == 'propal') { $classpath = 'comm/propal/class'; } - if ($element_type == 'askpricesupplier') { - $classpath = 'comm/askpricesupplier/class'; + if ($element_type == 'supplier_proposal') { + $classpath = 'supplier_proposal/class'; } if ($element_type == 'shipping') { $classpath = 'expedition/class'; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 8e0eef6d53b..c29d9c5a04d 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -173,7 +173,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P') * This class is an enhanced FPDI class that support method writeHTMLCell */ class FPDI_DolExtended extends FPDI - { + { /** * __call * @@ -726,7 +726,8 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default $ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban)); $ibanDisplay = ""; - for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++) + $nbIbanDisplay_temp = dol_strlen($ibanDisplay_temp); + for ($i = 0; $i < $nbIbanDisplay_temp; $i++) { $ibanDisplay .= $ibanDisplay_temp[$i]; if($i%4 == 3 && $i > 0) $ibanDisplay .= " "; @@ -1166,7 +1167,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl $ref_prodserv = ""; if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this { - if ($prodser->isservice()) + if ($prodser->isService()) { $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." "; } diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 69eb63717b2..d0bc74e77c3 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -98,7 +98,7 @@ function product_prepare_head($object) $head[$h][2] = 'referers'; $h++; - if ($object->isproduct() || ($object->isservice() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) // If physical product we can stock (or service with option) + if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) // If physical product we can stock (or service with option) { if (! empty($conf->stock->enabled) && $user->rights->stock->lire) { diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php index 0d94357a201..a32805b6169 100644 --- a/htdocs/core/lib/security2.lib.php +++ b/htdocs/core/lib/security2.lib.php @@ -148,8 +148,10 @@ function dol_loginfunction($langs,$conf,$mysoc) if (! preg_match('/mainmenu=/',$php_self)) $php_self.=(preg_match('/\?/',$php_self)?'&':'?').'mainmenu=home'; // Title - $title='Dolibarr '.DOL_VERSION; + $appli=constant('DOL_APPLICATION_TITLE'); + $title=$appli.' '.DOL_VERSION; if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE; + $titletruedolibarrversion=DOL_VERSION; // $title used by login template after the @ to inform of true Dolibarr version // Note: $conf->css looks like '/theme/eldy/style.css.php' $conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php"; diff --git a/htdocs/core/lib/askpricesupplier.lib.php b/htdocs/core/lib/supplier_proposal.lib.php similarity index 72% rename from htdocs/core/lib/askpricesupplier.lib.php rename to htdocs/core/lib/supplier_proposal.lib.php index eec34ea9133..f73ae6727d7 100644 --- a/htdocs/core/lib/askpricesupplier.lib.php +++ b/htdocs/core/lib/supplier_proposal.lib.php @@ -29,17 +29,17 @@ * @param object $object Object related to tabs * @return array Array of tabs to show */ -function askpricesupplier_prepare_head($object) +function supplier_proposal_prepare_head($object) { global $langs, $conf, $user; - $langs->load("askpricesupplier"); + $langs->load("supplier_proposal"); $langs->load("compta"); $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/card.php?id='.$object->id; - $head[$h][1] = $langs->trans('AskPriceSupplierCard'); + $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id; + $head[$h][1] = $langs->trans('SupplierProposalCard'); $head[$h][2] = 'comm'; $h++; @@ -48,14 +48,14 @@ function askpricesupplier_prepare_head($object) // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf,$langs,$object,$head,$h,'askpricesupplier'); + complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_proposal'); if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { $nbNote = 0; if(!empty($object->note_private)) $nbNote++; if(!empty($object->note_public)) $nbNote++; - $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/note.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id; $head[$h][1] = $langs->trans('Notes'); if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; $head[$h][2] = 'note'; @@ -63,20 +63,20 @@ function askpricesupplier_prepare_head($object) } require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $upload_dir = $conf->askpricesupplier->dir_output . "/" . dol_sanitizeFileName($object->ref); + $upload_dir = $conf->supplier_proposal->dir_output . "/" . dol_sanitizeFileName($object->ref); $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); - $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/document.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$object->id; $head[$h][1] = $langs->trans('Documents'); if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'document'; $h++; - $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/info.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/info.php?id='.$object->id; $head[$h][1] = $langs->trans('Info'); $head[$h][2] = 'info'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'askpricesupplier','remove'); + complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_proposal','remove'); return $head; } @@ -86,14 +86,14 @@ function askpricesupplier_prepare_head($object) * * @return array head array with tabs */ -function askpricesupplier_admin_prepare_head() +function supplier_proposal_admin_prepare_head() { global $langs, $conf, $user; $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/admin/askpricesupplier.php'; + $head[$h][0] = DOL_URL_ROOT.'/admin/supplier_proposal.php'; $head[$h][1] = $langs->trans("Miscellaneous"); $head[$h][2] = 'general'; $h++; @@ -102,19 +102,19 @@ function askpricesupplier_admin_prepare_head() // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf,$langs,null,$head,$h,'askpricesupplier_admin'); + complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin'); - $head[$h][0] = DOL_URL_ROOT.'/comm/admin/askpricesupplier_extrafields.php'; + $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposal_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); $head[$h][2] = 'attributes'; $h++; - $head[$h][0] = DOL_URL_ROOT.'/comm/admin/askpricesupplierdet_extrafields.php'; + $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFieldsLines"); $head[$h][2] = 'attributeslines'; $h++; - complete_head_from_modules($conf,$langs,null,$head,$h,'askpricesupplier_admin','remove'); + complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin','remove'); return $head; } diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 526f6e48185..b653cfbf5c0 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -382,46 +382,51 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print ''; - // Use Hover - $var=!$var; + // BackgroundColor if ($foruserprofile) - { - /* Must first change option to choose color of highlight insteado of yes or no. - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - */ - } - else - { - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; - print ''; - } - + if ($edit) print '
('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + print '';*/ + } + else + { + $var=!$var; + print ''; + print ''; + print ''; + } + // TopMenuBackgroundColor if ($foruserprofile) { @@ -492,6 +497,90 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print ''; } + // Use Hover + $var=!$var; + if ($foruserprofile) + { + /* Must first change option to choose color of highlight instead of yes or no. + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + */ + } + else + { + print ''; + print ''; + print ''; + print ''; + } + + // TopMenuBackgroundColor + if ($foruserprofile) + { + /*$var=!$var; + print ''; + print ''; + print ''; + print ''; + print '';*/ + } + else + { + $var=!$var; + print ''; + print ''; + print ''; + } + print '
global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."
global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."'; print ""; print ""; @@ -988,7 +988,7 @@ else /* * Local Taxes */ - if ($mysoc->useLocalTax(1)) + if ($mysoc->useLocalTax(1)) // True if we found at least on vat with a setup adding a localtax 1 { // Local Tax 1 print '
'; @@ -1000,7 +1000,7 @@ else $var=true; $var=!$var; - print ""; + print ""; print ''; } print '' . "\n"; @@ -3839,6 +3868,15 @@ else if ($id > 0 || ! empty($ref)) $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='inv'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'inv'.$object->id); + } $formmail->withfrom = 1; $liste = array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) { diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index ede68b39324..de240910ac7 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -63,6 +63,7 @@ class Facture extends CommonInvoice var $author; var $fk_user_author; var $fk_user_valid; + var $date; // Date invoice var $date_creation; // Creation date var $date_validation; // Validation date var $datem; @@ -897,7 +898,7 @@ class Facture extends CommonInvoice if (! empty($this->total_ht)) $label.= '
' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_tva)) - $label.= '
' . $langs->trans('TVA') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); + $label.= '
' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_ttc)) $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref; @@ -2044,8 +2045,8 @@ class Facture extends CommonInvoice * @param double $pu_ht Unit price without tax (> 0 even for credit note) * @param double $qty Quantity * @param double $txtva Force vat rate, -1 for auto - * @param double $txlocaltax1 Local tax 1 rate - * @param double $txlocaltax2 Local tax 2 rate + * @param double $txlocaltax1 Local tax 1 rate (deprecated) + * @param double $txlocaltax2 Local tax 2 rate (deprecated) * @param int $fk_product Id of predefined product/service * @param double $remise_percent Percent of discount on line * @param int $date_start Date start of service @@ -2140,6 +2141,7 @@ class Facture extends CommonInvoice // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc); + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, $situation_percent); @@ -2298,7 +2300,8 @@ class Facture extends CommonInvoice // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, $situation_percent); $total_ht = $tabprice[0]; @@ -3632,23 +3635,27 @@ class Facture extends CommonInvoice /** * Checks if the invoice is the last in its cycle * - * @return int 0 or 1 if OK, -1 if error + * @return bool Last of the cycle status * */ function is_last_in_cycle() { - $sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_cycle_ref = ' . $this->situation_cycle_ref; - $resql = $this->db->query($sql); - - if ($resql && $resql->num_rows > 0) { - $res = $this->db->fetch_array($resql); - $last = $res['max(situation_counter)']; - return ($last == $this->situation_counter); + if (!empty($this->situation_cycle_ref)) { + // No point in testing anything if we're not inside a cycle + $sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_cycle_ref = ' . $this->situation_cycle_ref; + $resql = $this->db->query($sql); + + if ($resql && $resql->num_rows > 0) { + $res = $this->db->fetch_array($resql); + $last = $res['max(situation_counter)']; + return ($last == $this->situation_counter); + } else { + $this->error = $this->db->lasterror(); + dol_syslog(get_class($this) . "::select Error " . $this->error, LOG_ERR); + return false; + } } else { - $this->error = $this->db->lasterror(); - dol_syslog(get_class($this) . "::select Error " . $this->error, LOG_ERR); - $this->db->rollback(); - return -1; + return true; } } diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 8fe20cd66f6..b07a8f8c2d4 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Patrick Rouillon * Copyright (C) 2005-2009 Destailleur Laurent * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2012 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ $object = new Facture($db); /* - * Ajout d'un nouveau contact + * Add a new contact */ if ($action == 'addcontact' && $user->rights->facture->creer) @@ -71,16 +71,16 @@ if ($action == 'addcontact' && $user->rights->facture->creer) if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } -// Bascule du statut d'un contact +// Toggle the status of a contact else if ($action == 'swapstatut' && $user->rights->facture->creer) { if ($object->fetch($id)) @@ -93,7 +93,7 @@ else if ($action == 'swapstatut' && $user->rights->facture->creer) } } -// Efface un contact +// Deletes a contact else if ($action == 'deletecontact' && $user->rights->facture->creer) { $object->fetch($id); @@ -124,7 +124,7 @@ $userstatic=new User($db); /* *************************************************************************** */ /* */ -/* Mode vue et edition */ +/* View and edit mode */ /* */ /* *************************************************************************** */ @@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref)) dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), 0, 'bill'); /* - * Facture synthese pour rappel + * Summary invoice for reminder */ print '
".$langs->trans("VATIsNotUsedDesc")."
global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."
global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."'; print ""; print ""; @@ -1028,7 +1028,7 @@ else print "\n"; $var=!$var; - print ""; + print ""; print '"; + print ""; print '\n"; print " \n"; print " \n"; print "\n"; -print "\n \n \n\n"; +print "\n \n \n\n"; print "
".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."
global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."
global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."'; print ""; print ""; @@ -1039,7 +1039,7 @@ else print "
"; } - if ($mysoc->useLocalTax(2)) + if ($mysoc->useLocalTax(2)) // True if we found at least on vat with a setup adding a localtax 1 { // Local Tax 2 print '
'; @@ -1051,7 +1051,7 @@ else $var=true; $var=!$var; - print "
global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."
global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."'; print ""; print ""; @@ -1080,7 +1080,7 @@ else print "\n"; $var=!$var; - print ""; + print ""; print '"; $var=! $var; print ''; print ''; -print ''; +print ''; print '\n"; @@ -561,20 +561,20 @@ if ($conf->banque->enabled) { $var=!$var; print ''; @@ -583,7 +583,7 @@ else { $var=!$var; print ''; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").''; } print '
global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."
global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."'; print ""; print ""; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 7022c5877eb..973c1b9c961 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -150,7 +150,7 @@ $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.t $tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1"; $tabsql[8] = "SELECT t.id as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid"; $tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c"; -$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid"; +$tabsql[10]= "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid"; $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t"; $tabsql[12]= "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.fdm, c.decalage, c.active, c.sortorder FROM ".MAIN_DB_PREFIX.'c_payment_term AS c'; $tabsql[13]= "SELECT c.id as rowid, c.code, c.libelle, c.type, c.active, c.accountancy_code FROM ".MAIN_DB_PREFIX."c_paiement AS c"; @@ -182,7 +182,7 @@ $tabsqlsort[6] ="a.type ASC, a.module ASC, a.position ASC, a.code ASC"; $tabsqlsort[7] ="country ASC, code ASC, a.libelle ASC"; $tabsqlsort[8] ="country DESC, libelle ASC"; $tabsqlsort[9] ="label ASC"; -$tabsqlsort[10]="country ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC"; +$tabsqlsort[10]="country ASC, code ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC"; $tabsqlsort[11]="element ASC, source ASC, code ASC"; $tabsqlsort[12]="sortorder ASC, code ASC"; $tabsqlsort[13]="code ASC"; @@ -214,7 +214,7 @@ $tabfield[6] = "code,libelle,type,color,position"; $tabfield[7] = "code,libelle,country,accountancy_code,deductible"; $tabfield[8] = "code,libelle,country_id,country"; $tabfield[9] = "code,label,unicode"; -$tabfield[10]= "country_id,country,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note"; +$tabfield[10]= "country_id,country,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note"; $tabfield[11]= "element,source,code,libelle"; $tabfield[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage,sortorder"; $tabfield[13]= "code,libelle,type,accountancy_code"; @@ -246,7 +246,7 @@ $tabfieldvalue[6] = "code,libelle,type,color,position"; $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible"; $tabfieldvalue[8] = "code,libelle,country"; $tabfieldvalue[9] = "code,label,unicode"; -$tabfieldvalue[10]= "country,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note"; +$tabfieldvalue[10]= "country,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note"; $tabfieldvalue[11]= "element,source,code,libelle"; $tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage,sortorder"; $tabfieldvalue[13]= "code,libelle,type,accountancy_code"; @@ -278,7 +278,7 @@ $tabfieldinsert[6] = "code,libelle,type,color,position"; $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible"; $tabfieldinsert[8] = "code,libelle,fk_country"; $tabfieldinsert[9] = "code_iso,label,unicode"; -$tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note"; +$tabfieldinsert[10]= "fk_pays,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note"; $tabfieldinsert[11]= "element,source,code,libelle"; $tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage,sortorder"; $tabfieldinsert[13]= "code,libelle,type,accountancy_code"; @@ -376,7 +376,7 @@ $tabhelp[6] = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs-> $tabhelp[7] = array('code'=>$langs->trans("EnterAnyCode")); $tabhelp[8] = array('code'=>$langs->trans("EnterAnyCode")); $tabhelp[9] = array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency")); -$tabhelp[10] = array('taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc")); +$tabhelp[10] = array('code'=>$langs->trans("EnterAnyCode"), 'taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc")); $tabhelp[11] = array(); $tabhelp[12] = array('code'=>$langs->trans("EnterAnyCode")); $tabhelp[13] = array('code'=>$langs->trans("EnterAnyCode")); @@ -486,7 +486,7 @@ if ($id == 25) 'shipping_send' => $langs->trans('MailToSendShipment'), 'fichinter_send' => $langs->trans('MailToSendIntervention'), - 'askpricesupplier_send' => $langs->trans('MailToSendSupplierRequestForQuotation'), + 'supplier_proposal_send' => $langs->trans('MailToSendSupplierRequestForQuotation'), 'order_supplier_send' => $langs->trans('MailToSendSupplierOrder'), 'invoice_supplier_send' => $langs->trans('MailToSendSupplierInvoice'), @@ -522,8 +522,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $ok=1; foreach ($listfield as $f => $value) { - if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory - if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory + if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory + if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType','DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue; if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue; if ($value == 'color' && empty($_POST['color'])) continue; @@ -1321,7 +1321,7 @@ if ($id) // Can an entry be erased or disabled ? $iserasable=1;$isdisable=1; // true by default - if (isset($obj->code)) + if (isset($obj->code) && $id != 10) { if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $isdisable = 0; } else if ($obj->code == 'RECEP') { $iserasable = 0; $isdisable = 0; } @@ -1356,7 +1356,7 @@ if ($id) print ""; // Modify link - if ($iserasable) print ''; + if ($iserasable) print ''; else print ''; // Delete link @@ -1479,7 +1479,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='') } // For state page, we do not show the country input (we link to region, not country) print ''; } elseif ($fieldlist[$field] == 'country_id') diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index a2b5a24c82a..6092a95d0b9 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -70,7 +70,8 @@ if ($action == "save") * View */ -llxHeader('',$langs->trans("Audit")); +$wikihelp='EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad'; +llxHeader('',$langs->trans("Audit"),$wikihelp); //$linkback=''.$langs->trans("BackToModuleList").''; print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 6907e30f979..af560e73c46 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -56,24 +56,28 @@ if (empty($conf->use_javascript_ajax)) $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module400Name'); } + +/* + * Action + */ + +if (GETPOST('cancel')) +{ + $action=''; +} + if ($action == 'update') { dolibarr_set_const($db, "MAIN_LANG_DEFAULT", $_POST["main_lang_default"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_MULTILANGS", $_POST["main_multilangs"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SIZE_SHORTLISTE_LIMIT", $_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"],'chaine',0,'',$conf->entity); - $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())))); + $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array())))); + if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity); + else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array())),'chaine',0,'',$conf->entity); + + $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())))); if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity); else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', join(',',colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())),'chaine',0,'',$conf->entity); @@ -81,7 +85,14 @@ if ($action == 'update') if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity); else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity); - /* + if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_del_const($db, "THEME_ELDY_USE_HOVER", $conf->entity); + else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity); + + $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array())))); + if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity); + else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', join(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array())),'chaine',0,'',$conf->entity); + + /* dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE", $_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity); @@ -91,15 +102,22 @@ if ($action == 'update') dolibarr_set_const($db, "MAIN_SEARCHFORM_EMPLOYEE", $_POST["MAIN_SEARCHFORM_EMPLOYEE"],'chaine',0,'',$conf->entity); */ + dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SIZE_SHORTLISTE_LIMIT", $_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK", $_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0); // Param for all entities dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", $_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0); // Param for all entities dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", $_POST["MAIN_BUGTRACK_ENABLELINK"],'chaine',0,'',$conf->entity); - if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_del_const($db, "THEME_ELDY_USE_HOVER", $conf->entity); - else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity); - // This one is not always defined if (isset($_POST["MAIN_USE_PREVIEW_TABS"])) dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["MAIN_USE_PREVIEW_TABS"],'chaine',0,'',$conf->entity); @@ -199,16 +217,6 @@ if ($action == 'edit') // Edit print ''; print ''; - // Activate FileCache - Developement - if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) { - $var=!$var; - print ''; - print ''; - print ''; - } - // Max size of lists $var=!$var; print ''; @@ -327,11 +335,12 @@ if ($action == 'edit') // Edit print '
'; - print ''; + print ''; + print '   '; + print ''; print '
'; print ''; - print '
'; } else // Show { @@ -393,14 +402,6 @@ else // Show print ''; print ""; - // Activate FileCache - Developement - if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) { - $var=!$var; - print ''; - print ''; - print ""; - } - $var=!$var; print ''; print ''; @@ -505,7 +506,6 @@ else // Show print '
'; print ''.$langs->trans("Modify").''; print '
'; - print '
'; } diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 271605830bc..b084f21164c 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -152,7 +152,8 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE $subject = $_POST['subject']; $body = $_POST['message']; $deliveryreceipt= $_POST["deliveryreceipt"]; - + $trackid = GETPOST('trackid'); + //Check if we have to decode HTML if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($body, ENT_COMPAT | ENT_HTML401))) { $body=dol_html_entity_decode($body, ENT_COMPAT | ENT_HTML401); @@ -202,7 +203,9 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE $sendtoccc, $deliveryreceipt, $msgishtml, - $errors_to + $errors_to, + '', + $trackid ); $result=$mailfile->sendfile(); @@ -693,6 +696,7 @@ else $formmail = new FormMail($db); $formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM); + $formmail->trackid='test'; $formmail->withfromreadonly=0; $formmail->withsubstit=0; $formmail->withfrom=1; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 14c95aa0d2e..25868b7b2c2 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -37,6 +37,7 @@ $langs->load("admin"); $mode=GETPOST('mode', 'alpha')?GETPOST('mode', 'alpha'):(isset($_SESSION['mode'])?$_SESSION['mode']:0); $action=GETPOST('action','alpha'); $value=GETPOST('value', 'alpha'); +$page_y=GETPOST('page_y','int'); if (! $user->admin) accessforbidden(); @@ -67,7 +68,7 @@ if ($action == 'set' && $user->admin) { $result=activateModule($value); if ($result) setEventMessages($result, null, 'errors'); - header("Location: modules.php?mode=".$mode); + header("Location: modules.php?mode=".$mode.($page_y?'&page_y='.$page_y:'')); exit; } @@ -75,7 +76,7 @@ if ($action == 'reset' && $user->admin) { $result=unActivateModule($value); if ($result) setEventMessages($result, null, 'errors'); - header("Location: modules.php?mode=".$mode); + header("Location: modules.php?mode=".$mode.($page_y?'&page_y='.$page_y:'')); exit; } @@ -425,7 +426,7 @@ if ($mode != 'marketplace') } else { - print ''; + print ''; print img_picto($langs->trans("Activated"),'switch_on'); print ''; } @@ -488,7 +489,7 @@ if ($mode != 'marketplace') else { // Module non actif - print ''; + print ''; print img_picto($langs->trans("Disabled"),'switch_off'); print "\n"; } diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php index 66878753b46..2adf79a6174 100644 --- a/htdocs/admin/oauth.php +++ b/htdocs/admin/oauth.php @@ -43,8 +43,9 @@ if (!$user->admin) $action = GETPOST('action', 'alpha'); -// Supported OAUTH -$supportedoauth2array=array('OAUTH_GOOGLE_NAME'); +// Supported OAUTH (a provider is supported when a file xxx_oauth2callback.php is available into htdocs/core/modules/oauth) +$supportedoauth2array=array('OAUTH_GOOGLE_NAME'=>'google'); + // API access parameters OAUTH $list = array ( array( @@ -315,7 +316,7 @@ $var = true; foreach ($list as $key) { $supported=0; - if (in_array($key[0], $supportedoauth2array)) $supported=1; + if (in_array($key[0], array_keys($supportedoauth2array))) $supported=1; if (! $supported) continue; // show only supported print ''; @@ -325,7 +326,7 @@ foreach ($list as $key) if ($supported) { - $redirect_uri=$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php'; + $redirect_uri=$urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php'; $var = !$var; print ''; print ''; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index cf9dce45c08..aaf2f91688a 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -62,7 +62,8 @@ if ($action == 'remove') * View */ -llxHeader('',$langs->trans("DefaultRights")); +$wikihelp='EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad'; +llxHeader('',$langs->trans("DefaultRights"), $wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 080dafca744..4591c4636a8 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -79,7 +79,8 @@ if (GETPOST("action") == 'set_proxy') $form = new Form($db); -llxHeader('',$langs->trans("Proxy")); +$wikihelp='EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad'; +llxHeader('',$langs->trans("Proxy"), $wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index ea81e63305e..97cae20377c 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -187,7 +187,8 @@ if ($action == 'maj_pattern') */ $form = new Form($db); -llxHeader('',$langs->trans("Passwords")); +$wikihelp='EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad'; +llxHeader('',$langs->trans("Passwords"),$wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index d1237a8c734..1213a9b2238 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -109,7 +109,8 @@ else if ($action == 'delete') $form = new Form($db); -llxHeader('',$langs->trans("Files")); +$wikihelp='EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad'; +llxHeader('',$langs->trans("Files"),$wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index cd84962107d..ac0a1e883eb 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -87,7 +87,8 @@ else if ($action == 'updateform') $form = new Form($db); -llxHeader('',$langs->trans("Miscellaneous")); +$wikihelp='EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad'; +llxHeader('',$langs->trans("Miscellaneous"),$wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup'); diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/supplier_proposal.php similarity index 80% rename from htdocs/admin/askpricesupplier.php rename to htdocs/admin/supplier_proposal.php index 9afcd1a8f62..64122636a08 100644 --- a/htdocs/admin/askpricesupplier.php +++ b/htdocs/admin/supplier_proposal.php @@ -25,12 +25,12 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; $langs->load("admin"); $langs->load("errors"); $langs->load('other'); -$langs->load('askpricesupplier'); +$langs->load('supplier_proposal'); if (! $user->admin) accessforbidden(); @@ -38,7 +38,7 @@ $action = GETPOST('action','alpha'); $value = GETPOST('value','alpha'); $label = GETPOST('label','alpha'); $scandir = GETPOST('scandir','alpha'); -$type='askpricesupplier'; +$type='supplier_proposal'; /* * Actions @@ -46,9 +46,9 @@ $type='askpricesupplier'; $error=0; if ($action == 'updateMask') { - $maskconstaskpricesupplier=GETPOST('maskconstaskpricesupplier','alpha'); - $maskaskpricesupplier=GETPOST('maskaskpricesupplier','alpha'); - if ($maskconstaskpricesupplier) $res = dolibarr_set_const($db,$maskconstaskpricesupplier,$maskaskpricesupplier,'chaine',0,'',$conf->entity); + $maskconstsupplier_proposal=GETPOST('maskconstsupplier_proposal','alpha'); + $masksupplier_proposal=GETPOST('masksupplier_proposal','alpha'); + if ($maskconstsupplier_proposal) $res = dolibarr_set_const($db,$maskconstsupplier_proposal,$masksupplier_proposal,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; @@ -66,15 +66,15 @@ if ($action == 'specimen') { $modele=GETPOST('module','alpha'); - $askpricesupplier = new AskPriceSupplier($db); - $askpricesupplier->initAsSpecimen(); + $supplier_proposal = new SupplierProposal($db); + $supplier_proposal->initAsSpecimen(); // Search template files $file=''; $classname=''; $filefound=0; $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); foreach($dirmodels as $reldir) { - $file=dol_buildpath($reldir."core/modules/askpricesupplier/doc/pdf_".$modele.".modules.php"); + $file=dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php"); if (file_exists($file)) { $filefound=1; @@ -89,9 +89,9 @@ if ($action == 'specimen') $module = new $classname($db); - if ($module->write_file($askpricesupplier,$langs) > 0) + if ($module->write_file($supplier_proposal,$langs) > 0) { - header("Location: ".DOL_URL_ROOT."/document.php?modulepart=askpricesupplier&file=SPECIMEN.pdf"); + header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_proposal&file=SPECIMEN.pdf"); return; } else @@ -107,11 +107,11 @@ if ($action == 'specimen') } } -if ($action == 'set_ASKPRICESUPPLIER_DRAFT_WATERMARK') +if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK') { - $draft = GETPOST('ASKPRICESUPPLIER_DRAFT_WATERMARK','alpha'); + $draft = GETPOST('SUPPLIER_PROPOSAL_DRAFT_WATERMARK','alpha'); - $res = dolibarr_set_const($db, "ASKPRICESUPPLIER_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); if (! $res > 0) $error++; if (! $error) @@ -124,11 +124,11 @@ if ($action == 'set_ASKPRICESUPPLIER_DRAFT_WATERMARK') } } -if ($action == 'set_ASKPRICESUPPLIER_FREE_TEXT') +if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT') { - $freetext = GETPOST('ASKPRICESUPPLIER_FREE_TEXT'); // No alpha here, we want exact string + $freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT'); // No alpha here, we want exact string - $res = dolibarr_set_const($db, "ASKPRICESUPPLIER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; @@ -142,9 +142,9 @@ if ($action == 'set_ASKPRICESUPPLIER_FREE_TEXT') } } -if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER') +if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL') { - $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER",$value,'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL",$value,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; @@ -198,15 +198,15 @@ else if ($action == 'del') $ret = delDocumentModel($value, $type); if ($ret > 0) { - if ($conf->global->ASKPRICESUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'ASKPRICESUPPLIER_ADDON_PDF',$conf->entity); + if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF',$conf->entity); } } else if ($action == 'setdoc') { - if (dolibarr_set_const($db, "ASKPRICESUPPLIER_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) + if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) { - $conf->global->ASKPRICESUPPLIER_ADDON_PDF = $value; + $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF = $value; } // On active le modele @@ -222,7 +222,7 @@ else if ($action == 'setmod') // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated - dolibarr_set_const($db, "ASKPRICESUPPLIER_ADDON",$value,'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON",$value,'chaine',0,'',$conf->entity); } @@ -233,23 +233,23 @@ else if ($action == 'setmod') $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); -llxHeader('',$langs->trans("AskPriceSupplierSetup")); +llxHeader('',$langs->trans("SupplierProposalSetup")); $form=new Form($db); //if ($mesg) print $mesg; $linkback=''.$langs->trans("BackToModuleList").''; -print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SupplierProposalSetup"),$linkback,'title_setup'); -$head = askpricesupplier_admin_prepare_head(); +$head = supplier_proposal_admin_prepare_head(); -dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'askpricesupplier'); +dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'supplier_proposal'); /* * Module numerotation */ -print load_fiche_titre($langs->trans("AskPriceSupplierNumberingModules"),'',''); +print load_fiche_titre($langs->trans("SupplierProposalNumberingModules"),'',''); print '
'.img_edit().''.img_edit().' '; $fieldname='country'; - print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28); + print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth300'); print ' 
'.$langs->trans("EnableFileCache").''; - print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1); - print ' 
'.$langs->trans("DefaultMaxSizeList").' 
'.$langs->trans("EnableFileCache").'' . yn($conf->global->MAIN_ACTIVATE_FILECACHE) . ' 
'.$langs->trans("DefaultMaxSizeList").'' . $conf->global->MAIN_SIZE_LISTE_LIMIT . ' 
'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'
'; print ''; @@ -263,7 +263,7 @@ print ''."\n"; clearstatcache(); foreach ($dirmodels as $reldir) { - $dir = dol_buildpath($reldir."core/modules/askpricesupplier/"); + $dir = dol_buildpath($reldir."core/modules/supplier_proposal/"); if (is_dir($dir)) { @@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir) while (($file = readdir($handle))!==false) { - if (substr($file, 0, 21) == 'mod_askpricesupplier_' && substr($file, dol_strlen($file)-3, 3) == 'php') + if (substr($file, 0, 21) == 'mod_supplier_proposal_' && substr($file, dol_strlen($file)-3, 3) == 'php') { $file = substr($file, 0, dol_strlen($file)-4); @@ -302,7 +302,7 @@ foreach ($dirmodels as $reldir) print ''."\n"; print ''; - $askpricesupplier=new AskPriceSupplier($db); - $askpricesupplier->initAsSpecimen(); + $supplier_proposal=new SupplierProposal($db); + $supplier_proposal->initAsSpecimen(); // Info $htmltooltip=''; $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
'; - $nextval=$module->getNextValue($mysoc,$askpricesupplier); + $nextval=$module->getNextValue($mysoc,$supplier_proposal); if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval $htmltooltip.=''.$langs->trans("NextValue").': '; if ($nextval) { @@ -351,7 +351,7 @@ print "
'; - if ($conf->global->ASKPRICESUPPLIER_ADDON == "$file") + if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file") { print img_picto($langs->trans("Activated"),'switch_on'); } @@ -314,13 +314,13 @@ foreach ($dirmodels as $reldir) } print '

\n"; * Document templates generators */ -print load_fiche_titre($langs->trans("AskPriceSupplierPDFModules"),'',''); +print load_fiche_titre($langs->trans("SupplierProposalPDFModules"),'',''); // Load array def with activated templates $def = array(); @@ -394,7 +394,7 @@ foreach ($dirmodels as $reldir) { foreach (array('','/doc') as $valdir) { - $dir = dol_buildpath($reldir."core/modules/askpricesupplier".$valdir); + $dir = dol_buildpath($reldir."core/modules/supplier_proposal".$valdir); if (is_dir($dir)) { @@ -452,7 +452,7 @@ foreach ($dirmodels as $reldir) // Defaut print "		"; - if ($conf->global->ASKPRICESUPPLIER_ADDON_PDF == "$name") + if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"),'on'); } @@ -526,10 +526,10 @@ print "
'; -print $langs->trans("FreeLegalTextOnAskPriceSupplier").' ('.$langs->trans("AddCRIfTooLong").')
'; -$variablename='ASKPRICESUPPLIER_FREE_TEXT'; +print $langs->trans("FreeLegalTextOnSupplierProposal").' ('.$langs->trans("AddCRIfTooLong").')
'; +$variablename='SUPPLIER_PROPOSAL_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { print ''; @@ -548,10 +548,10 @@ print ''; $var=!$var; print "
"; print ''; -print ""; +print ""; print '
'; -print $langs->trans("WatermarkOnDraftAskPriceSupplier").'
'; -print ''; +print $langs->trans("WatermarkOnDraftSupplierProposal").'
'; +print ''; print '		'; print ''; print "
'; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER").' '; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").' '; if (! empty($conf->use_javascript_ajax)) { - print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER'); + print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL'); } else { - if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER)) + if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL)) { - print ''.img_picto($langs->trans("Disabled"),'switch_off').''; + print ''.img_picto($langs->trans("Disabled"),'switch_off').''; } else { - print ''.img_picto($langs->trans("Enabled"),'switch_on').''; + print ''.img_picto($langs->trans("Enabled"),'switch_on').''; } } print '
'; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER").' '.$langs->trans('NotAvailable').'
 '.$langs->trans('NotAvailable').'
'; @@ -601,7 +601,7 @@ print "
".$langs->trans("Name")."".$langs->trans("Value")."
".$langs->trans("PathDirectory")."".$conf->askpricesupplier->dir_output."
".$langs->trans("PathDirectory")."".$conf->supplier_proposal->dir_output."
\n
"; $db->close(); diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index 85ea8501107..f76762c8334 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -100,7 +100,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); $head=user_admin_prepare_head(); -dol_fiche_head($head,'card', $langs->trans("User"), 0, 'user'); +dol_fiche_head($head,'card', $langs->trans("MenuUsersAndGroups"), 0, 'user'); print ''; print ''; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index b2669740f38..955e8d9e0f1 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1173,7 +1173,7 @@ if ($id > 0) } // Title - print ''; + print ''; // Full day event print ''; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index acee9c38374..55dd28d8029 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -189,6 +189,7 @@ class ActionComm extends CommonObject // Check parameters if (empty($this->userownerid)) { + dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING); $this->errors[]='ErrorPropertyUserowneridNotDefined'; return -1; } diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index dd2bd1dd9c3..9b466e3d9b7 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -87,7 +87,9 @@ $pid=GETPOST("projectid","int",3); $status=GETPOST("status"); $type=GETPOST("type"); $maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW); -$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':''); +$actioncode=GETPOST("actioncode","array",3) ? GETPOST("actioncode","array",3):(GETPOST("actioncode")=='0'?'0':''); +if(is_array($actioncode))$actioncode =implode(',', $actioncode); + if ($actioncode == '') $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE); if ($status == '' && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS); @@ -437,7 +439,7 @@ if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resour if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element"; $sql.= ' WHERE a.fk_action = ca.id'; $sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')'; -if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'"; +if ($actioncode) $sql.=" AND ca.code IN ('".implode("','", explode(',',$actioncode))."')"; if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid); if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")"; if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid; diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index eb3c51b1760..edb5042e358 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -106,7 +106,7 @@ if ($action == 'add' || $action == 'update') } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $action='create'; } } @@ -147,7 +147,7 @@ if ($action == 'add' || $action == 'update') else { $reload = 0; - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $action= "edit"; } } diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index b874eeefde5..0045316d419 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -105,7 +105,7 @@ if (empty($reshook)) $result=$object->fetch($id); $object->code_compta=$_POST["customeraccountancycode"]; $result=$object->update($object->id,$user,1,1,0); - if ($result < 0) setEventMessage($object->error,$object->errors,'errors'); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // conditions de reglement @@ -113,7 +113,7 @@ if (empty($reshook)) { $object->fetch($id); $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int')); - if ($result < 0) setEventMessage($object->error,$object->errors,'errors'); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // mode de reglement @@ -121,7 +121,7 @@ if (empty($reshook)) { $object->fetch($id); $result=$object->setPaymentMethods(GETPOST('mode_reglement_id','int')); - if ($result < 0) setEventMessage($object->error,$object->errors,'errors'); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // assujetissement a la TVA @@ -130,7 +130,7 @@ if (empty($reshook)) $object->fetch($id); $object->tva_assuj=$_POST['assujtva_value']; $result=$object->update($object->id); - if ($result < 0) setEventMessage($object->error,$object->errors,'errors'); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // set prospect level @@ -139,7 +139,7 @@ if (empty($reshook)) $object->fetch($id); $object->fk_prospectlevel=GETPOST('prospect_level_id','alpha'); $result=$object->set_prospect_level($user); - if ($result < 0) setEventMessage($object->error,$object->errors,'errors'); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // set communication status @@ -148,7 +148,7 @@ if (empty($reshook)) $object->fetch($id); $object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm'); $result=$object->set_commnucation_level($user); - if ($result < 0) setEventMessages($object->error,$object->errors,'errors'); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // update outstandng limit @@ -157,7 +157,7 @@ if (empty($reshook)) $object->fetch($id); $object->outstanding_limit=GETPOST('outstanding_limit'); $result=$object->set_OutstandingBill($user); - if ($result < 0) setEventMessage($object->error,$object->errors,'errors'); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } } diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 2a892033865..e54aeb1c8a5 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -359,7 +359,7 @@ if (empty($reshook)) { $statut=2; // Status 'sent partially' (because at least one error) if ($nbok > 0) setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs'); - else setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs'); + else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs'); } else { diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 408d01d8eaa..1ef9953a6d9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -6,7 +6,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2010-2011 Philippe Grand + * Copyright (C) 2010-2015 Philippe Grand * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013-2014 Florian Henry @@ -131,7 +131,7 @@ if (empty($reshook)) { if (! GETPOST('socid', 3)) { - setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors'); + setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); } else { @@ -141,7 +141,7 @@ if (empty($reshook)) header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result); exit(); } else { - if (count($object->errors) > 0) setEventMessage($object->errors, 'errors'); + if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors'); $action = ''; } } @@ -157,7 +157,7 @@ if (empty($reshook)) exit(); } else { $langs->load("errors"); - setEventMessage($langs->trans($object->error), 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -211,8 +211,8 @@ if (empty($reshook)) } } else { $langs->load("errors"); - if (count($object->errors) > 0) setEventMessage($object->errors, 'errors'); - else setEventMessage($langs->trans($object->error), 'errors'); + if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors'); + else setEventMessages($langs->trans($object->error), null, 'errors'); } } @@ -318,7 +318,7 @@ if (empty($reshook)) $id = $object->create_from($user); } else { - setEventMessage($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_propal')), 'errors'); + setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_propal')), null, 'errors'); } } else { $object->ref = GETPOST('ref'); @@ -507,7 +507,7 @@ if (empty($reshook)) if ($result < 0) { $error++; - setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors'); } } @@ -671,7 +671,7 @@ if (empty($reshook)) if ($object->id > 0) { $result = $object->insert_discount($_POST["remise_id"]); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -875,7 +875,7 @@ if (empty($reshook)) if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))) { $mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)); - setEventMessage($mesg, 'errors'); + setEventMessages($mesg, null, 'errors'); } else { // Insert line $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_options, $fk_unit); @@ -929,13 +929,13 @@ if (empty($reshook)) } else { $db->rollback(); - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } } - // Mise a jour d'une ligne dans la propale + // Update a line within proposal else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('save')) { // Define info_bits @@ -991,7 +991,7 @@ if (empty($reshook)) $label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : ''); if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) { - setEventMessage($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), 'errors'); + setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors'); $error ++; } } else { @@ -1040,7 +1040,7 @@ if (empty($reshook)) } else { $db->rollback(); - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -1137,9 +1137,9 @@ if (empty($reshook)) } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -1276,7 +1276,7 @@ if ($action == 'create') // Ref customer print ''; + print ''; print ''; // Third party @@ -1290,6 +1290,19 @@ if ($action == 'create') } else { print ''; } print '' . "\n"; @@ -1636,13 +1649,13 @@ if ($action == 'create') else if ($action == 'validate') { $error = 0; - // on verifie si l'objet est en numerotation provisoire + // We verifie whether the object is provisionally numbering $ref = substr($object->ref, 1, 4); if ($ref == 'PROV') { $numref = $object->getNextNumRef($soc); if (empty($numref)) { $error ++; - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else { $numref = $object->ref; @@ -2304,6 +2317,15 @@ if ($action == 'create') $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='pro'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'pro'.$object->id); + } $formmail->withfrom = 1; $liste = array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index fcac4ba9de1..9bb7a815d46 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -439,7 +439,8 @@ class Propal extends CommonObject // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type); $total_ht = $tabprice[0]; @@ -600,7 +601,8 @@ class Propal extends CommonObject // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -2739,7 +2741,7 @@ class Propal extends CommonObject if (! empty($this->total_ht)) $label.= '
' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_tva)) - $label.= '
' . $langs->trans('TVA') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); + $label.= '
' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_ttc)) $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 6a0a1076e62..544c5ab27e3 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Patrick Rouillon * Copyright (C) 2005-2009 Destailleur Laurent * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2012 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -54,12 +54,12 @@ if ($id > 0 || ! empty($ref)) if ($ret == 0) { $langs->load("errors"); - setEventMessage($langs->trans('ErrorRecordNotFound'), 'errors'); + setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors'); $error++; } else if ($ret < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $error++; } } @@ -75,7 +75,7 @@ else /* - * Ajout d'un nouveau contact + * Add a new contact */ if ($action == 'addcontact' && $user->rights->propale->creer) @@ -96,16 +96,16 @@ if ($action == 'addcontact' && $user->rights->propale->creer) if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } -// Bascule du statut d'un contact +// Toggle the status of a contact else if ($action == 'swapstatut' && $user->rights->propale->creer) { if ($object->id > 0) @@ -114,7 +114,7 @@ else if ($action == 'swapstatut' && $user->rights->propale->creer) } } -// Efface un contact +// Deletes a contact else if ($action == 'deletecontact' && $user->rights->propale->creer) { $result = $object->delete_contact($lineid); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 8bd5407ef03..2237f41b299 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -306,7 +306,7 @@ if ($result) $moreforfilter.=''; } // If the user can view prospects other than his' - if ($conf->categorie->enabled && $user->rights->produit->lire) + if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter.='
'; @@ -322,7 +322,7 @@ if ($result) print '
'; } - print '
'.$langs->trans("Title").''.$object->label.'
'.$langs->trans("Title").''.dol_htmlentities($object->label).'
'.$langs->trans("EventOnFullDay").''.yn($object->fulldayevent, 3).'
' . $langs->trans('RefCustomer') . ''; - print '
'; print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 1); + // reload page to retrieve customer informations + if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE)) + { + print ''; + } print '
'; + print '
'."\n"; print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index e472c5fb848..ba85d593fce 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -65,17 +65,17 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes') if (! $res > 0) { $error++; - setEventMessage($langs->trans("ErrorFailedToLoadDiscount"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToLoadDiscount"), null, 'errors'); } if (! $error && price2num($_POST["amount_ttc_1"]+$_POST["amount_ttc_2"]) != $discount->amount_ttc) { $error++; - setEventMessage($langs->trans("TotalOfTwoDiscountMustEqualsOriginal"), 'errors'); + setEventMessages($langs->trans("TotalOfTwoDiscountMustEqualsOriginal"), null, 'errors'); } if (! $error && $discount->fk_facture_line) { $error++; - setEventMessage($langs->trans("ErrorCantSplitAUsedDiscount"), 'errors'); + setEventMessages($langs->trans("ErrorCantSplitAUsedDiscount"), null, 'errors'); } if (! $error) { @@ -166,13 +166,13 @@ if ($action == 'setremise') else { $error++; - setEventMessage($soc->error, 'errors'); + setEventMessages($soc->error, $soc->errors, 'errors'); } } } else { - setEventMessage($langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")), 'errors'); + setEventMessages($langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")), null, 'errors'); } } @@ -194,7 +194,7 @@ if (GETPOST("action") == 'confirm_remove' && GETPOST("confirm")=='yes') } else { - setEventMessage($discount->error, 'errors'); + setEventMessages($discount->error, $discount->errors, 'errors'); $db->rollback(); } } @@ -216,7 +216,7 @@ if ($socid > 0) $object->fetch($socid); /* - * Affichage onglets + * Display tabs */ $head = societe_prepare_head($object); @@ -300,7 +300,7 @@ if ($socid > 0) } /* - * Liste remises fixes restant en cours (= liees a acune facture ni ligne de facture) + * Liste remises fixes restant en cours (= liees a aucune facture ni ligne de facture) */ $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,"; $sql.= " rc.datec as dc, rc.description,"; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index a3d30316522..da24e1360de 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -5,10 +5,10 @@ * Copyright (C) 2005-2015 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2011 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2012 Marcos García - * Copyright (C) 2012 Cedric Salvador + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Ferran Marcet * Copyright (C) 2015 Jean-François Ferry @@ -123,7 +123,7 @@ if (empty($reshook)) { if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers')) { - setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors'); + setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); } else { @@ -140,7 +140,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $object = $orig; $action=''; } @@ -156,12 +156,11 @@ if (empty($reshook)) $result = $object->set_reopen($user); if ($result > 0) { - header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); - exit; + setEventMessages($langs->trans('OrderReopened', $object->ref), null); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -177,7 +176,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -208,7 +207,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -225,7 +224,7 @@ if (empty($reshook)) $datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year')); if ($datecommande == '') { - setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors'); $action = 'create'; $error++; } @@ -374,11 +373,11 @@ if (empty($reshook)) if ($reshook < 0) $error++; } else { - setEventMessage($srcobject->error, 'errors'); + setEventMessages($srcobject->error, $srcobject->errors, 'errors'); $error++; } } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $error++; } } else { @@ -414,7 +413,7 @@ if (empty($reshook)) { $result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external'); if ($result < 0) { - setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors'); $error++; } } @@ -432,7 +431,7 @@ if (empty($reshook)) } else { $db->rollback(); $action = 'create'; - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -442,7 +441,7 @@ if (empty($reshook)) $ret=$object->classifyBilled(); if ($ret < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -471,7 +470,7 @@ if (empty($reshook)) $result = $object->set_date($user, $date); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -481,7 +480,7 @@ if (empty($reshook)) $result = $object->set_date_livraison($user, $datelivraison); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -529,16 +528,25 @@ if (empty($reshook)) elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) { $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); + if ($result < 0) { + setEventMessages($object->error, $object->errors, 'errors'); + } } // bank account else if ($action == 'setbankaccount' && $user->rights->commande->creer) { $result=$object->setBankAccount(GETPOST('fk_account', 'int')); + if ($result < 0) { + setEventMessages($object->error, $object->errors, 'errors'); + } } // shipping method else if ($action == 'setshippingmethod' && $user->rights->commande->creer) { $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int')); + if ($result < 0) { + setEventMessages($object->error, $object->errors, 'errors'); + } } else if ($action == 'setremisepercent' && $user->rights->commande->creer) { @@ -586,11 +594,11 @@ if (empty($reshook)) } if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) { - setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), 'errors'); + setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors'); $error++; } if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) { - setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors'); $error++; } if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) // Unit price can be 0 but not '' @@ -599,11 +607,11 @@ if (empty($reshook)) $error++; } if ($qty == '') { - setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors'); $error++; } if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) { - setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors'); $error++; } @@ -664,7 +672,7 @@ if (empty($reshook)) } else { - setEventMessage($prodcustprice->error,'errors'); + setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors'); } } @@ -748,7 +756,7 @@ if (empty($reshook)) if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))) { $mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)); - setEventMessage($mesg, 'errors'); + setEventMessages($mesg, null, 'errors'); } else { // Insert line $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $fk_unit); @@ -802,7 +810,7 @@ if (empty($reshook)) unset($_POST['date_endmonth']); unset($_POST['date_endyear']); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -866,7 +874,7 @@ if (empty($reshook)) $label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : ''); if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) { - setEventMessage($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), 'errors'); + setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors'); $error++; } } else { @@ -914,7 +922,7 @@ if (empty($reshook)) unset($_POST['fournprice']); unset($_POST['buying_price']); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -947,7 +955,7 @@ if (empty($reshook)) if (! $idwarehouse || $idwarehouse == -1) { $error++; - setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), null, 'errors'); $action=''; } } @@ -1000,7 +1008,7 @@ if (empty($reshook)) if (! $idwarehouse || $idwarehouse == -1) { $error++; - setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), null, 'errors'); $action=''; } } @@ -1032,7 +1040,7 @@ if (empty($reshook)) else if ($action == 'confirm_shipped' && $confirm == 'yes' && $user->rights->commande->cloturer) { $result = $object->cloture($user); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1059,7 +1067,7 @@ if (empty($reshook)) if (! $idwarehouse || $idwarehouse == -1) { $error++; - setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), null, 'errors'); $action=''; } } @@ -1068,7 +1076,7 @@ if (empty($reshook)) $result = $object->cancel($idwarehouse); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -1115,9 +1123,9 @@ if (empty($reshook)) $file = $upload_dir . '/' . GETPOST('file'); $ret = dol_delete_file($file, 0, 0, 0, $object); if ($ret) - setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); + setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs'); else - setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); $action = ''; } } @@ -1181,9 +1189,9 @@ if (empty($reshook)) } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -1241,8 +1249,10 @@ if ($action == 'create' && $user->rights->commande->creer) if ($socid > 0) $res = $soc->fetch($socid); - if (! empty($origin) && ! empty($originid)) - { + $projectid = 0; + $remise_absolue = 0; + + if (! empty($origin) && ! empty($originid)) { // Parse element/subelement (ex: project_task) $element = $subelement = $origin; if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) { @@ -1252,6 +1262,20 @@ if ($action == 'create' && $user->rights->commande->creer) if ($element == 'project') { $projectid = $originid; + + if (!$cond_reglement_id) { + $cond_reglement_id = $soc->cond_reglement_id; + } + if (!$mode_reglement_id) { + $mode_reglement_id = $soc->mode_reglement_id; + } + if (!$remise_percent) { + $remise_percent = $soc->remise_percent; + } + if (!$dateorder) { + // Do not set 0 here (0 for a date is 1970) + $dateorder = (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE_ODER)?-1:''):$dateorder); + } } else { // For compatibility if ($element == 'order' || $element == 'commande') { @@ -1338,10 +1362,10 @@ if ($action == 'create' && $user->rights->commande->creer) // Reference client print ''; else - print ''; + print ''; print ''; // Client @@ -1355,6 +1379,19 @@ if ($action == 'create' && $user->rights->commande->creer) } else { print ''; } print '' . "\n"; @@ -1515,9 +1552,23 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; print ''; - $newclassname = $classname; - if ($newclassname == 'Propal') - $newclassname = 'CommercialProposal'; + switch ($classname) { + case 'Propal': + $newclassname = 'CommercialProposal'; + break; + case 'Commande': + $newclassname = 'Order'; + break; + case 'Expedition': + $newclassname = 'Sending'; + break; + case 'Contrat': + $newclassname = 'Contract'; + break; + default: + $newclassname = $classname; + } + print ''; print ''; print '"; @@ -2394,6 +2445,15 @@ if ($action == 'create' && $user->rights->commande->creer) $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='ord'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id); + } $formmail->withfrom = 1; $liste = array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 3c0df82fc88..abff0a9c078 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1159,7 +1159,7 @@ class Commande extends CommonOrder { global $mysoc, $conf, $langs; - dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type, fk_unit=$fk_unit", LOG_DEBUG); + dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit", LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; @@ -1220,7 +1220,8 @@ class Commande extends CommonOrder // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type,'', $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -2442,7 +2443,8 @@ class Commande extends CommonOrder // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -2964,7 +2966,7 @@ class Commande extends CommonOrder if (! empty($this->total_ht)) $label.= '
' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_tva)) - $label.= '
' . $langs->trans('TVA') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); + $label.= '
' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_ttc)) $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 6a322e8681e..c72e040e61c 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Patrick Rouillon * Copyright (C) 2005-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2012 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,11 +69,11 @@ if ($action == 'addcontact' && $user->rights->commande->creer) if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 46ee8687fbb..0323bd4ec09 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -302,8 +302,8 @@ if ($resql) $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); $moreforfilter.=''; } - // If the user can view categories or products - if ($conf->categorie->enabled && $user->rights->produit->lire) + // If the user can view prospects other than his' + if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter.='
'; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 136ac6c1b89..1abffe069f4 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -74,7 +74,7 @@ if ($action == 'create') if (is_array($selected) == false) { $error++; - setEventMessage($langs->trans('Error_OrderNotChecked'), 'errors'); + setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors'); } else { @@ -251,7 +251,7 @@ if (($action == 'create' || $action == 'add') && !$error) } else { - setEventMessage($discount->error, 'errors'); + setEventMessages($discount->error, $discount->errors, 'errors'); $error++; break; } @@ -320,7 +320,7 @@ if (($action == 'create' || $action == 'add') && !$error) } else { - setEventMessage($objectsrc->error, 'errors'); + setEventMessages($objectsrc->error, $objectsrc->errors, 'errors'); $error++; } $ii++; @@ -328,7 +328,7 @@ if (($action == 'create' || $action == 'add') && !$error) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $error++; } } @@ -348,7 +348,7 @@ if (($action == 'create' || $action == 'add') && !$error) $action='create'; $_GET["origin"]=$_POST["origin"]; $_GET["originid"]=$_POST["originid"]; - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $error++; } } diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index e3bc2a3fc2c..d6f8652d31c 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -152,13 +152,13 @@ if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banqu $insertid = $object->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user); if ($insertid > 0) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); header("Location: ".$_SERVER['PHP_SELF']."?id=".$id."&action=addline"); exit; } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else @@ -378,19 +378,6 @@ if ($id > 0 || ! empty($ref)) { print '
'; - if ($object->type != 2 && $object->rappro) - { - // If not cash account and can be reconciliate - if ($user->rights->banque->consolidate) - { - print ''.$langs->trans("Conciliate").''; - } - else - { - print ''.$langs->trans("Conciliate").''; - } - } - if ($action != 'addline') { if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) @@ -409,6 +396,20 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("AddBankRecord").''; } } + + if ($object->type != 2 && $object->rappro) + { + // If not cash account and can be reconciliate + if ($user->rights->banque->consolidate) + { + print ''.$langs->trans("Conciliate").''; + } + else + { + print ''.$langs->trans("Conciliate").''; + } + } + print '
'; } diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 68ef0a42e32..7b53d775cb6 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -291,7 +291,7 @@ if ($result < 0) { $langs->load("errors"); $error++; - setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors'); } else { diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 063fee8ca78..fb8383cd91a 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2014-2015 Alexandre Spangaro - * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2015 Jean-François Ferry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -102,19 +102,19 @@ if ($_POST["action"] == 'add') if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number)) { - setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error'); + setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error'); $action='create'; // Force chargement page en mode creation $error++; } if (empty($account->ref)) { - setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors'); + setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors'); $action='create'; // Force chargement page en mode creation $error++; } if (empty($account->label)) { - setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors'); + setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors'); $action='create'; // Force chargement page en mode creation $error++; } @@ -130,7 +130,7 @@ if ($_POST["action"] == 'add') $_GET["id"]=$id; // Force chargement page en mode visu } else { - setEventMessage($account->error,'errors'); + setEventMessages($account->error, $account->errors, 'errors'); $action='create'; // Force chargement page en mode creation } } @@ -177,19 +177,19 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"]) if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number)) { - setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error'); + setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error'); $action='edit'; // Force chargement page en mode creation $error++; } if (empty($account->ref)) { - setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors'); + setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors'); $action='edit'; // Force chargement page en mode creation $error++; } if (empty($account->label)) { - setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors'); + setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors'); $action='edit'; // Force chargement page en mode creation $error++; } @@ -206,7 +206,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"]) } else { - setEventMessage($account->error, 'errors'); + setEventMessages($account->error, $account->errors, 'errors'); $action='edit'; // Force chargement page edition } } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index e8978310ca3..65661b3cce8 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -998,7 +998,12 @@ class Account extends CommonObject $link = ''; + } + if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' '); $result.=$link.$this->label.$linkend; return $result; diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index 0b588fa64d0..3b6957df40f 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -133,9 +133,9 @@ else if ($action == 'confirm_deletefile' && $confirm == 'yes') { $ret = dol_delete_file($file, 0, 0, 0, $object); if ($ret) { - setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); + setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs'); } else { - setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); } Header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id); diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 6f885e12bde..0764c87f5ab 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -81,7 +81,7 @@ if ($result < 0) { $langs->load("errors"); $error++; - setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors'); } else { @@ -113,7 +113,7 @@ else if ($mode == 'standard') { - // Chargement du tableau $amounts + // Loading table $amounts $amounts = array(); $monthnext = $month+1; @@ -153,7 +153,7 @@ else dol_print_error($db); } - // Calcul de $solde avant le debut du graphe + // Calculation of $solde before the start of the graph $solde = 0; $sql = "SELECT SUM(b.amount)"; @@ -265,7 +265,7 @@ else if ($mode == 'standard') { - // Chargement du tableau $amounts + // Loading table $amounts $amounts = array(); $sql = "SELECT date_format(b.datev,'%Y%m%d')"; $sql.= ", SUM(b.amount)"; @@ -296,7 +296,7 @@ else dol_print_error($db); } - // Calcul de $solde avant le debut du graphe + // Calculation of $solde before the start of the graph $solde = 0; $sql = "SELECT SUM(b.amount)"; @@ -403,7 +403,7 @@ else if ($mode == 'showalltime') { - // Chargement du tableau $amounts + // Loading table $amounts $amounts = array(); $sql = "SELECT date_format(b.datev,'%Y%m%d')"; diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 46b382ed080..7ea3bf1be5a 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -113,7 +113,7 @@ foreach ($accounts as $key=>$type) { $result=$acc->load_board($user,$acc->id); if ($result<0) { - setEventMessage($acc->error, 'errors'); + setEventMessages($acc->error, $acc->errors, 'errors'); } else { print $result->nbtodo; if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')'; @@ -229,7 +229,7 @@ foreach ($accounts as $key=>$type) { $result=$acc->load_board($user,$acc->id); if ($result<0) { - setEventMessage($acc->error, 'errors'); + setEventMessages($acc->error, $acc->errors, 'errors'); } else { print $result->nbtodo; if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')'; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index f1bb4eb9a62..0f73e5cb6cf 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Xavier DUTOIT - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2015 Alexandre Spangaro @@ -104,7 +104,7 @@ if ($user->rights->banque->modifier && $action == "update") if ($ac->courant == 2 && $_POST['value'] != 'LIQ') { - setEventMessage($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), 'errors'); + setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors'); $error++; } @@ -146,7 +146,7 @@ if ($user->rights->banque->modifier && $action == "update") $result = $db->query($sql); if ($result) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); $db->commit(); } else @@ -184,7 +184,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action == $result = $db->query($sql); if ($result) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); $db->commit(); } else @@ -205,7 +205,7 @@ $form = new Form($db); llxHeader(); -// On initialise la liste des categories +// The list of categories is initialized $sql = "SELECT rowid, label"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ"; $sql.= " ORDER BY label"; @@ -587,7 +587,7 @@ if ($result) if ($user->rights->banque->consolidate) { print '
'; } else diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 2bafa7e780e..82070a957e2 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -71,7 +71,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate) $result=$bankline->update_conciliation($user,$_POST["cat"]); if ($result < 0) { - setEventMessage($bankline->error, 'errors'); + setEventMessages($bankline->error, $bankline->errors, 'errors'); $error++; break; } @@ -83,7 +83,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate) { $error++; $langs->load("errors"); - setEventMessage($langs->trans("ErrorPleaseTypeBankTransactionReportName"), 'errors'); + setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors'); } if (! $error) @@ -186,7 +186,7 @@ if ($resql) print '
'; // Show last bank receipts - $nbmax=5; + $nbmax=15; // We accept to show last 15 receipts (so we can have more than one year) $liste=""; $sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank"; $sql.= " WHERE fk_account=".$acct->id." AND num_releve IS NOT NULL"; @@ -226,7 +226,7 @@ if ($resql) print ''; print ''.$langs->trans("InputReceiptNumber").': '; - print ''; + print ''; // The only default value is value we just entered print '
'; if ($options) { diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 9620b00098b..84c2edde0dd 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -157,6 +157,7 @@ if (empty($num)) } print ''; + print '

'; print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$object->id, $sortfield, $sortorder,'',$numrows); @@ -282,10 +283,15 @@ else $found=true; } - $mesprevnext ="id\">".img_previous()."  "; - $mesprevnext.= $langs->trans("AccountStatement")." $num"; - $mesprevnext.="   id\">".img_next().""; - print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0),$mesprevnext, 'title_bank.png'); + $mesprevnext=''; + $mesprevnext.=''; + print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0, 'receipts'), $mesprevnext, 'title_bank.png'); print '
'; print ""; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index b585f48565f..0fd5336af7e 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -179,19 +179,23 @@ if ($resql) print ''."\n"; print ''."\n"; + $moreforfilter = ''; + + $moreforfilter.='
'; $moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('StartDate') . ' '; $moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1); $moreforfilter .= ' - '; $moreforfilter .= $langs->trans('EndDate') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1); + $moreforfilter .= '
'; - - if ($moreforfilter) { + if ($moreforfilter) + { print '
'; print $moreforfilter; print '
'."\n"; } - print '
' . $langs->trans('RefCustomer') . ''; - if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER)) + if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && ! empty($origin) && ! empty($originid)) print '
'; print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1); + // reload page to retrieve customer informations + if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE)) + { + print ''; + } print '
' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1) . '
' . $langs->trans('TotalHT') . '' . price($objectsrc->total_ht) . '
' . $langs->trans('TotalVAT') . '' . price($objectsrc->total_tva) . "
'; - print 'rappro?' checked':'')).'">'; + print 'rappro?' checked="checked"':'')).'">'; print '
'."\n"; + print '
'."\n"; print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('DateOperationShort'),$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="center"',$sortfield,$sortorder); diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 38f6b94952e..cbdb769789f 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2008-2009 Laurent Destailleur (Eldy) * Copyright (C) 2008 Raphael Bertrand (Resultic) + * Copyright (C) 2015 Marcos García "; print ""; print ""; - if ($obj->total_ttc < 0) { print ""; }; + if ($obj->total_ttc < 0) { print ""; }; if ($obj->total_ttc >= 0) { print ""; }; print ''; print ""; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 56071d61f9b..4e323893d85 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -113,18 +113,18 @@ if ($action == 'add') if (! $error) { $mesgs = $langs->trans("TransferFromToDone","id."\">".$accountfrom->label."","id."\">".$accountto->label."",$amount,$langs->transnoentities("Currency".$conf->currency)); - setEventMessage($mesgs); + setEventMessages($mesgs, null, 'mesgs'); $db->commit(); } else { - setEventMessage($accountfrom->error.' '.$accountto->error, 'errors'); + setEventMessages($accountfrom->error.' '.$accountto->error, null, 'errors'); $db->rollback(); } } else { - setEventMessage($langs->trans("ErrorFromToAccountsMustDiffers"), 'errors'); + setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors'); } } } @@ -132,7 +132,7 @@ if ($action == 'add') /* - * Affichage + * View */ llxHeader(); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 69b95d16e03..e192d1e9d82 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -85,87 +85,6 @@ if (GETPOST("mode") != 'sconly') print "
"; } -// Payment Salary -if ($conf->salaries->enabled) -{ - if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') - { - $sal = new PaymentSalary($db); - - print load_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); - - $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary"; - $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u"; - $sql.= " WHERE s.entity IN (".getEntity('user',1).")"; - $sql.= " AND u.rowid = s.fk_user"; - if ($year > 0) - { - $sql.= " AND (s.datesp between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; - $sql.= " OR s.dateep between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."')"; - } - if (preg_match('/^s\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); - - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); - $i = 0; - $total = 0 ; - print '
".$ref."".$refcomp."".price($total_ttc)." ".price(abs($total_ttc))."  ".price($total_ttc)."'.price($solde).'
'; - print ''; - print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.dateep","",$param,'width="140px"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"s.rowid","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder); - print "\n"; - $var=1; - while ($i < $num) - { - $obj = $db->fetch_object($result); - - $total = $total + $obj->amount; - - $var=!$var; - print ""; - - print ''."\n"; - - print "\n"; - - print '"; - - // Ref payment - $sal_static->id=$obj->rowid; - $sal_static->ref=$obj->rowid; - print '\n"; - - print '\n"; - print '"; - print "\n"; - - $i++; - } - print ''; - print '"; - print ''; - print ''; - print '"; - print ""; - - print "
'.dol_print_date($db->jdate($obj->dateep),'day').'".$obj->label."'.($obj->salary?price($obj->salary):'')."'.$sal_static->getNomUrl(1)."'.dol_print_date($db->jdate($obj->datep),'day')."'.price($obj->amount)."
'.$langs->trans("Total").''."  '.price($total)."
"; - $db->free($result); - - print "
"; - } - else - { - dol_print_error($db); - } - } -} - if ($conf->tax->enabled) { @@ -356,7 +275,8 @@ if ($conf->tax->enabled) } } } -//localtax + +// Localtax if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { $j=1; @@ -460,6 +380,91 @@ while($j<$numlt) } + +// Payment Salary +if ($conf->salaries->enabled) +{ + if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') + { + $sal = new PaymentSalary($db); + + print '
'; + print load_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); + + $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u"; + $sql.= " WHERE s.entity IN (".getEntity('user',1).")"; + $sql.= " AND u.rowid = s.fk_user"; + if ($year > 0) + { + $sql.= " AND (s.datesp between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; + $sql.= " OR s.dateep between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."')"; + } + if (preg_match('/^s\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); + + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + $i = 0; + $total = 0 ; + print ''; + print ''; + print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.dateep","",$param,'width="140px"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"s.rowid","",$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder); + print "\n"; + $var=1; + while ($i < $num) + { + $obj = $db->fetch_object($result); + + $total = $total + $obj->amount; + + $var=!$var; + print ""; + + print ''."\n"; + + print "\n"; + + print '"; + + // Ref payment + $sal_static->id=$obj->rowid; + $sal_static->ref=$obj->rowid; + print '\n"; + + print '\n"; + print '"; + print "\n"; + + $i++; + } + print ''; + print '"; + print ''; + print ''; + print '"; + print ""; + + print "
'.dol_print_date($db->jdate($obj->dateep),'day').'".$obj->label."'.($obj->salary?price($obj->salary):'')."'.$sal_static->getNomUrl(1)."'.dol_print_date($db->jdate($obj->datep),'day')."'.price($obj->amount)."
'.$langs->trans("Total").''."  '.price($total)."
"; + $db->free($result); + + print "
"; + } + else + { + dol_print_error($db); + } + } +} + + + llxFooter(); $db->close(); diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index bc18d379a87..f2fcd490277 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -71,7 +71,7 @@ if ($action == 'validate' && $user->rights->deplacement->creer) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -89,7 +89,7 @@ else if ($action == 'classifyrefunded' && $user->rights->deplacement->creer) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -104,7 +104,7 @@ else if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->depl } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -150,7 +150,7 @@ else if ($action == 'add' && $user->rights->deplacement->creer) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $action='create'; } } @@ -190,7 +190,7 @@ else if ($action == 'update' && $user->rights->deplacement->creer) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else @@ -411,8 +411,8 @@ else if ($id) } else { - /* - * Confirmation de la suppression du deplacement + /* + * Confirm delete trip */ if ($action == 'delete') { diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 29788e14408..0a453db92db 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1401,12 +1401,12 @@ if (empty($reshook)) // Margin $fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : ''); - $buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we muste keep this value + $buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we must keep this value // Local Taxes - $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty); - $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty); - + $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc); + $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc); + $info_bits = 0; if ($tva_npr) $info_bits |= 0x01; @@ -1843,6 +1843,8 @@ if ($action == 'create') $res = $soc->fetch($socid); // Load objectsrc + $remise_absolue = 0; + if (! empty($origin) && ! empty($originid)) { // Parse element/subelement (ex: project_task) @@ -1854,6 +1856,20 @@ if ($action == 'create') if ($element == 'project') { $projectid = $originid; + + if (!$cond_reglement_id) { + $cond_reglement_id = $soc->cond_reglement_id; + } + if (!$mode_reglement_id) { + $mode_reglement_id = $soc->mode_reglement_id; + } + if (!$remise_percent) { + $remise_percent = $soc->remise_percent; + } + if (!$dateinvoice) { + // Do not set 0 here (0 for a date is 1970) + $dateinvoice = (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice); + } } else { // For compatibility if ($element == 'order' || $element == 'commande') { @@ -1898,7 +1914,6 @@ if ($action == 'create') $objectsrc->fetch_optionals($originid); $object->array_options = $objectsrc->array_options; } - $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? -1 : ''; // Dot not set 0 here (0 for a date is 1970) } else { @@ -1909,6 +1924,7 @@ if ($action == 'create') $remise_absolue = 0; $dateinvoice = (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice); // Do not set 0 here (0 for a date is 1970) } + $absolute_discount = $soc->getAvailableDiscounts(); if (! empty($conf->use_javascript_ajax)) @@ -1959,7 +1975,20 @@ if ($action == 'create') else { print '		'; - print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1); + print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 1); + // Option to reload page to retrieve customer informations. Note, this clear other input + if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE)) + { + print ''; + } print '
'; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index f01c288e29e..3f7aec9809f 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -70,7 +70,7 @@ if ($action == 'add') { if (! GETPOST('titre')) { - setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), 'errors'); + setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), null, 'errors'); $action = "create"; $error++; } @@ -88,13 +88,13 @@ if ($action == 'add') } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $action = "create"; } } } -// Suppression +// Delete if ($action == 'delete' && $user->rights->facture->supprimer) { $object->fetch($id); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 43160b68f99..3205427c811 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -318,7 +318,7 @@ if ($resql) $moreforfilter.=''; } // If the user can view prospects other than his' - if ($conf->categorie->enabled && $user->rights->produit->lire) + if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) { include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter.='
'; diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php index e0b821683ce..968ab8543c2 100644 --- a/htdocs/compta/facture/mergepdftool.php +++ b/htdocs/compta/facture/mergepdftool.php @@ -107,14 +107,14 @@ if ($action == 'presend' && GETPOST('sendmail')) if (!isset($user->email)) { $error++; - setEventMessage("NoSenderEmailDefined"); + setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings'); } $countToSend = count($_POST['toSend']); if (empty($countToSend)) { $error++; - setEventMessage("InvoiceNotChecked","warnings"); + setEventMessages($langs->trans("InvoiceNotChecked"), null, 'warnings'); } if (! $error) @@ -260,11 +260,11 @@ if ($action == 'presend' && GETPOST('sendmail')) if ($nbsent) { $action=''; // Do not show form post if there was at least one successfull sent - setEventMessage($nbsent. '/'.$countToSend.' '.$langs->trans("RemindSent")); + setEventMessages($nbsent. '/'.$countToSend.' '.$langs->trans("RemindSent"), null, 'mesgs'); } else { - setEventMessage($langs->trans("NoRemindSent"), 'warnings'); // May be object has no generated PDF file + setEventMessages($langs->trans("NoRemindSent"), null, 'warnings'); // May be object has no generated PDF file } } } @@ -349,16 +349,16 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s @chmod($file, octdec($conf->global->MAIN_UMASK)); $langs->load("exports"); - setEventMessage($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog'))); + setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs'); } else { - setEventMessage($langs->trans('NoPDFAvailableForChecked'),'errors'); + setEventMessages($langs->trans('NoPDFAvailableForChecked'), null, 'errors'); } } else { - setEventMessage($langs->trans('InvoiceNotChecked'), 'warnings'); + setEventMessages($langs->trans('InvoiceNotChecked'), null, 'warnings'); } } @@ -371,8 +371,8 @@ if ($action == 'remove_file') $upload_dir = $diroutputpdf; $file = $upload_dir . '/' . GETPOST('file'); $ret=dol_delete_file($file); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs'); + else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); $action=''; } @@ -574,6 +574,15 @@ if ($resql) $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='inv'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'inv'.$object->id); + } $formmail->withfrom=1; $liste=array(); $formmail->withto=$langs->trans("AllRecipientSelectedForRemind"); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 78a93d7da0d..47abb50fb8b 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -75,12 +75,12 @@ if ($action == "new") { $db->commit(); - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($object->error, $object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } $action=''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index fea0708e2a8..099a3063127 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -580,7 +580,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print '
'; print ''; print ''; - print ''; + print ''; print ''; if ($num) { diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 579d80ea919..b5140c54842 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -1,5 +1,6 @@ + * Copyright (C) 2015 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -104,7 +105,7 @@ if ($_GET["action"] == 'delete') if ($result > 0) { $db->commit(); - header("Location: ".DOL_URL_ROOT.'/compta/localtax/reglement.php'); + header("Location: ".DOL_URL_ROOT.'/compta/localtax/reglement.php?localTaxType='.$localtax->ltt); exit; } else diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 7466686239a..8c028b23aaa 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -415,7 +415,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''; diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 51a899c0748..ba65669aca4 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -3,8 +3,8 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2013 Marcos García - * Copyright (C) 2015 Juanjo Menent + * Copyright (C) 2013 Marcos García + * Copyright (C) 2015 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -66,7 +66,7 @@ if ($action == 'setnote' && $user->rights->facture->paiement) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } } @@ -86,7 +86,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture-> else { $langs->load("errors"); - setEventMessage($langs->trans($object->error), 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } } @@ -124,7 +124,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture-> else { $langs->load("errors"); - setEventMessage($langs->trans($object->error), 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } } @@ -135,11 +135,11 @@ if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement'])) $res = $object->update_num($_POST['num_paiement']); if ($res === 0) { - setEventMessage($langs->trans('PaymentNumberUpdateSucceeded')); + setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs'); } else { - setEventMessage($langs->trans('PaymentNumberUpdateFailed'), 'errors'); + setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors'); } } @@ -150,11 +150,11 @@ if ($action == 'setdatep' && ! empty($_POST['datepday'])) $res = $object->update_date($datepaye); if ($res === 0) { - setEventMessage($langs->trans('PaymentDateUpdateSucceeded')); + setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs'); } else { - setEventMessage($langs->trans('PaymentDateUpdateFailed'), 'errors'); + setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors'); } } diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 803787589fe..163f242b76d 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -79,12 +79,12 @@ if ($action == 'setdate' && $user->rights->banque->cheque) $result=$object->set_date($user,$date); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -98,12 +98,12 @@ if ($action == 'setrefext' && $user->rights->banque->cheque) $result=$object->setValueFrom('ref_ext', $ref_ext); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -117,12 +117,12 @@ if ($action == 'setref' && $user->rights->banque->cheque) $result=$object->set_number($user,$number); if ($result < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -154,12 +154,12 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else { - setEventMessage($langs->trans("ErrorSelectAtLeastOne")); + setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'mesgs'); $action='new'; } } @@ -175,7 +175,7 @@ if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banq } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -190,7 +190,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c } else { - setEventMessage($paiement->error, 'errors'); + setEventMessages($paiement->error, $paiement->errors, 'errors'); } } @@ -217,7 +217,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -230,7 +230,7 @@ if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->ban $paiement_id = $object->rejectCheck($rejected_check, $reject_date); if ($paiement_id > 0) { - setEventMessage($langs->trans("CheckRejectedAndInvoicesReopened")); + setEventMessages($langs->trans("CheckRejectedAndInvoicesReopened"), null, 'mesgs'); //header("Location: ".DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id); //exit; $action=''; @@ -282,8 +282,8 @@ else if ($action == 'remove_file' && $user->rights->banque->cheque) $file=$dir.get_exdir($object->number,0,1,0,$object,'cheque') . GETPOST('file'); $ret=dol_delete_file($file,0,0,0,$object); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('file'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), 'errors'); + if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs'); + else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors'); } } diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index d556a84a804..eb4ee3a2408 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -549,7 +549,7 @@ class Tva extends CommonObject $result = $this->db->query($sql); if ($result) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called paiementtva + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat' // Call trigger //XXX: Should be done just befor commit no ? diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index ee5c24f3017..d10e34227d6 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -122,6 +122,34 @@ $fieldstosearchall = array( 's.nom'=>"ThirdParty", ); +// Definition of fields for list +$arrayfields=array( + 'p.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), + 'p.firstname'=>array('label'=>$langs->trans("Firsname"), 'checked'=>1), + 'p.poste'=>array('label'=>$langs->trans("Post"), 'checked'=>1), + 'p.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0), + 'p.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0), + 'p.phone'=>array('label'=>$langs->trans("PhonePro"), 'checked'=>1), + 'p.phone_perso'=>array('label'=>$langs->trans("PhonePerso"), 'checked'=>0), + 'p.phone_mobile'=>array('label'=>$langs->trans("PhoneMobile"), 'checked'=>1), + 'p.fax'=>array('label'=>$langs->trans("Fax"), 'checked'=>1), + 'p.email'=>array('label'=>$langs->trans("Email"), 'checked'=>1), + 'p.skype'=>array('label'=>$langs->trans("Skype"), 'checked'=>1, 'enabled'=>(! empty($conf->skype->enabled))), + 'p.thirdparty'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>empty($conf->global->SOCIETE_DISABLE_CONTACTS)), + 'p.priv'=>array('label'=>$langs->trans("ContactVisibility"), 'checked'=>1, 'position'=>200), + 'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), + 'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), + 'p.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), +); +// Extra fields +if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) +{ + foreach($extrafields->attribute_label as $key => $val) + { + $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); + } +} + /* * Actions @@ -386,35 +414,10 @@ if ($result) print ''; } - $arrayfields=array( - 'p.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), - 'p.firstname'=>array('label'=>$langs->trans("Firsname"), 'checked'=>1), - 'p.poste'=>array('label'=>$langs->trans("Post"), 'checked'=>1), - 'p.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0), - 'p.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0), - 'p.phone'=>array('label'=>$langs->trans("PhonePro"), 'checked'=>1), - 'p.phone_perso'=>array('label'=>$langs->trans("PhonePerso"), 'checked'=>0), - 'p.phone_mobile'=>array('label'=>$langs->trans("PhoneMobile"), 'checked'=>1), - 'p.fax'=>array('label'=>$langs->trans("Fax"), 'checked'=>1), - 'p.email'=>array('label'=>$langs->trans("Email"), 'checked'=>1), - 'p.skype'=>array('label'=>$langs->trans("Skype"), 'checked'=>1, 'enabled'=>(! empty($conf->skype->enabled))), - 'p.thirdparty'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>empty($conf->global->SOCIETE_DISABLE_CONTACTS)), - 'p.priv'=>array('label'=>$langs->trans("ContactVisibility"), 'checked'=>1, 'position'=>200), - 'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), - 'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), - 'p.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), - ); - // Extra fields - if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) - { - foreach($extrafields->attribute_label as $key => $val) - { - $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); - } - } $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields - print '
'.$langs->trans("DateDue").''.$langs->trans("AmountTTC").''.$langs->trans("Paid").'  
'.$langs->trans('Date').''; $datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'') : $datepayment); - $form->select_date($datepayment,'','','',0,"add_paiement",1,1); + $form->select_date($datepayment,'','','',0,"add_paiement",1,1,0,0,'','',$facture->date); print ''.$langs->trans('Comments').'
'; + + print '
'; // Ligne des titres print ''; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index e38bb254f79..27fcee1dbeb 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1260,7 +1260,8 @@ class Contrat extends CommonObject // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -1441,7 +1442,8 @@ class Contrat extends CommonObject // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, $mysoc, $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index a4e83a0fd59..1f96d085bb8 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -221,11 +221,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $filename = $attachedfiles['names']; $mimetype = $attachedfiles['mimes']; - $trackid = GETPOST('trackid','aZ'); + $trackid = GETPOST('trackid','aZ09'); - if($conf->dolimail->enabled) + // Feature to push mail sent into Sent folder + if (! empty($conf->dolimail->enabled)) { - $mailfromid = explode ("#", $_POST['frommail'],3); + $mailfromid = explode("#", $_POST['frommail'],3); // $_POST['frommail'] = 'aaa#Sent# ' // TODO Use a better way to define Sent dir. if (count($mailfromid)==0) $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>'; else { @@ -243,7 +244,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO { $folder=str_replace($ref, '', $mailboxconfig->folder_cache_key); - if (!$folder) $folder = "Sent"; + if (!$folder) $folder = "Sent"; // Default Sent folder $mailboxconfig->mbox = imap_open($mailboxconfig->get_connector_url().$folder, $mailboxconfig->mailbox_imap_login, $mailboxconfig->mailbox_imap_password); if (FALSE === $mailboxconfig->mbox) @@ -276,17 +277,16 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO if ($result) { $error=0; - if($conf->dolimail->enabled) + if (! empty($conf->dolimail->enabled)) { - $mid = (GETPOST('mid','int') ? GETPOST('mid','int') : 0); + $mid = (GETPOST('mid','int') ? GETPOST('mid','int') : 0); // Original mail id is set ? if ($mid) { - // set imap flag answered if it is a answered mail - + // set imap flag answered if it is an answered mail $dolimail=new DoliMail($db); $dolimail->id = $mid; $res=$dolimail->set_prop($user, 'answered',1); - } + } if ($imap==1) { // write mail to IMAP Server diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php index 97f29c4069d..c0cd9ecfd70 100644 --- a/htdocs/core/ajax/contacts.php +++ b/htdocs/core/ajax/contacts.php @@ -50,7 +50,7 @@ if (! empty($id) && ! empty($action) && ! empty($htmlname)) $return=array(); if (empty($showempty)) $showempty=0; - $return['value'] = $form->selectcontacts($id,'','contactid',$showempty,'','',0,'',true); + $return['value'] = $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true); $return['num'] = $form->num; $return['error'] = $form->error; diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php index 10694adf8d7..6c91974b4a4 100644 --- a/htdocs/core/ajax/selectsearchbox.php +++ b/htdocs/core/ajax/selectsearchbox.php @@ -94,9 +94,9 @@ if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM { $arrayresult['searchintosupplierorder']=array('text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue)); } -if (! empty($conf->askpricesupplier->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->askpricesupplier->lire) +if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire) { - $arrayresult['searchintosupplierpropal']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/askpricesupplier/list.php?sall='.urlencode($search_boxvalue)); + $arrayresult['searchintosupplierpropal']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php?sall='.urlencode($search_boxvalue)); } if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire) diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index 9bf302b2e18..4e54b590955 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -96,12 +96,20 @@ class box_factures_fourn_imp extends ModeleBoxes { $objp = $db->fetch_object($result); $datelimite=$db->jdate($objp->datelimite); + $date=$db->jdate($objp->df); + $datem=$db->jdate($objp->tms); + $facturestatic->id = $objp->facid; + $facturestatic->ref = $objp->ref; + $facturestatic->total_ht = $objp->total_ht; + $facturestatic->total_tva = $objp->total_tva; + $facturestatic->total_ttc = $objp->total_ttc; + $facturestatic->date_echeance = $datelimite; + $facturestatic->statut = $objp->fk_statut; $thirdpartytmp->id = $objp->socid; - $thirdpartytmp->name = $objp->name; - $thirdpartytmp->code_client = $objp->code_client; + $thirdpartytmp->name = $objp->name; + $thirdpartytmp->fournisseur = 1; + $thirdpartytmp->code_fournisseur = $objp->code_fournisseur; $thirdpartytmp->logo = $objp->logo; - $facturestatic->date_echeance = $datelimite; - $facturestatic->statut = $objp->fk_statut; $late=''; if ($facturestatic->hasDelay()) { @@ -118,10 +126,9 @@ class box_factures_fourn_imp extends ModeleBoxes $this->info_box_contents[$line][] = array( 'td' => 'align="left"', - 'text' => ($objp->ref?$objp->ref:$objp->facid), + 'text' => $facturestatic->getNomUrl(1), 'text2'=> $late, - 'tooltip' => $tooltip, - 'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid, + 'asisi' => 1 ); $this->info_box_contents[$line][] = array( diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index b3da46ff366..82d1444ff73 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -708,8 +708,10 @@ class CMailFile $trackid = $this->trackid; if ($trackid) { - $out.= 'Message-ID: <' . time() . '.phpmail-'.$trackid.'@' . $host . ">" . $this->eol2; - $out.= 'references: <' . time() . '.phpmail-'.$trackid.'@' . $host . ">" . $this->eol2; + // References is kept in response and Message-ID is returned into In-Reply-To: + $out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'.$trackid.'@' . $host . ">" . $this->eol2; // Uppercase seems replaced by phpmail + $out.= 'References: <' . time() . '.phpmail-dolibarr-'.$trackid.'@' . $host . ">" . $this->eol2; + $out.= 'X-Dolibarr-TRACKID: '.$trackid. $this->eol2; } else { diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 907c9c7b46b..934eb672c7c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2183,7 +2183,7 @@ abstract class CommonObject if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva'; if ($this->element == 'propal') $fieldttc='total'; if ($this->element == 'expensereport') $fieldtva='total_tva'; - if ($this->element == 'askpricesupplier') $fieldttc='total'; + if ($this->element == 'supplier_proposal') $fieldttc='total'; if (empty($nodatabaseupdate)) { @@ -2394,8 +2394,8 @@ abstract class CommonObject else if ($objecttype == 'propal') { $classpath = 'comm/propal/class'; } - else if ($objecttype == 'askpricesupplier') { - $classpath = 'comm/askpricesupplier/class'; + else if ($objecttype == 'supplier_proposal') { + $classpath = 'supplier_proposal/class'; } else if ($objecttype == 'shipping') { $classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon'; @@ -2866,6 +2866,7 @@ abstract class CommonObject } else { + $this->errors[] = $this->db->lasterror(); return false; } } @@ -2903,6 +2904,7 @@ abstract class CommonObject } else { + $this->errors[] = $this->db->lasterror(); return -1; } } @@ -3044,9 +3046,9 @@ abstract class CommonObject // Description print ''; - if ($this->element == 'askpricesupplier') + if ($this->element == 'supplier_proposal') { - print ''; + print ''; } // VAT diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 53be6607f38..3aac36f3f37 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -193,6 +193,7 @@ class Conf { $modulename=strtolower($reg[1]); if ($modulename == 'propale') $modulename='propal'; + if ($modulename == 'supplierproposal') $modulename='supplier_proposal'; if (! isset($this->$modulename) || ! is_object($this->$modulename)) $this->$modulename=new stdClass(); $this->$modulename->enabled=true; $this->modules[]=$modulename; // Add this module in list of enabled modules @@ -418,7 +419,8 @@ class Conf // conf->mailing->email_from = email pour envoi par Dolibarr des mailings $this->mailing->email_from=$this->email_from; if (! empty($this->global->MAILING_EMAIL_FROM)) $this->mailing->email_from=$this->global->MAILING_EMAIL_FROM; - + if (! isset($conf->global->MAIN_EMAIL_ADD_TRACK_ID)) $conf->global->MAIN_EMAIL_ADD_TRACK_ID=1; + // Format for date (used by default when not found or not searched in lang) $this->format_date_short="%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions) $this->format_date_short_java="dd/MM/yyyy"; // Format of day with Java tags @@ -450,10 +452,10 @@ class Conf $this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : $this->global->MAIN_UPLOAD_DOC * 1024); // Define list of limited modules - if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,askpricesupplier,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later. + if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,supplier_proposal,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later. // Enable select2 - if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT)) $this->global->MAIN_USE_JQUERY_MULTISELECT='select2'; + if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT='select2'; // Timeouts if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT=10; diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index c53d1b793f3..645b50cb8bc 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -258,7 +258,7 @@ class ExtraFields if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname)) { - if(is_array($param) and count($param) > 0) + if(is_array($param) && count($param) > 0) { $params = $this->db->escape(serialize($param)); } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 822c43f3370..9f56fe507bb 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -76,7 +76,7 @@ class Form * @param string $htmlname Name of select field ('edit' prefix will be added) * @param string $preselected Name of Value to show/edit (not used in this function) * @param object $object Object - * @param boolean $perm Permission to allow button to edit parameter + * @param boolean $perm Permission to allow button to edit parameter. Set it to 0 to have a not edited field. * @param string $typeofdata Type of data ('string' by default, 'email', 'numeric:99', 'text' or 'textarea:rows:cols', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...) * @param string $moreparam More param to add on a href URL * @return string HTML edit field @@ -104,11 +104,11 @@ class Form } else { - $ret.='
'.$langs->trans('Description').''.$langs->trans("AskPriceSupplierRefFourn").''.$langs->trans("SupplierProposalRefFourn").'
'; + if (GETPOST('action') != 'edit'.$htmlname && $perm) $ret.=''; + if (GETPOST('action') != 'edit'.$htmlname && $perm) $ret.=''; if (GETPOST('action') != 'edit'.$htmlname && $perm) $ret.=''; - $ret.='
'; $ret.=$langs->trans($text); - $ret.='id.$moreparam.'">'.img_edit($langs->trans('Edit'),1).'
'; + if (GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='
'; } return $ret; @@ -3857,12 +3857,12 @@ class Form dol_syslog(__METHOD__, LOG_DEBUG); - $sql = "SELECT DISTINCT t.taux, t.recuperableonly"; + $sql = "SELECT DISTINCT t.code, t.taux, t.recuperableonly"; $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; $sql.= " WHERE t.fk_pays = c.rowid"; $sql.= " AND t.active > 0"; $sql.= " AND c.code IN (".$country_code.")"; - $sql.= " ORDER BY t.taux ASC, t.recuperableonly ASC"; + $sql.= " ORDER BY t.code ASC, t.taux ASC, t.recuperableonly ASC"; $resql=$this->db->query($sql); if ($resql) @@ -3873,8 +3873,9 @@ class Form for ($i = 0; $i < $num; $i++) { $obj = $this->db->fetch_object($resql); + $this->cache_vatrates[$i]['code'] = $obj->code; $this->cache_vatrates[$i]['txtva'] = $obj->taux; - $this->cache_vatrates[$i]['libtva'] = $obj->taux.'%'; + $this->cache_vatrates[$i]['libtva'] = $obj->taux.'%'.($obj->code?' ('.$obj->code.')':''); // Label must contains only 0-9 , . % or * $this->cache_vatrates[$i]['nprtva'] = $obj->recuperableonly; } @@ -3897,7 +3898,7 @@ class Form * Output an HTML select vat rate. * The name of this function should be selectVat. We keep bad name for compatibility purpose. * - * @param string $htmlname Name of html select field + * @param string $htmlname Name of HTML select field * @param float $selectedrate Force preselected vat rate. Use '' for no forcing. * @param Societe $societe_vendeuse Thirdparty seller * @param Societe $societe_acheteuse Thirdparty buyer @@ -3910,10 +3911,11 @@ class Form * Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle. * Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle. * Sinon la TVA proposee par defaut=0. Fin de regle. - * @param bool $options_only Return options only (for ajax treatment) + * @param bool $options_only Return HTML options lines only (for ajax treatment) + * @param int $addcode Add code into key in select list * @return string */ - function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false) + function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false, $addcode=0) { global $langs,$conf,$mysoc; @@ -4016,13 +4018,16 @@ class Form $return.= '		'; print $langs->trans("Type"); print '  '; - print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0)); + //select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0, $hideinfohelp=0, $multiselect=true) + print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), 0, 1); print '
'.$langs->trans("HighlightLinesOnMouseHover").'global->THEME_ELDY_USE_HOVER?" checked":"").'> '.$langs->trans("UsePersonalValue").''; - print '   ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; - print '
'.$langs->trans("HighlightLinesColor").''; - //print ''; - //print '   ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + { + /*$var=!$var; + print '
'.$langs->trans("TopMenuBackgroundColor").''.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'conf->THEME_ELDY_TOPMENU_BACK1)?" checked":""); + print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo + print '> '.$langs->trans("UsePersonalValue").''; if ($edit) { - if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb'; - else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),''); - print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' '; + print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' '; } else { - if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb'; - else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),''); - if ($color) print ''; - else print $langs->trans("None"); + $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''); + if ($color) print ''; + else print ''; } - print '   ('.$langs->trans("Default").': edf4fb, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; - print '
'.$langs->trans("BackgroundColor").''; + //var_dump($conf->global->THEME_ELDY_BACKBODY); + if ($edit) + { + print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' '; + } + else + { + $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''); + if ($color) print ''; + else print $langs->trans("Default"); + } + print '   ('.$langs->trans("Default").': ffffff, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + print '
'.$langs->trans("HighlightLinesOnMouseHover").'global->THEME_ELDY_USE_HOVER?" checked":"").'> '.$langs->trans("UsePersonalValue").''; + print '   ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + print '
'.$langs->trans("HighlightLinesColor").''; + //print ''; + //print '   ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + if ($edit) + { + if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb'; + else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),''); + print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' '; + } + else + { + if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb'; + else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),''); + if ($color) print ''; + else print $langs->trans("None"); + } + print '   ('.$langs->trans("Default").': edf4fb, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + print '
'.$langs->trans("TopMenuBackgroundColor").''.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'conf->THEME_ELDY_TOPMENU_BACK1)?" checked":""); + print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo + print '> '.$langs->trans("UsePersonalValue").''; + if ($edit) + { + print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' '; + } + else + { + $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''); + if ($color) print ''; + else print ''; + } + if ($edit) print '
('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + print '
'.$langs->trans("LinkColor").''; + if ($edit) + { + print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' '; + } + else + { + $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''); + if ($color) print ''; + else print $langs->trans("Default"); + } + print '   ('.$langs->trans("Default").': 000078, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + print '
'; } diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index 208ccd0c37c..71b93f8ee82 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -138,7 +138,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) $ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside) // But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have // dn detected into ldapUserDN. - if ($resultFetchLdapUser) $ldap->searchUser = $ldap->ldapUserDN; + if ($resultFetchLdapUser AND !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN; $ldap->searchPassword=$passwordtotest; // Test with this->seachUser and this->searchPassword diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index df0b9e46488..a75be746ad1 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -98,12 +98,12 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/list.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->productbatch->enabled', __HANDLER__, 'left', 2805__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassortlot.php?type=0', 'StocksByLotSerial', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 5, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 6, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/stats/card.php?id=all&leftmenu=stats&type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 6, __ENTITY__); -- Product - Services insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2900__+MAX_llx_menu__, 'products', 'service', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=service&type=1', 'Services', 0, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/card.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/list.php?leftmenu=service&type=1', 'List', 1, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=1', 'Statistics', 1, 'main', '$user->rights->service->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/stats/card.php?id=all&leftmenu=stats&type=1', 'Statistics', 1, 'main', '$user->rights->service->lire', '', 2, 5, __ENTITY__); -- Product - Stocks insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3100__+MAX_llx_menu__, 'products', 'stock', 3__+MAX_llx_menu__, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php index a7c701aaeff..ae173504ed6 100644 --- a/htdocs/core/menus/standard/auguria_menu.php +++ b/htdocs/core/menus/standard/auguria_menu.php @@ -157,9 +157,9 @@ class MenuManager /** * Show menu * - * @param string $mode 'top', 'left', 'jmobile' + * @param string $mode 'top', 'left', 'jmobile' * @param array $moredata An array with more data to output - * @return string + * @return int 0 or nb of top menu entries if $mode = 'topnb' */ function showmenu($mode, $moredata=null) { @@ -169,8 +169,8 @@ class MenuManager if ($this->type_user == 1) { - $conf->global->MAIN_SEARCHFORM_SOCIETE=0; - $conf->global->MAIN_SEARCHFORM_CONTACT=0; + $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1; + $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1; } require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php'; @@ -178,6 +178,13 @@ class MenuManager if ($mode == 'top') print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0); if ($mode == 'left') print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata); + + if ($mode == 'topnb') + { + print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1); + return $this->menu->getNbOfVisibleMenuEntries(); + } + if ($mode == 'jmobile') { print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 099d65f7f95..d26e8e44078 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -444,7 +444,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu print ''; print ''; print ''; print ''; print ''."\n"; @@ -672,11 +672,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("companies"); - // Propal + // Customer proposal if (! empty($conf->propal->enabled)) { $langs->load("propal"); - $newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Prop"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals'); + $newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Prop"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100); $newmenu->add("/comm/propal.php?action=create&leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer); $newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire); if (empty($leftmenu) || $leftmenu=="propals") $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire); @@ -692,7 +692,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->commande->enabled)) { $langs->load("orders"); - $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); + $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200); $newmenu->add("/commande/card.php?action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer); $newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire); if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire); @@ -708,7 +708,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->fournisseur->enabled)) { $langs->load("orders"); - $newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers'); + $newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400); $newmenu->add("/fourn/commande/card.php?action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer); $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire); @@ -729,7 +729,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->contrat->enabled)) { $langs->load("contracts"); - $newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts'); + $newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000); $newmenu->add("/contrat/card.php?action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer); $newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire); $newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire); @@ -743,7 +743,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->ficheinter->enabled)) { $langs->load("interventions"); - $newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 200); + $newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200); $newmenu->add("/fichinter/card.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201); $newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202); } @@ -1088,7 +1088,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } if (! empty($conf->propal->enabled)) { - $newmenu->add("/product/popuprop.php?leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire); + $newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire); } } @@ -1100,7 +1100,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/product/list.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->service->lire); if (! empty($conf->propal->enabled)) { - $newmenu->add("/product/popuprop.php?leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire); + $newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire); } } @@ -1400,6 +1400,17 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu //var_dump($menu_array);exit; if (! is_array($menu_array)) return 0; + // TODO Use the position property in menu_array to reorder the $menu_array + //var_dump($menu_array); + /*$new_menu_array = array(); + $level=0; $cusor=0; $position=0; + $nbentry = count($menu_array); + while (findNextEntryForLevel($menu_array, $cursor, $position, $level)) + { + + $cursor++; + }*/ + // Show menu $invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert"; if (empty($noout)) diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index 4326de6d98f..354f7de1453 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -113,7 +113,7 @@ class MenuManager * * @param string $mode 'top', 'left', 'jmobile' * @param array $moredata An array with more data to output - * @return string + * @return int 0 or nb of top menu entries if $mode = 'topnb' */ function showmenu($mode, $moredata=null) { @@ -123,8 +123,8 @@ class MenuManager if ($this->type_user == 1) { - $conf->global->MAIN_SEARCHFORM_SOCIETE=0; - $conf->global->MAIN_SEARCHFORM_CONTACT=0; + $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=0; + $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1; } require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php'; @@ -142,6 +142,12 @@ class MenuManager if ($mode == 'left') print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0); } + if ($mode == 'topnb') + { + print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1); + return $this->menu->getNbOfVisibleMenuEntries(); + } + if ($mode == 'jmobile') { print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1); @@ -238,6 +244,7 @@ class MenuManager unset($this->menu); //print 'xx'.$mode; + return 0; } } diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index e1b240a8e5e..60f9f3cec7f 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -62,7 +62,7 @@ class MenuManager * * @param string $mode 'top', 'left', 'jmobile' * @param array $moredata An array with more data to output - * @return string + * @return int 0 or nb of top menu entries if $mode = 'topnb' */ function showmenu($mode, $moredata=null) { @@ -78,6 +78,11 @@ class MenuManager $noout=0; if ($mode == 'jmobile') $noout=1; + if ($mode == 'topnb') + { + return 1; + } + if ($mode == 'top' || $mode == 'jmobile') { if (empty($noout)) print_start_menu_array_empty(); diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 62b42cd1608..114c3fc587a 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -182,7 +182,43 @@ class modCommande extends DolibarrModules $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them - + // Add extra fields + $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande' AND entity IN (0, ".$conf->entity.')'; + $resql=$this->db->query($sql); + if ($resql) // This can fail when class is used on old database (during migration for example) + { + while ($obj=$this->db->fetch_object($resql)) + { + $fieldname='extra.'.$obj->name; + $fieldlabel=ucfirst($obj->label); + $typeFilter="Text"; + switch($obj->type) + { + case 'int': + case 'double': + case 'price': + $typeFilter="Numeric"; + break; + case 'date': + case 'datetime': + $typeFilter="Date"; + break; + case 'boolean': + $typeFilter="Boolean"; + break; + case 'sellist': + $tmp=''; + $tmpparam=unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null + if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options'])); + if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp; + break; + } + $this->export_fields_array[$r][$fieldname]=$fieldlabel; + $this->export_TypeFields_array[$r][$fieldname]=$typeFilter; + $this->export_entities_array[$r][$fieldname]='order'; + } + } + // End add extra fields $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index 78fa9b53211..edf9ab671b2 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -175,7 +175,43 @@ class modPropale extends DolibarrModules $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them - + // Add extra fields + $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'propal' AND entity IN (0, ".$conf->entity.')'; + $resql=$this->db->query($sql); + if ($resql) // This can fail when class is used on old database (during migration for example) + { + while ($obj=$this->db->fetch_object($resql)) + { + $fieldname='extra.'.$obj->name; + $fieldlabel=ucfirst($obj->label); + $typeFilter="Text"; + switch($obj->type) + { + case 'int': + case 'double': + case 'price': + $typeFilter="Numeric"; + break; + case 'date': + case 'datetime': + $typeFilter="Date"; + break; + case 'boolean': + $typeFilter="Boolean"; + break; + case 'sellist': + $tmp=''; + $tmpparam=unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null + if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options'])); + if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp; + break; + } + $this->export_fields_array[$r][$fieldname]=$fieldlabel; + $this->export_TypeFields_array[$r][$fieldname]=$typeFilter; + $this->export_entities_array[$r][$fieldname]='propal'; + } + } + // End add extra fields $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s '; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modSupplierProposal.class.php similarity index 65% rename from htdocs/core/modules/modAskPriceSupplier.class.php rename to htdocs/core/modules/modSupplierProposal.class.php index 7c536e33a6f..98320a6f08b 100644 --- a/htdocs/core/modules/modAskPriceSupplier.class.php +++ b/htdocs/core/modules/modSupplierProposal.class.php @@ -21,11 +21,11 @@ */ /** - * \defgroup askpricesupplier Module askpricesupplier + * \defgroup supplier_proposal Module supplier_proposal * \brief Module to request supplier price proposals - * \file htdocs/core/modules/modAskPriceSupplier.class.php - * \ingroup askpricesupplier - * \brief File to describe and activate module AskPriceSupplier + * \file htdocs/core/modules/modSupplierProposal.class.php + * \ingroup supplier_proposal + * \brief File to describe and activate module SupplierProposal */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; @@ -33,7 +33,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * Class to describe and enable module AskPriceSupllier */ -class modAskPriceSupplier extends DolibarrModules +class modSupplierProposal extends DolibarrModules { /** @@ -50,43 +50,43 @@ class modAskPriceSupplier extends DolibarrModules $this->family = "products"; $this->name = preg_replace('/^mod/i','',get_class($this)); - $this->description = "askpricesupplierDESC"; + $this->description = "supplier_proposalDESC"; $this->version = 'experimental'; $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->special = 0; - $this->picto='askpricesupplier'; + $this->picto='supplier_proposal'; $this->dirs = array(); // Dependancies $this->depends = array('modFournisseur'); $this->requiredby = array(); - $this->config_page_url = array("askpricesupplier.php"); - $this->langfiles = array("askpricesupplier"); + $this->config_page_url = array("supplier_proposal.php"); + $this->langfiles = array("supplier_proposal"); // Constants $this->const = array(); $r=0; - $this->const[$r][0] = "ASKPRICESUPPLIER_ADDON_PDF"; + $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "aurore"; $this->const[$r][3] = 'Name of submodule to generate PDF for supplier quotation request'; $this->const[$r][4] = 0; $r++; - $this->const[$r][0] = "ASKPRICESUPPLIER_ADDON"; + $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON"; $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "mod_askpricesupplier_marbre"; + $this->const[$r][2] = "mod_supplier_proposal_marbre"; $this->const[$r][3] = 'Name of submodule to number supplier quotation request'; $this->const[$r][4] = 0; $r++; - $this->const[$r][0] = "ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH"; + $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH"; $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/askpricesupplier"; + $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal"; $this->const[$r][3] = ""; $this->const[$r][4] = 0; @@ -95,7 +95,7 @@ class modAskPriceSupplier extends DolibarrModules // Permissions $this->rights = array(); - $this->rights_class = 'askpricesupplier'; + $this->rights_class = 'supplier_proposal'; $r=0; $r++; @@ -142,40 +142,40 @@ class modAskPriceSupplier extends DolibarrModules $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=commercial', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'type'=>'left', // This is a Left menu entry - 'titre'=>'askpricesupplierMENU_LEFT_TITLE', - 'leftmenu'=>'askpricesuppliersubmenu', - 'url'=>'/comm/askpricesupplier/index.php', - 'langs'=>'askpricesupplier', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'enabled'=>'$conf->askpricesupplier->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'$user->rights->askpricesupplier->lire', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules + 'titre'=>'supplier_proposalMENU_LEFT_TITLE', + 'leftmenu'=>'supplier_proposalsubmenu', + 'url'=>'/supplier_proposal/index.php', + 'langs'=>'supplier_proposal', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. + 'enabled'=>'$conf->supplier_proposal->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. + 'perms'=>'$user->rights->supplier_proposal->lire', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules 'user'=>2, // 0=Menu for internal users, 1=external users, 2=both - 'position'=>30 + 'position'=>300 ); $r++; $this->menu[$r]=array( - 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=askpricesuppliersubmenu', + 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu', 'type'=>'left', - 'titre'=>'askpricesupplierMENU_LEFT_TITLE_NEW', - 'url'=>'/comm/askpricesupplier/card.php?action=create', - 'langs'=>'askpricesupplier', - 'enabled'=>'$conf->askpricesupplier->enabled', - 'perms'=>'$user->rights->askpricesupplier->creer', + 'titre'=>'supplier_proposalMENU_LEFT_TITLE_NEW', + 'url'=>'/supplier_proposal/card.php?action=create', + 'langs'=>'supplier_proposal', + 'enabled'=>'$conf->supplier_proposal->enabled', + 'perms'=>'$user->rights->supplier_proposal->creer', 'user'=>2, - 'position'=>31 + 'position'=>301 ); $r++; $this->menu[$r]=array( - 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=askpricesuppliersubmenu', + 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu', 'type'=>'left', - 'titre'=>'askpricesupplierMENU_LEFT_TITLE_LIST', - 'url'=>'/comm/askpricesupplier/list.php', - 'langs'=>'askpricesupplier', - 'enabled'=>'$conf->askpricesupplier->enabled', - 'perms'=>'$user->rights->askpricesupplier->lire', + 'titre'=>'supplier_proposalMENU_LEFT_TITLE_LIST', + 'url'=>'/supplier_proposal/list.php', + 'langs'=>'supplier_proposal', + 'enabled'=>'$conf->supplier_proposal->enabled', + 'perms'=>'$user->rights->supplier_proposal->lire', 'user'=>2, - 'position'=>32 + 'position'=>302 ); $r++; } @@ -197,9 +197,9 @@ class modAskPriceSupplier extends DolibarrModules $this->remove($options); //ODT template - $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/askpricesupplier/template_askpricesupplier.odt'; - $dirodt=DOL_DATA_ROOT.'/doctemplates/askpricesupplier'; - $dest=$dirodt.'/template_askpricesupplier.odt'; + $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt'; + $dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal'; + $dest=$dirodt.'/template_supplier_proposal.odt'; if (file_exists($src) && ! file_exists($dest)) { @@ -216,9 +216,29 @@ class modAskPriceSupplier extends DolibarrModules $sql = array( "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, - "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','askpricesupplier',".$conf->entity.")", + "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','supplier_proposal',".$conf->entity.")", ); return $this->_init($sql, $options); } + + + + /** + * Function called when module is disabled. + * Remove from database constants, boxes and permissions from Dolibarr database. + * Data directories are not deleted + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + public function remove($options = '') + { + $sql = array( + "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'" + ); + + return $this->_remove($sql, $options); + } + } \ No newline at end of file diff --git a/htdocs/core/modules/oauth/getgoogleoauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php similarity index 85% rename from htdocs/core/modules/oauth/getgoogleoauthcallback.php rename to htdocs/core/modules/oauth/google_oauthcallback.php index e159198314c..43232ed92f2 100644 --- a/htdocs/core/modules/oauth/getgoogleoauthcallback.php +++ b/htdocs/core/modules/oauth/google_oauthcallback.php @@ -24,10 +24,8 @@ require '../../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php'; -use OAuth\Common\Storage\Session; use OAuth\Common\Storage\DoliStorage; use OAuth\Common\Consumer\Credentials; -use OAuth\Common\Token\TokenInterface; use OAuth\OAuth2\Service\Google; // Define $urlwithroot @@ -72,11 +70,18 @@ $credentials = new Credentials( $currentUri->getAbsoluteUri() ); +$requestedpermissionsarray=array(); +if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back +if ($action != 'delete' && empty($requestedpermissionsarray)) +{ + print 'Error, parameter state is not defined'; + exit; +} +//var_dump($requestedpermissionsarray);exit; // Instantiate the Api service using the credentials, http client and storage mechanism for the token /** @var $apiService Service */ -// TODO remove hardcoded array -$apiService = $serviceFactory->createService('Google', $credentials, $storage, array('userinfo_email', 'userinfo_profile', 'cloud_print')); +$apiService = $serviceFactory->createService('Google', $credentials, $storage, $requestedpermissionsarray); // access type needed for google refresh token $apiService->setAccessType('offline'); @@ -129,11 +134,18 @@ if (! empty($_GET['code'])) // We are coming from Google oauth page header('Location: ' . $backtourl); exit(); } -else +else // If entry on page with no parameter, we arrive here { $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl; - $url = $apiService->getAuthorizationUri(); + if (GETPOST('state')) + { + $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state'))); + } + else + { + $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated + } // we go on google authorization page header('Location: ' . $url); exit(); diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index aab1ae13bb6..7c6e965f778 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -113,18 +113,20 @@ class printing_printgcp extends PrintingDriver if ($this->google_id != '' && $this->google_secret != '') { $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info'); - $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info'); + $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info', 'renew'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'delete'=>($storage->hasAccessToken('Google')?$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'):'')); if ($token_ok) { $refreshtoken = $token->getRefreshToken(); - $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_REFRESH', 'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info'); - $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRED', 'info'=>($expire?'Yes':'No'), 'type'=>'info'); + $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_REFRESH', 'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info'); + $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRED', 'info'=>($expire?'Yes':'No'), 'type'=>'info'); $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(dol_print_date($token->getEndOfLife(), "dayhour")), 'type'=>'info'); } - if (!$storage->hasAccessToken('Google')) { + /* + if ($storage->hasAccessToken('Google')) { $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink'); - } else { $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete'); - } + } else { + $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink'); + }*/ } else { $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info'); } diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php index 4a8839ef865..11b1d378981 100644 --- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php +++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php @@ -94,8 +94,8 @@ class pdf_beluga extends ModelePDFProjects $this->posxref=$this->marge_gauche+1; $this->posxdate=$this->marge_gauche+25; $this->posxsociety=$this->marge_gauche+45; - $this->posxamountht=$this->marge_gauche+115; - $this->posxamountttc=$this->marge_gauche+140; + $this->posxamountht=$this->marge_gauche+110; + $this->posxamountttc=$this->marge_gauche+135; $this->posxstatut=$this->marge_gauche+165; } @@ -231,14 +231,16 @@ class pdf_beluga extends ModelePDFProjects 'class'=>'Propal', 'table'=>'propal', 'datefieldname'=>'datep', - 'test'=>$conf->propal->enabled && $user->rights->propale->lire), + 'test'=>$conf->propal->enabled && $user->rights->propale->lire, + 'lang'=>'propal'), 'order'=>array( 'name'=>"CustomersOrders", 'title'=>"ListOrdersAssociatedProject", 'class'=>'Commande', 'table'=>'commande', 'datefieldname'=>'date_commande', - 'test'=>$conf->commande->enabled && $user->rights->commande->lire), + 'test'=>$conf->commande->enabled && $user->rights->commande->lire, + 'lang'=>'order'), 'invoice'=>array( 'name'=>"CustomersInvoices", 'title'=>"ListInvoicesAssociatedProject", @@ -246,21 +248,24 @@ class pdf_beluga extends ModelePDFProjects 'margin'=>'add', 'table'=>'facture', 'datefieldname'=>'datef', - 'test'=>$conf->facture->enabled && $user->rights->facture->lire), + 'test'=>$conf->facture->enabled && $user->rights->facture->lire, + 'lang'=>'bills'), 'invoice_predefined'=>array( 'name'=>"PredefinedInvoices", 'title'=>"ListPredefinedInvoicesAssociatedProject", 'class'=>'FactureRec', 'table'=>'facture_rec', 'datefieldname'=>'datec', - 'test'=>$conf->facture->enabled && $user->rights->facture->lire), + 'test'=>$conf->facture->enabled && $user->rights->facture->lire, + 'lang'=>'bills'), 'order_supplier'=>array( 'name'=>"SuppliersOrders", 'title'=>"ListSupplierOrdersAssociatedProject", 'class'=>'CommandeFournisseur', 'table'=>'commande_fournisseur', 'datefieldname'=>'date_commande', - 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire), + 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire, + 'lang'=>'orders'), 'invoice_supplier'=>array( 'name'=>"BillsSuppliers", 'title'=>"ListSupplierInvoicesAssociatedProject", @@ -268,14 +273,16 @@ class pdf_beluga extends ModelePDFProjects 'margin'=>'minus', 'table'=>'facture_fourn', 'datefieldname'=>'datef', - 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire), + 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire, + 'lang'=>'bills'), 'contract'=>array( 'name'=>"Contracts", 'title'=>"ListContractAssociatedProject", 'class'=>'Contrat', 'table'=>'contrat', 'datefieldname'=>'date_contrat', - 'test'=>$conf->contrat->enabled && $user->rights->contrat->lire), + 'test'=>$conf->contrat->enabled && $user->rights->contrat->lire, + 'lang'=>'contract'), 'intervention'=>array( 'name'=>"Interventions", 'title'=>"ListFichinterAssociatedProject", @@ -283,7 +290,8 @@ class pdf_beluga extends ModelePDFProjects 'table'=>'fichinter', 'datefieldname'=>'date_valid', 'disableamount'=>1, - 'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire), + 'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire, + 'lang'=>'interventions'), 'trip'=>array( 'name'=>"TripsAndExpenses", 'title'=>"ListTripAssociatedProject", @@ -292,7 +300,18 @@ class pdf_beluga extends ModelePDFProjects 'datefieldname'=>'dated', 'margin'=>'minus', 'disableamount'=>1, - 'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire), + 'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire, + 'lang'=>'trip'), + 'expensereport'=>array( + 'name'=>"ExpensesReports", + 'title'=>"ListTripAssociatedProject", + 'class'=>'ExpenseReport', + 'table'=>'expensereport', + 'datefieldname'=>'dated', + 'margin'=>'minus', + 'disableamount'=>1, + 'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire, + 'lang'=>'trip'), 'agenda'=>array( 'name'=>"Agenda", 'title'=>"ListActionsAssociatedProject", @@ -300,7 +319,8 @@ class pdf_beluga extends ModelePDFProjects 'table'=>'actioncomm', 'datefieldname'=>'datep', 'disableamount'=>1, - 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire) + 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->read, + 'lang'=>'agenda') ); @@ -311,12 +331,17 @@ class pdf_beluga extends ModelePDFProjects $tablename=$value['table']; $datefieldname=$value['datefieldname']; $qualified=$value['test']; + $langstoload=$value['lang']; + $langs->load($langstoload); if ($qualified) { + //var_dump("$key, $tablename, $datefieldname, $dates, $datee"); $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee); + //var_dump($elementarray); + $num = count($elementarray); - if ($num > 0) + if ($num >= 0) { $nexY = $pdf->GetY() + 5; $curY = $nexY; @@ -334,9 +359,9 @@ class pdf_beluga extends ModelePDFProjects $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $outputlangs->transnoentities("ThirdParty"), 1, 'L'); if (empty($value['disableamount'])) { $pdf->SetXY($this->posxamountht, $curY); - $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHT"), 1, 'R'); + $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHTShort"), 1, 'R'); $pdf->SetXY($this->posxamountttc, $curY); - $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTC"), 1, 'R'); + $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTCShort"), 1, 'R'); } else { $pdf->SetXY($this->posxamountht, $curY); $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R'); @@ -434,8 +459,6 @@ class pdf_beluga extends ModelePDFProjects } } - - /* * Pied de page */ diff --git a/htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php similarity index 88% rename from htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php rename to htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index ddc995cc69a..a19e634f6cd 100644 --- a/htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -23,7 +23,7 @@ * \brief File of class to build ODT documents for third parties */ -require_once DOL_DOCUMENT_ROOT.'/core/modules/askpricesupplier/modules_askpricesupplier.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; /** * Class to build documents using ODF templates generator */ -class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier +class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal { var $emetteur; // Objet societe qui emet @@ -57,7 +57,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier $this->db = $db; $this->name = "ODT templates"; $this->description = $langs->trans("DocumentModelOdt"); - $this->scandir = 'ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan + $this->scandir = 'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan // Dimension page pour format A4 $this->type = 'odt'; @@ -105,19 +105,19 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier $texte.= ''; $texte.= ''; $texte.= ''; - $texte.= ''; - if ($conf->global->MAIN_ASKPRICESUPPLIER_CHOOSE_ODT_DOCUMENT > 0) + $texte.= ''; + if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) { - $texte.= ''; - $texte.= ''; - $texte.= ''; + $texte.= ''; + $texte.= ''; + $texte.= ''; } $texte.= ''; // List of directories area $texte.= '' ]; - for ( i = 0; i < childHtmlList.length; i++ ) { - var className = 'cke_dialog_ui_hbox_child', - styles = []; - if ( i === 0 ) - className = 'cke_dialog_ui_hbox_first'; - if ( i == childHtmlList.length - 1 ) - className = 'cke_dialog_ui_hbox_last'; - html.push( '' ); - } - html.push( '' ); - return html.join( '' ); - }; - - var attribs = { role: 'presentation' }; - elementDefinition && elementDefinition.align && ( attribs.align = elementDefinition.align ); - - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type: 'hbox' }, htmlList, 'table', styles, attribs, innerHTML ); - }, - - /** - * Vertical layout box for dialog UI elements. - * - * @class CKEDITOR.ui.dialog.vbox - * @extends CKEDITOR.ui.dialog.hbox - * @constructor Creates a vbox class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {Array} childObjList - * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container. - * @param {Array} childHtmlList - * Array of HTML code that correspond to the HTML output of all the - * objects in childObjList. - * @param {Array} htmlList Array of HTML code that this element will output to. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `width` (Optional) The width of the layout. - * * `heights` (Optional) The heights of individual cells. - * * `align` (Optional) The alignment of the layout. - * * `padding` (Optional) The padding width inside child cells. - * * `expand` (Optional) Whether the layout should expand - * vertically to fill its container. - */ - vbox: function( dialog, childObjList, childHtmlList, htmlList, elementDefinition ) { - if ( arguments.length < 3 ) - return; - - this._ || ( this._ = {} ); - - var children = this._.children = childObjList, - width = elementDefinition && elementDefinition.width || null, - heights = elementDefinition && elementDefinition.heights || null; - /** @ignore */ - var innerHTML = function() { - var html = [ '
'; $texttitle=$langs->trans("ListOfDirectories"); - $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH))); + $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH))); $listoffiles=array(); foreach($listofdir as $key=>$tmpdir) { @@ -141,7 +141,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1); $texte.= '
'; $texte.= ''; $texte.= '
'; $texte.= ''; @@ -152,27 +152,27 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier { $texte.=$langs->trans("NumberOfModelFilesFound").': '.count($listoffiles).''; - if ($conf->global->MAIN_ASKPRICESUPPLIER_CHOOSE_ODT_DOCUMENT > 0) + if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) { // Model for creation - $liste=ModelePDFAskPriceSupplier::liste_modeles($this->db); + $liste=ModelePDFSupplierProposal::liste_modeles($this->db); $texte.= ''; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= '"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= '"; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= '"; $texte.= '
'.$langs->trans("DefaultModelAskPriceSupplierCreate").''.$langs->trans("DefaultModelSupplierProposalCreate").''; - $texte.= $form->selectarray('value2',$liste,$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_DEFAULT); + $texte.= $form->selectarray('value2',$liste,$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT); $texte.= "
'.$langs->trans("DefaultModelAskPriceSupplierToBill").''.$langs->trans("DefaultModelSupplierProposalToBill").''; - $texte.= $form->selectarray('value3',$liste,$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_TOBILL); + $texte.= $form->selectarray('value3',$liste,$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL); $texte.= "
'.$langs->trans("DefaultModelAskPriceSupplierClosed").''.$langs->trans("DefaultModelSupplierProposalClosed").''; - $texte.= $form->selectarray('value4',$liste,$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_CLOSED); + $texte.= $form->selectarray('value4',$liste,$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED); $texte.= "
'; } @@ -230,13 +230,13 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier $outputlangs->load("companies"); $outputlangs->load("bills"); - if ($conf->askpricesupplier->dir_output) + if ($conf->supplier_proposal->dir_output) { // If $object is id instead of object if (! is_object($object)) { $id = $object; - $object = new AskPriceSupplier($this->db); + $object = new SupplierProposal($this->db); $result=$object->fetch($id); if ($result < 0) { @@ -245,7 +245,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier } } - $dir = $conf->askpricesupplier->dir_output; + $dir = $conf->supplier_proposal->dir_output; $objectref = dol_sanitizeFileName($object->ref); if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref; $file = $dir . "/" . $objectref . ".odt"; @@ -285,7 +285,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier //print "file=".$file; //print "conf->propal->dir_temp=".$conf->propal->dir_temp; - dol_mkdir($conf->askpricesupplier->dir_temp); + dol_mkdir($conf->supplier_proposal->dir_temp); // If BILLING contact defined on invoice, we use it @@ -324,7 +324,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier // Line of free text $newfreetext=''; - $paramfreetext='ASKPRICESUPPLIER_FREE_TEXT'; + $paramfreetext='SUPPLIER_PROPOSAL_FREE_TEXT'; if (! empty($conf->global->$paramfreetext)) { $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray); @@ -336,7 +336,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier $odfHandler = new odf( $srctemplatepath, array( - 'PATH_TO_TMP' => $conf->askpricesupplier->dir_temp, + 'PATH_TO_TMP' => $conf->supplier_proposal->dir_temp, 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'DELIMITER_LEFT' => '{', 'DELIMITER_RIGHT' => '}' diff --git a/htdocs/comm/askpricesupplier/class/index.html b/htdocs/core/modules/supplier_proposal/doc/index.html similarity index 100% rename from htdocs/comm/askpricesupplier/class/index.html rename to htdocs/core/modules/supplier_proposal/doc/index.html diff --git a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php similarity index 97% rename from htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php rename to htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index db021bcb89e..f2d40713daf 100644 --- a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -25,7 +25,7 @@ * \ingroup propale * \brief Fichier de la classe permettant de generer les propales au modele Azur */ -require_once DOL_DOCUMENT_ROOT.'/core/modules/askpricesupplier/modules_askpricesupplier.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** * Class to generate PDF proposal Azur */ -class pdf_aurore extends ModelePDFAskPriceSupplier +class pdf_aurore extends ModelePDFSupplierProposal { var $db; var $name; @@ -103,7 +103,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier // Define position of columns $this->posxdesc=$this->marge_gauche+1; $this->posxtva=102; - $this->posxup=116; + $this->posxup=126; $this->posxqty=145; $this->posxdiscount=162; $this->postotalht=174; @@ -149,14 +149,14 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $outputlangs->load("dict"); $outputlangs->load("companies"); $outputlangs->load("bills"); - $outputlangs->load("askpricesupplier"); + $outputlangs->load("supplier_proposal"); $outputlangs->load("products"); $nblignes = count($object->lines); // Loop on each lines to detect if there is at least one image to show $realpatharray=array(); - if (! empty($conf->global->MAIN_GENERATE_ASKPRICESUPPLIER_WITH_PICTURE)) + if (! empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE)) { for ($i = 0 ; $i < $nblignes ; $i++) { @@ -182,7 +182,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier } if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva; - if ($conf->askpricesupplier->dir_output) + if ($conf->supplier_proposal->dir_output) { $object->fetch_thirdparty(); @@ -191,13 +191,13 @@ class pdf_aurore extends ModelePDFAskPriceSupplier // Definition of $dir and $file if ($object->specimen) { - $dir = $conf->askpricesupplier->dir_output; + $dir = $conf->supplier_proposal->dir_output; $file = $dir . "/SPECIMEN.pdf"; } else { $objectref = dol_sanitizeFileName($object->ref); - $dir = $conf->askpricesupplier->dir_output . "/" . $objectref; + $dir = $conf->supplier_proposal->dir_output . "/" . $objectref; $file = $dir . "/" . $objectref . ".pdf"; } @@ -421,6 +421,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut // VAT Rate + /* if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) { $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails); @@ -433,13 +434,15 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $pdf->SetXY($this->posxup, $curY); if ($up_excl_tax > 0) $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0); - + */ + // Quantity $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails); $pdf->SetXY($this->posxqty, $curY); $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars // Discount on line + /* if ($object->lines[$i]->remise_percent) { $pdf->SetXY($this->posxdiscount-2, $curY); @@ -452,7 +455,8 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $pdf->SetXY($this->postotalht, $curY); if ($total_excl_tax > 0) $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0); - + */ + // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva $tvaligne=$object->lines[$i]->total_tva; $localtax1ligne=$object->lines[$i]->total_localtax1; @@ -591,7 +595,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier } else { - $this->error=$langs->trans("ErrorConstantNotDefined","ASKSUPPLIERPICE_OUTPUTDIR"); + $this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_PROPOSAL_OUTPUTDIR"); return 0; } } @@ -685,7 +689,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier }*/ // Show payments conditions - if (empty($conf->global->ASKPRICESUPPLIER_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement)) + if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement)) { $pdf->SetFont('','B', $default_font_size - 2); $pdf->SetXY($this->marge_gauche, $posy); @@ -715,7 +719,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $posy=$pdf->GetY()+3; } - if (empty($conf->global->ASKPRICESUPPLIER_PDF_HIDE_PAYMENTTERMCOND)) + if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND)) { // Show payment mode if ($object->mode_reglement_code @@ -1148,7 +1152,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier if (empty($hidetop)) { $pdf->SetXY($this->posxup-1, $tab_top+1); - $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("AskPriceSupplierUHT"),'','C'); + $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C'); } $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height); @@ -1193,7 +1197,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $outputlangs->load("main"); $outputlangs->load("bills"); - $outputlangs->load("askpricesupplier"); + $outputlangs->load("supplier_proposal"); $outputlangs->load("companies"); $default_font_size = pdf_getPDFFontSize($outputlangs); @@ -1201,9 +1205,9 @@ class pdf_aurore extends ModelePDFAskPriceSupplier pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); // Show Draft Watermark - if($object->statut==0 && (! empty($conf->global->ASKPRICESUPPLIER_DRAFT_WATERMARK)) ) + if($object->statut==0 && (! empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK)) ) { - pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->ASKPRICESUPPLIER_DRAFT_WATERMARK); + pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK); } $pdf->SetTextColor(0,0,60); @@ -1264,7 +1268,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $posy+=4; $pdf->SetXY($posx,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("AskPriceSupplierDate")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierProposalDate")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R'); */ if ($object->client->code_client) @@ -1386,7 +1390,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0) { $showdetails=0; - return pdf_pagefoot($pdf,$outputlangs,'ASKPRICESUPPLIER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); + return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } } diff --git a/htdocs/comm/askpricesupplier/tpl/index.html b/htdocs/core/modules/supplier_proposal/index.html similarity index 100% rename from htdocs/comm/askpricesupplier/tpl/index.html rename to htdocs/core/modules/supplier_proposal/index.html diff --git a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php similarity index 90% rename from htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php rename to htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php index d1912b98a9a..9d07dd19514 100644 --- a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php @@ -23,13 +23,13 @@ * \brief File of class to manage commercial proposal numbering rules Marbre */ -require_once DOL_DOCUMENT_ROOT .'/core/modules/askpricesupplier/modules_askpricesupplier.php'; +require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_proposal/modules_supplier_proposal.php'; /** * Class to manage customer order numbering rules Marbre */ -class mod_askpricesupplier_marbre extends ModeleNumRefAskPriceSupplier +class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal { var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $prefix='DF'; @@ -74,7 +74,7 @@ class mod_askpricesupplier_marbre extends ModeleNumRefAskPriceSupplier $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier"; + $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal"; $sql.= " WHERE ref LIKE '".$this->prefix."____-%'"; $sql.= " AND entity = ".$conf->entity; @@ -101,17 +101,17 @@ class mod_askpricesupplier_marbre extends ModeleNumRefAskPriceSupplier * Return next value * * @param Societe $objsoc Object third party - * @param Propal $askpricesupplier Object commercial proposal + * @param Propal $supplier_proposal Object commercial proposal * @return string Next value */ - function getNextValue($objsoc,$askpricesupplier) + function getNextValue($objsoc,$supplier_proposal) { global $db,$conf; // D'abord on recupere la valeur max $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL - $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier"; + $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal"; $sql.= " WHERE ref LIKE '".$this->prefix."____-%'"; $sql.= " AND entity = ".$conf->entity; diff --git a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php similarity index 83% rename from htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php rename to htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php index 22582308f22..8781628917f 100644 --- a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php @@ -25,13 +25,13 @@ * \brief File that contains the numbering module rules Saphir */ -require_once DOL_DOCUMENT_ROOT .'/core/modules/askpricesupplier/modules_askpricesupplier.php'; +require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_proposal/modules_supplier_proposal.php'; /** * Class of file that contains the numbering module rules Saphir */ -class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier +class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal { var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' var $error = ''; @@ -55,7 +55,7 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier $texte.= ''; $texte.= ''; $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("CommRequest"),$langs->transnoentities("CommRequest")); @@ -66,7 +66,7 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier // Parametrage du prefix $texte.= ''; - $texte.= ''; + $texte.= ''; $texte.= ''; @@ -103,17 +103,17 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier * Return next value * * @param Societe $objsoc Object third party - * @param Propal $askpricesupplier Object askpricesupplier + * @param Propal $supplier_proposal Object supplier_proposal * @return string Value if OK, 0 if KO */ - function getNextValue($objsoc,$askpricesupplier) + function getNextValue($objsoc,$supplier_proposal) { global $db,$conf; require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // On defini critere recherche compteur - $mask=$conf->global->ASKPRICESUPPLIER_SAPHIR_MASK; + $mask=$conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK; if (! $mask) { @@ -121,9 +121,9 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier return 0; } - $date=$askpricesupplier->datep; + $date=$supplier_proposal->datep; $customercode=$objsoc->code_client; - $numFinal=get_next_value($db,$mask,'askpricesupplier','ref','',$customercode,$date); + $numFinal=get_next_value($db,$mask,'supplier_proposal','ref','',$customercode,$date); return $numFinal; } diff --git a/htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php similarity index 88% rename from htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php rename to htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php index 4bff78bff54..715dc294d91 100644 --- a/htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php +++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requ /** * Classe mere des modeles de propale */ -abstract class ModelePDFAskPriceSupplier extends CommonDocGenerator +abstract class ModelePDFSupplierProposal extends CommonDocGenerator { var $error=''; @@ -50,7 +50,7 @@ abstract class ModelePDFAskPriceSupplier extends CommonDocGenerator { global $conf; - $type='askpricesupplier'; + $type='supplier_proposal'; $liste=array(); include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; @@ -64,7 +64,7 @@ abstract class ModelePDFAskPriceSupplier extends CommonDocGenerator /** * Classe mere des modeles de numerotation des references de propales */ -abstract class ModeleNumRefAskPriceSupplier +abstract class ModeleNumRefSupplierProposal { var $error=''; @@ -86,7 +86,7 @@ abstract class ModeleNumRefAskPriceSupplier function info() { global $langs; - $langs->load("askpricesupplier"); + $langs->load("supplier_proposal"); return $langs->trans("NoDescription"); } @@ -98,7 +98,7 @@ abstract class ModeleNumRefAskPriceSupplier function getExample() { global $langs; - $langs->load("askpricesupplier"); + $langs->load("supplier_proposal"); return $langs->trans("NoExample"); } @@ -149,17 +149,17 @@ abstract class ModeleNumRefAskPriceSupplier * Create a document onto disk according to template module. * * @param DoliDB $db Database handler - * @param AskPriceSupplier $object Object askpricesupplier + * @param SupplierProposal $object Object supplier_proposal * @param string $modele Force model to use ('' to not force) * @param Translate $outputlangs Object langs to use for output * @param int $hidedetails Hide details of lines * @param int $hidedesc Hide description * @param int $hideref Hide ref * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of AskPriceSupplier class - * @see AskPriceSupplier::generateDocument() + * @deprecated Use the new function generateDocument of SupplierProposal class + * @see SupplierProposal::generateDocument() */ -function askpricesupplier_pdf_create(DoliDB $db, AskPriceSupplier $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) +function supplier_proposal_pdf_create(DoliDB $db, SupplierProposal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php index 84b869cd813..a983bf7f36e 100644 --- a/htdocs/core/tpl/document_actions_post_headers.tpl.php +++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php @@ -1,6 +1,7 @@ * Copyright (C) 2013-2014 Laurent Destailleur + * Copyright (C) 2015 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,9 +48,9 @@ $savingdocmask=''; if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) { //var_dump($modulepart); - if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','askpricesupplier','ficheinter','contract','project','project_task','expensereport'))) + if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','project','project_task','expensereport'))) { - $savingdocmask=$object->ref.'-__file__'; + $savingdocmask=dol_sanitizeFileName($object->ref).'-__file__'; } /*if (in_array($modulepart,array('member'))) { diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index c0af2a25b74..1debab7b10b 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -33,7 +33,7 @@ $arrayofjs=array( '/includes/jstz/jstz.min.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION)), '/core/js/dst.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION)) ); -$titleofloginpage=$langs->trans('Login').' @ '.$title; // title is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page. +$titleofloginpage=$langs->trans('Login').' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version. print top_htmlhead('',$titleofloginpage,0,0,$arrayofjs); ?> @@ -93,7 +93,7 @@ $(document).ready(function () { - element == 'askpricesupplier') { ?> - trans('AskPriceSupplierRefFourn'); ?> + element == 'supplier_proposal') { ?> + @@ -210,13 +214,13 @@ else { ?> - element == 'askpricesupplier') { ?> + element == 'supplier_proposal') { ?> - element == 'askpricesupplier') { ?> + element == 'supplier_proposal') { ?> situation_counter == 1 || !$this->situation_cycle_ref) { - print ''; + print ''; } else { print ''; } diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 7cf7f40020d..f71b2b484d1 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -37,7 +37,7 @@ global $forceall, $senderissupplier, $inputalsopricewithtax, $usemargins; $usemargins=0; -if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal', 'askpricesupplier','commande'))) $usemargins=1; +if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; if (empty($dateSelector)) $dateSelector=0; if (empty($forceall)) $forceall=0; @@ -124,7 +124,7 @@ if (empty($usemargins)) $usemargins=0; } ?> - element == 'askpricesupplier') { ?> + element == 'supplier_proposal') { ?> diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index d144f365533..4d3afeb8d92 100644 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -61,6 +61,10 @@ class InterfaceWorkflowManager extends DolibarrTriggers include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $newobject = new Commande($this->db); + $newobject->context['createfrompropal'] = 'createfrompropal'; + $newobject->context['origin'] = $object->element; + $newobject->context['origin_id'] = $object->id; + $ret=$newobject->createFromProposal($object); if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; } return $ret; @@ -76,6 +80,10 @@ class InterfaceWorkflowManager extends DolibarrTriggers include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $newobject = new Facture($this->db); + $newobject->context['createfromorder'] = 'createfromorder'; + $newobject->context['origin'] = $object->element; + $newobject->context['origin_id'] = $object->id; + $ret=$newobject->createFromOrder($object); if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; } return $ret; diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index 84f67660c41..6ac6433bb62 100644 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -149,17 +149,17 @@ class InterfaceDemo extends DolibarrTriggers case 'LINEPROPAL_DELETE': // Askpricesupplier - case 'ASKPRICESUPPLIER_CREATE': - case 'ASKPRICESUPPLIER_CLONE': - case 'ASKPRICESUPPLIER_MODIFY': - case 'ASKPRICESUPPLIER_VALIDATE': - case 'ASKPRICESUPPLIER_SENTBYMAIL': - case 'ASKPRICESUPPLIER_CLOSE_SIGNED': - case 'ASKPRICESUPPLIER_CLOSE_REFUSED': - case 'ASKPRICESUPPLIER_DELETE': - case 'LINEASKPRICESUPPLIER_INSERT': - case 'LINEASKPRICESUPPLIER_UPDATE': - case 'LINEASKPRICESUPPLIER_DELETE': + case 'SUPPLIER_PROPOSAL_CREATE': + case 'SUPPLIER_PROPOSAL_CLONE': + case 'SUPPLIER_PROPOSAL_MODIFY': + case 'SUPPLIER_PROPOSAL_VALIDATE': + case 'SUPPLIER_PROPOSAL_SENTBYMAIL': + case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED': + case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED': + case 'SUPPLIER_PROPOSAL_DELETE': + case 'LINESUPPLIER_PROPOSAL_INSERT': + case 'LINESUPPLIER_PROPOSAL_UPDATE': + case 'LINESUPPLIER_PROPOSAL_DELETE': // Contracts case 'CONTRACT_CREATE': diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 3ca2c18bf6c..6a236ab534e 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1620,6 +1620,15 @@ else if ($id || $ref) $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='shi'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id); + } $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 181f0138bf2..d7bfc9aed98 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -34,7 +34,7 @@ if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propa if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php'; - + /** * Class to manage shipments */ @@ -1048,7 +1048,7 @@ class Expedition extends CommonObject // no lot/serial // We increment stock of product (and sub-products) // We use warehouse selected for each line - $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref)); // price is set to 0 because we dont want to see WAP changed + $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed if ($result < 0) { $error++;$this->errors=$this->errors + $mouvS->errors; @@ -1061,7 +1061,7 @@ class Expedition extends CommonObject // We use warehouse selected for each line foreach($lotArray as $lot) { - $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->dluo_qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // price is set to 0 because we dont want to see WAP changed + $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->dluo_qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed if ($result < 0) { $error++;$this->errors=$this->errors + $mouvS->errors; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index a247341cdec..116305dc86d 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -113,6 +113,7 @@ if (empty($reshook)) if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer) { $result = $object->setValid($user); + if ($result >= 0) { // Define output language @@ -1816,6 +1817,15 @@ else if ($id > 0 || ! empty($ref)) $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='int'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'int'.$object->id); + } $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 5a492940cf1..7abc17b49cd 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -208,7 +208,7 @@ define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix); // Path to root libraries if (! defined('ADODB_PATH')) { define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH))?DOL_DOCUMENT_ROOT.'/includes/adodbtime/':(empty($dolibarr_lib_ADODB_PATH)?'':$dolibarr_lib_ADODB_PATH.'/')); } if (! defined('FPDF_PATH')) { define('FPDF_PATH', (empty($dolibarr_lib_FPDF_PATH))?DOL_DOCUMENT_ROOT.'/includes/fpdf/':$dolibarr_lib_FPDF_PATH.'/'); } // Used only for package that can't include tcpdf -if (! defined('TCPDF_PATH')) { define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH))?DOL_DOCUMENT_ROOT.'/includes/tecnick.com/tcpdf/':$dolibarr_lib_TCPDF_PATH.'/'); } +if (! defined('TCPDF_PATH')) { define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH))?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/':$dolibarr_lib_TCPDF_PATH.'/'); } if (! defined('FPDI_PATH')) { define('FPDI_PATH', (empty($dolibarr_lib_FPDI_PATH))?DOL_DOCUMENT_ROOT.'/includes/fpdfi/':$dolibarr_lib_FPDI_PATH.'/'); } if (! defined('TCPDI_PATH')) { define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH))?DOL_DOCUMENT_ROOT.'/includes/tcpdi/':$dolibarr_lib_TCPDI_PATH.'/'); } if (! defined('NUSOAP_PATH')) { define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH))?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/':(empty($dolibarr_lib_NUSOAP_PATH)?'':$dolibarr_lib_NUSOAP_PATH.'/')); } diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index a8b6d18a935..cab8c96b62a 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -541,10 +541,10 @@ if ($object->id > 0) print ''.$langs->trans("AddBill").''; } - if ($conf->askpricesupplier->enabled && $user->rights->askpricesupplier->creer) + if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer) { - $langs->load("askpricesupplier"); - print ''.$langs->trans("AddAskPriceSupplier").''; + $langs->load("supplier_proposal"); + print ''.$langs->trans("AddSupplierProposal").''; } if ($user->rights->fournisseur->facture->creer) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 6a83aab0155..3f9d7b1246a 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -113,7 +113,7 @@ class CommandeFournisseur extends CommonOrder * @var CommandeFournisseurLigne[] */ public $lines = array(); - //Ajout pour askpricesupplier + //Ajout pour supplier_proposal var $origin; var $origin_id; var $linked_objects=array(); @@ -481,7 +481,7 @@ class CommandeFournisseur extends CommonOrder } else { - $this->error='Not Authorized'; + $this->error='NotAuthorized'; dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR); return -1; } @@ -589,7 +589,7 @@ class CommandeFournisseur extends CommonOrder if (! empty($this->total_ht)) $label.= '
' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_tva)) - $label.= '
' . $langs->trans('TVA') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); + $label.= '
' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_ttc)) $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); @@ -936,6 +936,7 @@ class CommandeFournisseur extends CommonOrder */ function commande($user, $date, $methode, $comment='') { + global $langs; dol_syslog(get_class($this)."::commande"); $result = 0; if ($user->rights->fournisseur->commande->commander) @@ -946,16 +947,24 @@ class CommandeFournisseur extends CommonOrder dol_syslog(get_class($this)."::commande", LOG_DEBUG); if ($this->db->query($sql)) { + $this->statut = 3; + $this->methode_commande_id = $methode; + $this->date_commande = $this->db->idate($date); $result = 1; $this->log($user, 3, $date, $comment); } else { + $this->error = $this->db->lasterror(); + $this->errors[] = $this->db->lasterror(); $result = -1; } } else { + $result = -1; + $this->error = $langs->trans('NotAuthorized'); + $this->errors[] = $lanfs->trans('NotAuthorized'); dol_syslog(get_class($this)."::commande User not Authorized", LOG_ERR); } return $result ; @@ -1305,7 +1314,8 @@ class CommandeFournisseur extends CommonOrder // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -1762,7 +1772,7 @@ class CommandeFournisseur extends CommonOrder */ function Livraison($user, $date, $type, $comment) { - global $conf; + global $conf, $langs; $result = 0; $error = 0; @@ -1829,6 +1839,7 @@ class CommandeFournisseur extends CommonOrder if ($resql) { $result = 0; + $this->statut = $statut; $result=$this->log($user, $statut, $date, $comment); $this->db->commit(); @@ -1843,6 +1854,8 @@ class CommandeFournisseur extends CommonOrder } else { + $this->error = $langs->trans('NotAuthorized'); + $this->errors[] = $langs->trans('NotAuthorized'); dol_syslog(get_class($this)."::Livraison Not Authorized"); $result = -3; } @@ -1992,6 +2005,7 @@ class CommandeFournisseur extends CommonOrder if (! $error) { + $this->statut = $status; $this->db->commit(); return 1; } @@ -2059,7 +2073,8 @@ class CommandeFournisseur extends CommonOrder // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc, $this->thirdparty); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 05330fa2319..64c988e74e1 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1269,7 +1269,8 @@ class FactureFournisseur extends CommonInvoice // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc, $this->thirdparty); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -1485,7 +1486,7 @@ class FactureFournisseur extends CommonInvoice if (! empty($this->total_ht)) $label.= '
' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_tva)) - $label.= '
' . $langs->trans('TVA') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); + $label.= '
' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_ttc)) $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index cb1754fa8d3..83b94bd74d9 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -40,8 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; -if (! empty($conf->askpricesupplier->enabled)) - require DOL_DOCUMENT_ROOT . '/comm/askpricesupplier/class/askpricesupplier.class.php'; +if (! empty($conf->supplier_proposal->enabled)) + require DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php'; if (!empty($conf->produit->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; if (!empty($conf->projet->enabled)) @@ -54,7 +54,7 @@ $langs->load('sendings'); $langs->load('companies'); $langs->load('bills'); $langs->load('propal'); -$langs->load('askpricesupplier'); +$langs->load('supplier_proposal'); $langs->load('deliveries'); $langs->load('products'); $langs->load('stocks'); @@ -704,15 +704,14 @@ if (empty($reshook)) if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander) { - $result = $object->commande($user, $_REQUEST["datecommande"], $_REQUEST["methode"], $_REQUEST['comment']); + $result = $object->commande($user, $_REQUEST["datecommande"], $_REQUEST["methode"], $_REQUEST['comment']); if ($result > 0) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } - header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); - exit; - } + $action = ''; + } else { setEventMessages($object->error, $object->errors, 'errors'); @@ -767,15 +766,15 @@ if (empty($reshook)) { $date_liv = dol_mktime(GETPOST('rehour'),GETPOST('remin'),GETPOST('resec'),GETPOST("remonth"),GETPOST("reday"),GETPOST("reyear")); - $result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment")); + $result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment")); if ($result > 0) { - header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); - exit; - } + setEventMessages($langs->trans("DeliveryStateSaved"), null); + $action = ''; + } else if($result == -3) { - setEventMessage($langs->trans("NotAuthorized"), 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } else { @@ -917,8 +916,8 @@ if (empty($reshook)) // If creation from another object of another module (Example: origin=propal, originid=1) if (! empty($origin) && ! empty($originid)) { - $element = 'comm/askpricesupplier'; - $subelement = 'askpricesupplier'; + $element = 'supplier_proposal'; + $subelement = 'supplier_proposal'; $object->origin = $origin; $object->origin_id = $originid; @@ -1430,8 +1429,8 @@ if ($action=='create') $subelement = $regs [2]; } - $element = 'comm/askpricesupplier'; - $subelement = 'askpricesupplier'; + $element = 'supplier_proposal'; + $subelement = 'supplier_proposal'; dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); @@ -1580,8 +1579,8 @@ if ($action=='create') print ''; $newclassname = $classname; - if ($newclassname == 'AskPriceSupplier') - $newclassname = 'CommercialAskPriceSupplier'; + if ($newclassname == 'SupplierProposal') + $newclassname = 'CommercialSupplierProposal'; print ''; print ''; print '"; @@ -2322,6 +2321,15 @@ elseif (! empty($object->id)) $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='sor'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sor'.$object->id); + } $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index f3f9dc6afa3..fe6582fd355 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -84,6 +84,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); if ($id > 0 || ! empty($ref)) { $ret=$object->fetch($id, $ref); + $object->fetch_thirdparty(); } $permissionnote=$user->rights->fournisseur->facture->creer; // Used by the include of actions_setnotes.inc.php @@ -1521,7 +1522,7 @@ if ($action == 'create') if ($cntinvoice>=1) { setEventMessage('WarningBillExist','warnings'); - echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['facture'])->getNomUrl(1).')'; + echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['invoice_supplier'])->getNomUrl(1).')'; } echo ''; print ''; @@ -2101,10 +2102,10 @@ else global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax; $forceall=1; $senderissupplier=1; $dateSelector=0; $inputalsopricewithtax=1; - + // Show object lines if (! empty($object->lines)) - $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1); + $ret = $object->printObjectLines($action, $societe, $mysoc, $lineid, 1); $num=count($object->lines); @@ -2322,6 +2323,15 @@ else $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='sin'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sin'.$object->id); + } $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 4252e4a9ef6..a46c5e6ca38 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -273,7 +273,7 @@ if ($resql) if ($search_all) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $search_all, join(', ',$fieldstosearchall)); + print $langs->transnoentities("FilterOnInto", $search_all, join(', ',$fieldstosearchall)); } print '
'.$langs->trans("Mask").':'.$form->textwithpicto('',$tooltip,1,1).''.$form->textwithpicto('',$tooltip,1,1).' 
- +global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> " name="username" class="flat input-icon-user" size="20" value="" tabindex="1" autofocus="autofocus" /> @@ -102,7 +102,7 @@ $(document).ready(function () {
- +global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> " name="password" class="flat input-icon-password" type="password" size="20" value="" tabindex="2" autocomplete="off" /> diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php index 46e7d154533..c68aa599310 100644 --- a/htdocs/core/tpl/notes.tpl.php +++ b/htdocs/core/tpl/notes.tpl.php @@ -50,7 +50,7 @@ if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES)) // Special cases if ($module == 'propal') { $permission=$user->rights->propale->creer;} -elseif ($module == 'askpricesupplier') { $permission=$user->rights->askpricesupplier->creer;} +elseif ($module == 'supplier_proposal') { $permission=$user->rights->supplier_proposal->creer;} elseif ($module == 'fichinter') { $permission=$user->rights->ficheinter->creer;} elseif ($module == 'project') { $permission=$user->rights->projet->creer;} elseif ($module == 'project_task') { $permission=$user->rights->projet->creer;} diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index edb065c9d9b..886c3fb9d1f 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -5,6 +5,7 @@ * Copyright (C) 2012 Cédric Salvador * Copyright (C) 2014 Florian Henry * Copyright (C) 2014 Raphaël Doursenaud + * Copyright (C) 2015 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,7 +32,10 @@ $usemargins=0; -if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','askpricesupplier','commande'))) $usemargins=1; +if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) +{ + $usemargins=1; +} global $forceall, $senderissupplier, $inputalsopricewithtax; if (empty($dateSelector)) $dateSelector=0; @@ -42,7 +46,7 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0; // Define colspan for button Add $colspan = 3; // Col total ht + col edit + col delete -if (in_array($object->element,array('propal', 'askpricesupplier','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button +if (in_array($object->element,array('propal', 'supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button //print $object->element; ?> @@ -52,8 +56,8 @@ if (in_array($object->element,array('propal', 'askpricesupplier','facture','invo global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
trans('AddNewLine'); ?>trans("FreeZone"); ?> 		trans('SupplierProposalRefFourn'); ?> trans('VAT'); ?> trans('PriceUHT'); ?> tva_assuj == "0") echo ''.vatrate(0, true); - else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer); + else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer, 0, 0, '', false, 1); ?> @@ -290,8 +294,8 @@ else { elseif ($this->table_element_line=='propaldet') { $newline = new PropaleLigne($this->db); } - elseif ($this->table_element_line=='askpricesupplierdet') { - $newline = new AskPriceSupplierLine($this->db); + elseif ($this->table_element_line=='supplier_proposaldet') { + $newline = new SupplierProposalLine($this->db); } elseif ($this->table_element_line=='facturedet') { $newline = new FactureLigne($this->db); @@ -315,14 +319,39 @@ else { service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') // We show date field if required { - if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10; - else $colspan = 9; - if($this->situation_cycle_ref) $colspan++; - if (! empty($inputalsopricewithtax)) $colspan++; // We add 1 if col total ttc - if (in_array($object->element,array('propal','askpricesupplier','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button + $colspan = 6; + + if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { + $colspan++; + } + if ($this->situation_cycle_ref) { + $colspan++; + } + // We add 1 if col total ttc + if (!empty($inputalsopricewithtax)) { + $colspan++; + } if ($conf->global->PRODUCT_USE_UNITS) { $colspan++; } + if (count($object->lines)) { + //There will be an edit and a delete button + $colspan += 2; + + // With this, there is a column move button ONLY if lines > 1 + if (in_array($object->element, array( + 'propal', + 'supplier_proposal', + 'facture', + 'invoice', + 'commande', + 'order', + 'order_supplier', + 'invoice_supplier' + ))) { + $colspan++; + } + } if (! empty($usemargins)) { @@ -497,7 +526,6 @@ jQuery(document).ready(function() { /* When changing predefined product, we reload list of supplier prices */ $("#idprod, #idprodfournprice").change(function() { - console.log("change #idprod, #idprodfournprice, conf->global->MARGIN_TYPE=global->MARGIN_TYPE ?>"); setforpredef(); jQuery('#trlinefordates').show(); diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index d61831cfec2..883c1f5eea9 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -32,7 +32,7 @@ $usemargins=0; -if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal', 'askpricesupplier','commande'))) $usemargins=1; +if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; global $forceall, $senderissupplier, $inputalsopricewithtax; if (empty($dateSelector)) $dateSelector=0; @@ -44,7 +44,7 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0; // Define colspan for button Add $colspan = 3; // Col total ht + col edit + col delete if (! empty($inputalsopricewithtax)) $colspan++; // We add 1 if col total ttc -if (in_array($object->element,array('propal','askpricesupplier','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button +if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button ?> @@ -104,14 +104,14 @@ $coldisplay=-1; // We remove first td ?> ' . $form->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type) . '' . $form->load_tva('tva_tx', $line->tva_tx, $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '%ref_fourn; ?> tva_tx,'%',$line->info_bits); ?>
' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1) . '
' . $langs->trans('TotalHT') . '' . price($objectsrc->total_ht) . '
' . $langs->trans('TotalVAT') . '' . price($objectsrc->total_tva) . "
'.$langs->trans('TotalHT').''.price($objectsrc->total_ht).'
'; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 76497bf4300..82bccf3df19 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -257,7 +257,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datefacture); $sql = 'SELECT s.nom as name, s.rowid as socid,'; - $sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total'; + $sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total, fk_mode_reglement, fk_account'; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f'; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -292,11 +292,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print $supplierstatic->getNomUrl(1,'supplier'); print ''; print ''; print ''; print ''; print ''; @@ -304,7 +304,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if (! empty($conf->banque->enabled)) { print ''; } else diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 771f2e243bc..26e11dd6b94 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -33,9 +33,13 @@ if (! $user->admin) $error=0; -$action = GETPOST('action', 'alpha'); - -$object = new Establishment($db); +// List of statut +static $tmpstatus2label=array( + '0'=>'OpenEtablishment', + '1'=>'CloseEtablishment' +); +$status2label=array(''); +foreach ($tmpstatus2label as $key => $val) $status2label[$key]=$langs->trans($val); /* * Actions @@ -44,10 +48,24 @@ $object = new Establishment($db); /* * View */ -$page_name = "Establishments"; -llxHeader('', $langs->trans($page_name)); +llxHeader('', $langs->trans("Establishments")); + +$sortorder = GETPOST("sortorder"); +$sortfield = GETPOST("sortfield"); +if (!$sortorder) $sortorder="DESC"; +if (!$sortfield) $sortfield="e.rowid"; + +if ($page == -1) { + $page = 0 ; +} + +$offset = $conf->liste_limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +$limit = $conf->liste_limit; $form = new Form($db); +$establishmenttmp=new Establishment($db); dol_htmloutput_mesg($mesg); @@ -62,43 +80,50 @@ dol_fiche_head($head, 'establishments', $langs->trans("HRM"), 0, "user"); $sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status"; $sql.= " FROM ".MAIN_DB_PREFIX."establishment as e"; $sql.= " WHERE e.entity = ".$conf->entity; +$sql.= $db->order($sortfield,$sortorder); +$sql.= $db->plimit($limit+1, $offset); $result = $db->query($sql); if ($result) { - $var=false; - $num = $db->num_rows($result); - - $i = 0; + $num = $db->num_rows($result); + $i = 0; // Load attribute_label print '
'.$langs->trans('Date').''; - $form->select_date($dateinvoice,'','','','',"addpaiement",1,1); + $form->select_date($dateinvoice,'','','','',"addpaiement",1,1,0,0,'','',$object->date); print ''.$langs->trans('Comments').'
'.$langs->trans('PaymentMode').''; - $form->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid'); + $form->select_types_paiements(empty($_POST['paiementid'])?$obj->fk_mode_reglement:$_POST['paiementid'],'paiementid'); print ''; print '
'.$langs->trans('Account').''; - $form->select_comptes(empty($accountid)?'':$accountid,'accountid',0,'',2); + $form->select_comptes(empty($accountid)?$obj->fk_account:$accountid,'accountid',0,'',2); print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ""; + print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"e.name","","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Address"),$_SERVER["PHP_SELF"],"e.address","","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Zipcode"),$_SERVER["PHP_SELF"],"e.zip","","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"e.town","","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"e.status","","",'align="right"',$sortfield,$sortorder); + print "\n"; - if ($num) + $var=true; + + if ($num > 0) { $establishmentstatic=new Establishment($db); - while ($i < $num && $i < $max) - { + while ($i < min($num,$limit)) + { $obj = $db->fetch_object($result); - $fiscalyearstatic->id=$obj->rowid; - print ''; - print ''; - print ''; + + $establishmentstatic->id=$obj->rowid; + $establishmentstatic->name=$obj->name; + + $var=!$var; + print ''; + print ''; print ''; print ''; print ''; - print ''; - print ''; - $var=!$var; + + print ''; + print "\n"; + $i++; } diff --git a/htdocs/hrm/class/employee.class.php b/htdocs/hrm/class/employee.class.php index 4014bb717f2..1a1350b3b63 100644 --- a/htdocs/hrm/class/employee.class.php +++ b/htdocs/hrm/class/employee.class.php @@ -67,26 +67,41 @@ class Employee extends CommonObject * @param int $id Id of record to load * @return int <0 if KO, >0 if OK */ - function fetch($id) + function fetch($id='') { - $sql = "SELECT rowid, firstname, lastname, status, fk_user"; - $sql.= " FROM ".MAIN_DB_PREFIX."user"; + global $conf, $user; + + $sql = "SELECT e.rowid, e.firstname, e.lastname, e.gender, e.email, e.statut, e.entity, e.fk_user"; + $sql.= " FROM ".MAIN_DB_PREFIX."user as e"; $sql.= " WHERE rowid = ".$id; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $result = $this->db->query($sql); - if ( $result ) + if ($result) { $obj = $this->db->fetch_object($result); + if ($obj) + { + $this->id = $obj->rowid; + $this->lastname = $obj->lastname; + $this->firstname = $obj->firstname; + $this->gender = $obj->gender; + $this->address = $obj->address; + $this->zip = $obj->zip; + $this->town = $obj->town; + $this->statut = $obj->statut; + $this->photo = $obj->photo; - $this->id = $obj->rowid; - $this->name = $obj->name; - $this->address = $obj->address; - $this->zip = $obj->zip; - $this->town = $obj->town; - $this->status = $obj->status; + $this->db->free($result); + } + else + { + $this->error="EMPLOYEENOTFOUND"; + dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG); - return 1; + $this->db->free($result); + return 0; + } } else { diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php index c5ba77fd547..88b765740ef 100644 --- a/htdocs/hrm/class/establishment.class.php +++ b/htdocs/hrm/class/establishment.class.php @@ -34,6 +34,7 @@ class Establishment extends CommonObject public $fk_element = 'fk_establishment'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + var $id; var $rowid; var $name; @@ -43,6 +44,8 @@ class Establishment extends CommonObject var $status; // 0=open, 1=closed var $entity; + var $country_id; + var $statuts=array(); var $statuts_short=array(); @@ -69,12 +72,18 @@ class Establishment extends CommonObject */ function create($user) { - global $conf; + global $conf, $langs; $error = 0; - + $ret = 0; $now=dol_now(); + // Clean parameters + $this->address=($this->address>0?$this->address:$this->address); + $this->zip=($this->zip>0?$this->zip:$this->zip); + $this->town=($this->town>0?$this->town:$this->town); + $this->country_id=($this->country_id>0?$this->country_id:$this->country_id); + $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."establishment ("; @@ -83,22 +92,22 @@ class Establishment extends CommonObject $sql.= ", zip"; $sql.= ", town"; $sql.= ", status"; + $sql.= ", fk_country"; $sql.= ", entity"; $sql.= ", datec"; $sql.= ", fk_user_author"; $sql.= ") VALUES ("; - $sql.= " '".$this->name."'"; - $sql.= ", '".$this->address."'"; - $sql.= ", '".$this->zip."'"; - $sql.= ", '".$this->town."'"; + $sql.= " '".$this->db->escape($this->name)."'"; + $sql.= ", '".$this->db->escape($this->address)."'"; + $sql.= ", '".$this->db->escape($this->zip)."'"; + $sql.= ", '".$this->db->escape($this->town)."'"; + $sql.= ", ".$this->country_id; $sql.= ", ".$this->status; $sql.= ", ".$conf->entity; $sql.= ", '".$this->db->idate($now)."'"; $sql.= ", ". $user->id; $sql.= ")"; - $this->db->begin(); - dol_syslog(get_class($this)."::create", LOG_DEBUG); $resql = $this->db->query($sql); if (! $resql) { @@ -148,6 +157,7 @@ class Establishment extends CommonObject $sql .= ", address = '".$this->address."'"; $sql .= ", zip = '".$this->zip."'"; $sql .= ", town = '".$this->town."'"; + $sql .= ", status = '".$this->status."'"; $sql .= ", fk_user_mod = " . $user->id; $sql .= " WHERE rowid = ".$this->id; @@ -172,9 +182,11 @@ class Establishment extends CommonObject */ function fetch($id) { - $sql = "SELECT rowid, name, address, zip, town, status"; - $sql.= " FROM ".MAIN_DB_PREFIX."establishment"; - $sql.= " WHERE rowid = ".$id; + $sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status, e.fk_country as country_id,"; + $sql.= ' c.code as country_code, c.label as country'; + $sql.= " FROM ".MAIN_DB_PREFIX."establishment as e"; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON e.fk_country = c.rowid'; + $sql.= " WHERE e.rowid = ".$id; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $result = $this->db->query($sql); @@ -189,6 +201,10 @@ class Establishment extends CommonObject $this->town = $obj->town; $this->status = $obj->status; + $this->country_id = $obj->country_id; + $this->country_code = $obj->country_code; + $this->country = $obj->country; + return 1; } else @@ -257,23 +273,23 @@ class Establishment extends CommonObject } if ($mode == 2) { - if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]),'status4').' '.$langs->trans($this->statuts_short[$status]); - if ($status==1) return img_picto($langs->trans($this->statuts_short[$status]),'status8').' '.$langs->trans($this->statuts_short[$status]); + if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]),'statut4').' '.$langs->trans($this->statuts_short[$status]); + if ($status==1) return img_picto($langs->trans($this->statuts_short[$status]),'statut8').' '.$langs->trans($this->statuts_short[$status]); } if ($mode == 3) { - if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status4'); - if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status8'); + if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut4'); + if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut8'); } if ($mode == 4) { - if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status4').' '.$langs->trans($this->statuts[$status]); - if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status8').' '.$langs->trans($this->statuts[$status]); + if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut4').' '.$langs->trans($this->statuts[$status]); + if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut8').' '.$langs->trans($this->statuts[$status]); } if ($mode == 5) { - if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'status4'); - if ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'status8'); + if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut4'); + if ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut8'); } } @@ -298,20 +314,22 @@ class Establishment extends CommonObject { $obj = $this->db->fetch_object($result); $this->id = $obj->rowid; + + $this->date_creation = $this->db->jdate($obj->datec); if ($obj->fk_user_author) { $cuser = new User($this->db); $cuser->fetch($obj->fk_user_author); $this->user_creation = $cuser; } - if ($obj->fk_user_modif) + if ($obj->fk_user_mod) { $muser = new User($this->db); $muser->fetch($obj->fk_user_mod); $this->user_modification = $muser; + + $this->date_modification = $this->db->jdate($obj->tms); } - $this->date_creation = $this->db->jdate($obj->datec); - $this->date_modification = $this->db->jdate($obj->tms); } $this->db->free($result); } @@ -321,4 +339,46 @@ class Establishment extends CommonObject } } + /** + * Return clicable name (with picto eventually) + * + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto + * @return string String with URL + */ + function getNomUrl($withpicto=0) + { + global $langs; + + $result=''; + + $link = ''; + $linkend=''; + + $picto='building'; + + $label=$langs->trans("Show").': '.$this->name; + + if ($withpicto) $result.=($link.img_object($label,$picto).$linkend); + if ($withpicto && $withpicto != 2) $result.=' '; + if ($withpicto != 2) $result.=$link.$this->name.$linkend; + return $result; + } + + /** + * Return account country code + * + * @return string country code + */ + function getCountryCode() + { + global $mysoc; + + // We return country code of bank account + if (! empty($this->country_code)) return $this->country_code; + + // We return country code of managed company + if (! empty($mysoc->country_code)) return $mysoc->country_code; + + return ''; + } } diff --git a/htdocs/hrm/employee/list.php b/htdocs/hrm/employee/list.php index 1635ba41cda..86e1f3d10d5 100644 --- a/htdocs/hrm/employee/list.php +++ b/htdocs/hrm/employee/list.php @@ -169,8 +169,8 @@ if ($result) $employeestatic->email=$obj->email; $employeestatic->gender=$obj->gender; $employeestatic->societe_id=$obj->fk_soc; - $employeestatic->firstname=''; - $employeestatic->lastname=$obj->login; + $employeestatic->firstname=$obj->firstname; + $employeestatic->lastname=$obj->lastname; $li=$employeestatic->getNomUrl(1,'',0,0,24,1); @@ -203,8 +203,7 @@ if ($result) print ''; // Statut - $employeestatic->statut=$obj->statut; - print ''; + print ''; print ''; print "\n"; $i++; diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php index 533ad5117ff..10a1b42e961 100644 --- a/htdocs/hrm/establishment/card.php +++ b/htdocs/hrm/establishment/card.php @@ -81,34 +81,27 @@ else if ($action == 'add') if (empty($error)) { - $tmparray=getCountry(GETPOST('country_id','int'),'all',$db,$langs,0); - if (! empty($tmparray['id'])) - { - $object->country_id =$tmparray['id']; - $object->country_code =$tmparray['code']; - $object->country_label=$tmparray['label']; - } - $object->address = GETPOST('address', 'alpha'); $object->zip = GETPOST('zipcode', 'alpha'); $object->town = GETPOST('town', 'alpha'); - $object->fk_pays = $object->country_id; + $object->country_id = $_POST["country_id"]; $object->status = GETPOST('status','int'); $object->fk_user_author = $user->id; $object->datec = dol_now(); + + $id = $object->create($user); if ($id > 0) { header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); exit; - } - else - { - setEventMessage($object->error, 'errors'); - $action='create'; - } + } + else + { + setEventMessages($object->error, $object->errors, 'errors'); + } } else { @@ -131,12 +124,7 @@ else if ($action == 'update') $name = GETPOST('name', 'alpha'); if (empty($name)) { - setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('NameProperty')), 'errors'); - $error ++; - } - $typeid = GETPOST('typeid', 'int'); - if (empty($typeid)) { - setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('TypeProperty')), 'errors'); + setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('Name')), 'errors'); $error ++; } @@ -145,25 +133,23 @@ else if ($action == 'update') $object->address = GETPOST('address', 'alpha'); $object->zip = GETPOST('zipcode', 'alpha'); $object->town = GETPOST('town', 'alpha'); - $object->fk_pays = GETPOST('country_id', 'int'); - $object->rowid = GETPOST('id'); + $object->country_id = $_POST["country_id"]; $object->fk_user_mod = $user->id; - $id = $object->update(); + $result = $object->update(); - if ($id > 0) + if ($result > 0) { - header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $_POST['id']); exit; } - else - { - setEventMessage($object->error, 'errors'); - $action='create'; - } + else + { + setEventMessages($object->error, $object->errors, 'errors'); + } } } else { - header("Location: card.php?id=" . $id); + header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $_POST['id']); exit; } } @@ -193,11 +179,11 @@ if ($action == 'create') print '
'.$langs->trans("Ref").''.$langs->trans("Name").''.$langs->trans("Address").''.$langs->trans("Zipcode").''.$langs->trans("Town").''.$langs->trans("Status").'
'.img_object($langs->trans("ShowEstablishment"),"building").' '.$obj->rowid.''.$obj->name.'
'.$establishmentstatic->getNomUrl(1).''.$obj->address.''.$obj->zip.''.$obj->town.''.$establishmentstatic->LibStatut($obj->status,5).'
'; + print $establishmenttmp->getLibStatus(5); + print '
'.$employeestatic->getLibStatut(5).''.$employeestatic->getLibStatut(5).' 
'; // Name - print ''; + print ''; // Address print ''; - print ''; + print ''; print ''; @@ -205,7 +191,7 @@ if ($action == 'create') // Zipcode print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; @@ -273,46 +259,43 @@ else if ($id) // Ref print ""; - print ''; // Name - print ''; // Address - print ''; - print ''; + print ''; print ''; - print ''; + print ''; // Zipcode / Town - print ''; - print ''; // Country - print ''; - print ''; + print ''; print ''; print ''; // Status - print ''; @@ -347,7 +330,7 @@ else if ($id) // Ref print ''; @@ -379,7 +362,14 @@ else if ($id) // Country print ''; print ''; - print ''; + print ''; print ''; // Status diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php index 2bf014481ac..806bd893fbb 100644 --- a/htdocs/hrm/establishment/info.php +++ b/htdocs/hrm/establishment/info.php @@ -22,6 +22,7 @@ require('../../main.inc.php'); require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php'; $langs->load("admin"); diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php index 1be5f4cd607..c74778bb991 100644 --- a/htdocs/includes/adodbtime/adodb-time.inc.php +++ b/htdocs/includes/adodbtime/adodb-time.inc.php @@ -57,7 +57,7 @@ adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) COPYRIGHT -(c) 2003-2005 John Lim and released under BSD-style license except for code by +(c) 2003-2014 John Lim and released under BSD-style license except for code by jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year and originally found at http://www.php.net/manual/en/function.mktime.php @@ -73,6 +73,9 @@ These should be posted to the ADOdb forums at FUNCTION DESCRIPTIONS +** FUNCTION adodb_time() + +Returns the current time measured in the number of seconds since the Unix Epoch (January 1 1970 00:00:00 GMT) as an unsigned integer. ** FUNCTION adodb_getdate($date=false) @@ -241,6 +244,14 @@ b. Implement daylight savings, which looks awfully complicated, see CHANGELOG +- 16 Jan 2011 0.36 +Added adodb_time() which returns current time. If > 2038, will return as float + +- 7 Feb 2011 0.35 +Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc. + +- 13 July 2010 0.34 +Changed adodb_get_gm_diff to use DateTimeZone(). - 11 Feb 2008 0.33 * Bug in 0.32 fix for hour handling. Fixed. @@ -386,7 +397,7 @@ First implementation. /* Version Number */ -define('ADODB_DATE_VERSION',0.33); +define('ADODB_DATE_VERSION',0.35); $ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2); @@ -601,6 +612,12 @@ function adodb_date_test() else print "

Failed :-(

"; } +function adodb_time() +{ + $d = new DateTime(); + return $d->format('U'); +} + /** Returns day of week, 0 = Sunday,... 6=Saturday. Algorithm from PEAR::Date_Calc @@ -729,9 +746,17 @@ global $ADODB_DATETIME_CLASS; } else { if (isset($TZ)) return $TZ; $y = date('Y'); - $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y); + /* + if (function_exists('date_default_timezone_get') && function_exists('timezone_offset_get')) { + $tzonename = date_default_timezone_get(); + if ($tzonename) { + $tobj = new DateTimeZone($tzonename); + $TZ = -timezone_offset_get($tobj,new DateTime("now",$tzo)); + } + } + */ + if (empty($TZ)) $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y); } - return $TZ; } @@ -1006,7 +1031,6 @@ function adodb_tz_offset($gmt,$isphp5) return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); else return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); - break; } @@ -1041,11 +1065,19 @@ function adodb_date($fmt,$d=false,$is_gmt=false) { static $daylight; global $ADODB_DATETIME_CLASS; +static $jan1_1971; + + + if (!isset($daylight)) { + $daylight = function_exists('adodb_daylight_sv'); + if (empty($jan1_1971)) $jan1_1971 = mktime(0,0,0,1,1,1971); // we only use date() when > 1970 as adodb_mktime() only uses mktime() when > 1970 + } if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt); if (!defined('ADODB_TEST_DATES')) { if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range - if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer + + if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= $jan1_1971) // if windows, must be +ve integer return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d); } @@ -1054,7 +1086,6 @@ global $ADODB_DATETIME_CLASS; $arr = _adodb_getdate($d,true,$is_gmt); - if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv'); if ($daylight) adodb_daylight_sv($arr, $is_gmt); $year = $arr['year']; @@ -1075,6 +1106,9 @@ global $ADODB_DATETIME_CLASS; */ for ($i=0; $i < $max; $i++) { switch($fmt[$i]) { + case 'e': + $dates .= date('e'); + break; case 'T': if ($ADODB_DATETIME_CLASS) { $dt = new DateTime(); @@ -1215,7 +1249,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa // for windows, we don't check 1970 because with timezone differences, // 1 Jan 1970 could generate negative timestamp, which is illegal - $usephpfns = (1971 < $year && $year < 2038 + $usephpfns = (1970 < $year && $year < 2038 || !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038) ); @@ -1422,5 +1456,3 @@ global $ADODB_DATE_LOCALE; $ret = adodb_date($fmtdate, $ts, $is_gmt); return $ret; } - -?> \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/README.md b/htdocs/includes/ckeditor/ckeditor/README.md index c5a55cd88f8..d6b5e2af515 100644 --- a/htdocs/includes/ckeditor/ckeditor/README.md +++ b/htdocs/includes/ckeditor/ckeditor/README.md @@ -1,39 +1,82 @@ -CKEditor 4 -========== +CKEditor 4 - Releases +===================== -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -http://ckeditor.com - See LICENSE.md for license information. +## Releases Code -CKEditor is a text editor to be used inside web pages. It's not a replacement -for desktop text editors like Word or OpenOffice, but a component to be used as -part of web applications and websites. +This repository contains the official release versions of [CKEditor](http://ckeditor.com). + +There are four versions for each release — `standard-all`, `basic`, `standard`, and `full`. +They differ in the number of plugins that are compiled into the main `ckeditor.js` file as well as the toolbar configuration. + +See the [comparison](http://ckeditor.com/presets) of the `basic`, `standard`, and `full` installation presets for more details. + +The `standard-all` build includes all official CKSource plugins with only those from the `standard` installation preset compiled into the `ckeditor.js` file and enabled in the configuration. + +All versions available in this repository were built using [CKBuilder](http://ckeditor.com/builder), so they are optimized and ready to be used in a production environment. ## Documentation -The full editor documentation is available online at the following address: -http://docs.ckeditor.com +Developer documentation for CKEditor is available online at: . ## Installation -Installing CKEditor is an easy task. Just follow these simple steps: +### Git clone - 1. **Download** the latest version from the CKEditor website: - http://ckeditor.com. You should have already completed this step, but be - sure you have the very latest version. - 2. **Extract** (decompress) the downloaded file into the root of your website. +To install one of the available releases, just clone this repository and switch to the respective branch (see next section): -**Note:** CKEditor is by default installed in the `ckeditor` folder. You can -place the files in whichever you want though. + git clone -b git://github.com/ckeditor/ckeditor-releases.git + +### Git submodule + +If you are using git for your project and you want to integrate CKEditor, we recommend to add this repository as a +[submodule](http://git-scm.com/book/en/Git-Tools-Submodules). + + git submodule add -b git://github.com/ckeditor/ckeditor-releases.git + git commit -m "Added CKEditor submodule in directory." + +### Using Package Managers + +See the [Installing CKEditor with Package Managers](http://docs.ckeditor.com/#!/guide/dev_package_managers) article for more details about installing CKEditor with Bower and Composer. + +## Repository Structure + +### Branches + +This repository contains the following branches: + + - `master` and `latest` – the latest release of the `standard-all` preset (including betas). + - `stable` – the latest stable release of the `standard-all` preset (non-beta). + - `A.B.x` (e.g. `4.3.x`) – the latest release of the `standard-all` preset in the `A.B` branch. + - `(basic|standard|full)/stable` – the latest stable release tag point (non-beta). + - `(basic|standard|full)/latest` – the latest release tag point (including betas). + - `(basic|standard|full)/A.B.x` (e.g. `basic/4.0.x`) – the latest releases in the `A.B` branch. + +### Tags + +**Since version 4.3.3** this repository uses the following tag naming rules: + + - `x.y.z` – contains the `standard-all` editor build, e.g. `4.3.3`, `4.4.0` etc. + - `(basic|standard|full)/x.y.z` – contains the editor build with a given preset, e.g. `basic/4.3.3`. + +The version numbers follow the [Semantic Versioning 2.0.0](http://semver.org/) scheme. + +Up to version **4.3.2** the tags were released in the following form `x.y[.z]/(basic|standard|full)`. +For example: `4.0/basic`, `4.0.1/standard`. This convention was changed in CKEditor 4.3.3 to conform to the Semantic Versioning scheme. ## Checking Your Installation -The editor comes with a few sample pages that can be used to verify that -installation proceeded properly. Take a look at the `samples` directory. +The editor comes with a few sample pages that can be used to verify if the installation succeeded. Take a look at the `samples` directory. -To test your installation, just call the following page at your website: +To test your installation, just call the following page for your website: http:////samples/index.html For example: http://www.example.com/ckeditor/samples/index.html + +### License + +Licensed under the GPL, LGPL, and MPL licenses, at your choice. + +Please check the `LICENSE.md` file for more information about the license. \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/_source/CHANGES.md b/htdocs/includes/ckeditor/ckeditor/_source/CHANGES.md deleted file mode 100644 index a5bec2ba830..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/CHANGES.md +++ /dev/null @@ -1,442 +0,0 @@ -CKEditor 4 Changelog -==================== - -## CKEditor 4.3.3 - -Fixed Issues: - -* [#11500](http://dev.ckeditor.com/ticket/11500): [Webkit/Blink] Fixed: Selection lost when setting data in another inline editor. Additionally, [`selection.removeAllRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-removeAllRanges) is now scoped to selection's [root](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-property-root). -* [#11104](http://dev.ckeditor.com/ticket/11104): [IE] Fixed: Various issues with scrolling and selection when focusing widgets. -* [#11487](http://dev.ckeditor.com/ticket/11487): Moving mouse over the [Enhanced Image](http://ckeditor.com/addon/image2) widget will no longer change the value returned by the [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method. -* [#8673](http://dev.ckeditor.com/ticket/8673): [WebKit] Fixed: Cannot select and remove the [Page Break](http://ckeditor.com/addon/pagebreak). -* [#11413](http://dev.ckeditor.com/ticket/11413): Fixed: Incorrect [`editor.execCommand()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-execCommand) behavior. -* [#11438](http://dev.ckeditor.com/ticket/11438): Splitting table cells vertically is no longer changing table structure. -* [#8899](http://dev.ckeditor.com/ticket/8899): Fixed: Links in the [About CKEditor](http://ckeditor.com/addon/about) dialog window now open in a new browser window or tab. -* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed: [Menu button](http://ckeditor.com/addon/menubutton) panel not showing in the source mode. -* [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not canceled anymore after editing was triggered. -* [#11253](http://dev.ckeditor.com/ticket/11253): [IE] Fixed: Clipped upload button in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window. -* [#11359](http://dev.ckeditor.com/ticket/11359): Standardized the way anchors are discovered by the [Link](http://ckeditor.com/addon/link) plugin. -* [#11058](http://dev.ckeditor.com/ticket/11058): [IE8] Fixed: Error when deleting a table row. -* [#11508](http://dev.ckeditor.com/ticket/11508): Fixed: [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) discovering protected attributes within other attributes' values. -* [#11533](http://dev.ckeditor.com/ticket/11533): Widgets: Avoid recurring upcasts if the DOM structure was modified during an upcast. -* [#11400](http://dev.ckeditor.com/ticket/11400): Fixed: The [`domObject.removeAllListeners()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.domObject-method-removeAllListeners) method does not remove custom listeners completely. -* [#11493](http://dev.ckeditor.com/ticket/11493): Fixed: The [`selection.getRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-getRanges) method does not override cached ranges when used with the `onlyEditables` argument. -* [#11390](http://dev.ckeditor.com/ticket/11390): [IE] All [XML](http://ckeditor.com/addon/xml) plugin [methods](http://docs.ckeditor.com/#!/api/CKEDITOR.xml) now work in IE10+. -* [#11542](http://dev.ckeditor.com/ticket/11542): [IE11] Fixed: Blurry toolbar icons when Right-to-Left UI language is set. -* [#11504](http://dev.ckeditor.com/ticket/11504): Fixed: When [`config.fullPage`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fullPage) is set to `true`, entities are not encoded in editor output. -* [#11004](http://dev.ckeditor.com/ticket/11004): Integrated [Enhanced Image](http://ckeditor.com/addon/image2) dialog window with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter). -* [#11439](http://dev.ckeditor.com/ticket/11439): Fixed: Properties get cloned in the Cell Properties dialog window if multiple cells are selected. - -## CKEditor 4.3.2 - -Fixed Issues: - -* [#11331](http://dev.ckeditor.com/ticket/11331): A menu button will have a changed label when selected instead of using the `aria-pressed` attribute. -* [#11177](http://dev.ckeditor.com/ticket/11177): Widget drag handler improvements: - * [#11176](http://dev.ckeditor.com/ticket/11176): Fixed: Initial position is not updated when the widget data object is empty. - * [#11001](http://dev.ckeditor.com/ticket/11001): Fixed: Multiple synchronous layout recalculations are caused by initial drag handler positioning causing performance issues. - * [#11161](http://dev.ckeditor.com/ticket/11161): Fixed: Drag handler is not repositioned in various situations. - * [#11281](http://dev.ckeditor.com/ticket/11281): Fixed: Drag handler and mask are duplicated after widget reinitialization. -* [#11207](http://dev.ckeditor.com/ticket/11207): [Firefox] Fixed: Misplaced [Enhanced Image](http://ckeditor.com/addon/image2) resizer in the inline editor. -* [#11102](http://dev.ckeditor.com/ticket/11102): `CKEDITOR.template` improvements: - * [#11102](http://dev.ckeditor.com/ticket/11102): Added newline character support. - * [#11216](http://dev.ckeditor.com/ticket/11216): Added "\\'" substring support. -* [#11121](http://dev.ckeditor.com/ticket/11121): [Firefox] Fixed: High Contrast mode is enabled when the editor is loaded in a hidden iframe. -* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl). -* [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables. -* [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin. -* [#11133](http://dev.ckeditor.com/ticket/11133): [Page Break](http://ckeditor.com/addon/pagebreak) becomes editable if pasted. -* [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native Undo executed once the bottom of the snapshot stack is reached. -* [#11131](http://dev.ckeditor.com/ticket/11131): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Error thrown when switching to source mode if the selection was in widget's nested editable. -* [#11139](http://dev.ckeditor.com/ticket/11139): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Elements Path is not cleared after switching to source mode. -* [#10778](http://dev.ckeditor.com/ticket/10778): Fixed a bug with range enlargement. The range no longer expands to visible whitespace. -* [#11146](http://dev.ckeditor.com/ticket/11146): [IE] Fixed: Preview window switches Internet Explorer to Quirks Mode. -* [#10762](http://dev.ckeditor.com/ticket/10762): [IE] Fixed: JavaScript code displayed in preview window's URL bar. -* [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method that allows to block upcasting given element to a widget. -* [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as Plain Text conflict with the [MooTools](http://mootools.net) library. -* [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable. -* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)). -* [#10787](http://dev.ckeditor.com/ticket/10787): [Firefox] Fixed: Broken replacement of text while pasting into `div`-based editor. -* [#10884](http://dev.ckeditor.com/ticket/10884): Widgets integration with the [Show Blocks](http://ckeditor.com/addon/showblocks) plugin. -* [#11021](http://dev.ckeditor.com/ticket/11021): Fixed: An error thrown when selecting entire editable contents while fake selection is on. -* [#11086](http://dev.ckeditor.com/ticket/11086): [IE8] Re-enable inline widgets drag&drop in Internet Explorer 8. -* [#11372](http://dev.ckeditor.com/ticket/11372): Widgets: Special characters encoded twice in nested editables. -* [#10068](http://dev.ckeditor.com/ticket/10068): Fixed: Support for protocol-relative URLs. -* [#11283](http://dev.ckeditor.com/ticket/11283): [Enhanced Image](http://ckeditor.com/addon/image2): A `
` element with `text-align: center` and an image inside is not recognised correctly. -* [#11196](http://dev.ckeditor.com/ticket/11196): [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp): Allowed additional keyboard button labels to be translated in the dialog window. - -## CKEditor 4.3.1 - -**Important Notes:** - -* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)). -* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)). - -Fixed Issues: - -* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event. -* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method. -* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder. -* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu. -* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option. -* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor. -* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions. -* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes. -* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image. -* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image. -* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading. -* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget. -* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details. -* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer. -* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode. -* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item. -* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back. -* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more. -* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked. -* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle. -* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements. -* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors. -* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word. -* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the ` - * ... - * CKEDITOR.replace( 'myfield' ); - * - * var textarea = document.body.appendChild( document.createElement( 'textarea' ) ); - * CKEDITOR.replace( textarea ); - * - * @param {Object/String} element The DOM element (textarea), its ID, or name. - * @param {Object} [config] The specific configuration to apply to this - * editor instance. Configuration set here will override the global CKEditor settings - * (see {@link CKEDITOR.config}). - * @returns {CKEDITOR.editor} The editor instance created. - */ - CKEDITOR.replace = function( element, config ) { - return createInstance( element, config, null, CKEDITOR.ELEMENT_MODE_REPLACE ); - }; - - /** - * Creates a new editor instance at the end of a specific DOM element. - * - *
- * ... - * CKEDITOR.appendTo( 'editorSpace' ); - * - * @param {Object/String} element The DOM element, its ID, or name. - * @param {Object} [config] The specific configuration to apply to this - * editor instance. Configuration set here will override the global CKEditor settings - * (see {@link CKEDITOR.config}). - * @param {String} [data] Since 3.3. Initial value for the instance. - * @returns {CKEDITOR.editor} The editor instance created. - */ - CKEDITOR.appendTo = function( element, config, data ) - { - return createInstance( element, config, data, CKEDITOR.ELEMENT_MODE_APPENDTO ); - }; - - /** - * Replaces all ` - data = protectElements( data, protectTextareaRegex ); - - // Before anything, we must protect the URL attributes as the - // browser may changing them when setting the innerHTML later in - // the code. - data = protectAttributes( data ); - - // Protect elements than can't be set inside a DIV. E.g. IE removes - // style tags from innerHTML. (#3710) - data = protectElements( data, protectElementsRegex ); - - // Certain elements has problem to go through DOM operation, protect - // them by prefixing 'cke' namespace. (#3591) - data = protectElementsNames( data ); - - // All none-IE browsers ignore self-closed custom elements, - // protecting them into open-close. (#3591) - data = protectSelfClosingElements( data ); - - // Compensate one leading line break after 
 open as browsers
-			// eat it up. (#5789)
-			data = protectPreFormatted( data );
-
-			var fixBin = evtData.context || editor.editable().getName(),
-				isPre;
-
-			// Old IEs loose formats when load html into 
.
-			if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 && fixBin == 'pre' ) {
-				fixBin = 'div';
-				data = '
' + data + '
';
-				isPre = 1;
-			}
-
-			// Call the browser to help us fixing a possibly invalid HTML
-			// structure.
-			var el = editor.document.createElement( fixBin );
-			// Add fake character to workaround IE comments bug. (#3801)
-			el.setHtml( 'a' + data );
-			data = el.getHtml().substr( 1 );
-
-			// Restore shortly protected attribute names.
-			data = data.replace( new RegExp( ' data-cke-' + CKEDITOR.rnd + '-', 'ig' ), ' ' );
-
-			isPre && ( data = data.replace( /^
|<\/pre>$/gi, '' ) );
-
-			// Unprotect "some" of the protected elements at this point.
-			data = unprotectElementNames( data );
-
-			data = unprotectElements( data );
-
-			// Restore the comments that have been protected, in this way they
-			// can be properly filtered.
-			data = unprotectRealComments( data );
-
-			// Now use our parser to make further fixes to the structure, as
-			// well as apply the filter.
-			evtData.dataValue = CKEDITOR.htmlParser.fragment.fromHtml(
-				data, evtData.context, evtData.fixForBody === false ? false : getFixBodyTag( evtData.enterMode, editor.config.autoParagraph ) );
-		}, null, null, 5 );
-
-		// Filter incoming "data".
-		// Add element filter before htmlDataProcessor.dataFilter when purifying input data to correct html.
-		editor.on( 'toHtml', function( evt ) {
-			if ( evt.data.filter.applyTo( evt.data.dataValue, true, evt.data.dontFilter, evt.data.enterMode ) )
-				editor.fire( 'dataFiltered' );
-		}, null, null, 6 );
-
-		editor.on( 'toHtml', function( evt ) {
-			evt.data.dataValue.filterChildren( that.dataFilter, true );
-		}, null, null, 10 );
-
-		editor.on( 'toHtml', function( evt ) {
-			var evtData = evt.data,
-				data = evtData.dataValue,
-				writer = new CKEDITOR.htmlParser.basicWriter();
-
-			data.writeChildrenHtml( writer );
-			data = writer.getHtml( true );
-
-			// Protect the real comments again.
-			evtData.dataValue = protectRealComments( data );
-		}, null, null, 15 );
-
-
-		editor.on( 'toDataFormat', function( evt ) {
-			var data = evt.data.dataValue;
-
-			// #10854 - we need to strip leading blockless 
 which FF adds
-			// automatically when editable contains only non-editable content.
-			// We do that for every browser (so it's a constant behavior) and
-			// not in BR mode, in which chance of valid leading blockless 
 is higher.
-			if ( evt.data.enterMode != CKEDITOR.ENTER_BR )
-				data = data.replace( /^
/i, '' );
-
-			evt.data.dataValue = CKEDITOR.htmlParser.fragment.fromHtml(
-				data, evt.data.context, getFixBodyTag( evt.data.enterMode, editor.config.autoParagraph ) );
-		}, null, null, 5 );
-
-		editor.on( 'toDataFormat', function( evt ) {
-			evt.data.dataValue.filterChildren( that.htmlFilter, true );
-		}, null, null, 10 );
-
-		// Transform outcoming "data".
-		// Add element filter after htmlDataProcessor.htmlFilter when preparing output data HTML.
-		editor.on( 'toDataFormat', function( evt ) {
-			evt.data.filter.applyTo( evt.data.dataValue, false, true );
-		}, null, null, 11 );
-
-		editor.on( 'toDataFormat', function( evt ) {
-			var data = evt.data.dataValue,
-				writer = that.writer;
-
-			writer.reset();
-			data.writeChildrenHtml( writer );
-			data = writer.getHtml( true );
-
-			// Restore those non-HTML protected source. (#4475,#4880)
-			data = unprotectRealComments( data );
-			data = unprotectSource( data, editor );
-
-			evt.data.dataValue = data;
-		}, null, null, 15 );
-	};
-
-	CKEDITOR.htmlDataProcessor.prototype = {
-		/**
-		 * Processes the input (potentially malformed) HTML to a purified form which
-		 * is suitable for using in the WYSIWYG editable.
-		 *
-		 * This method fires the {@link CKEDITOR.editor#toHtml} event which makes it possible
-		 * to hook into the process at various stages.
-		 *
-		 * **Note:** Since CKEditor 4.3 the signature of this method changed and all options
-		 * are now grouped in one `options` object. Previously `context`, `fixForBody` and `dontFilter`
-		 * were passed separately.
-		 *
-		 * @param {String} data The raw data.
-		 * @param {Object} [options] The options object.
-		 * @param {String} [options.context] The tag name of a context element within which
-		 * the input is to be processed, default to be the editable element.
-		 * If `null` is passed, then data will be parsed without context (as children of {@link CKEDITOR.htmlParser.fragment}).
-		 * See {@link CKEDITOR.htmlParser.fragment#fromHtml} for more details.
-		 * @param {Boolean} [options.fixForBody=true] Whether to trigger the auto paragraph for non-block contents.
-		 * @param {CKEDITOR.filter} [options.filter] When specified, instead of using the {@link CKEDITOR.editor#filter main filter},
-		 * passed instance will be used to filter the content.
-		 * @param {Boolean} [options.dontFilter] Do not filter data with {@link CKEDITOR.filter} (note: transformations
-		 * will be still applied).
-		 * @param {Number} [options.enterMode] When specified it will be used instead of the {@link CKEDITOR.editor#enterMode main enterMode}.
-		 * @returns {String}
-		 */
-		toHtml: function( data, options, fixForBody, dontFilter ) {
-			var editor = this.editor,
-				context, filter, enterMode;
-
-			// Typeof null == 'object', so check truthiness of options too.
-			if ( options && typeof options == 'object' ) {
-				context = options.context;
-				fixForBody = options.fixForBody;
-				dontFilter = options.dontFilter;
-				filter = options.filter;
-				enterMode = options.enterMode;
-			}
-			// Backward compatibility. Since CKEDITOR 4.3 every option was a separate argument.
-			else
-				context = options;
-
-			// Fall back to the editable as context if not specified.
-			if ( !context && context !== null )
-				context = editor.editable().getName();
-
-			return editor.fire( 'toHtml', {
-				dataValue: data,
-				context: context,
-				fixForBody: fixForBody,
-				dontFilter: dontFilter,
-				filter: filter || editor.filter,
-				enterMode: enterMode || editor.enterMode
-			} ).dataValue;
-		},
-
-		/**
-		 * See {@link CKEDITOR.dataProcessor#toDataFormat}.
-		 *
-		 * This method fires the {@link CKEDITOR.editor#toDataFormat} event which makes it possible
-		 * to hook into the process at various steps.
-		 *
-		 * @param {String} html
-		 * @param {Object} [options] The options object.
-		 * @param {String} [options.context] The tag name of a context element within which
-		 * the input is to be processed, default to be the editable element.
-		 * @param {CKEDITOR.filter} [options.filter] When specified, instead of using the {@link CKEDITOR.editor#filter main filter},
-		 * passed instance will be used to apply content transformations to the content.
-		 * @param {Number} [options.enterMode] When specified it will be used instead of the {@link CKEDITOR.editor#enterMode main enterMode}.
-		 * @returns {String}
-		 */
-		toDataFormat: function( html, options ) {
-			var context, filter, enterMode;
-
-			// Do not shorten this to `options && options.xxx`, because
-			// falsy `options` will be passed instead of undefined.
-			if ( options ) {
-				context = options.context;
-				filter = options.filter;
-				enterMode = options.enterMode;
-			}
-
-			// Fall back to the editable as context if not specified.
-			if ( !context && context !== null )
-				context = this.editor.editable().getName();
-
-			return this.editor.fire( 'toDataFormat', {
-				dataValue: html,
-				filter: filter || this.editor.filter,
-				context: context,
-				enterMode: enterMode || this.editor.enterMode
-			} ).dataValue;
-		}
-	};
-
-	// Produce a set of filtering rules that handles bogus and filler node at the
-	// end of block/pseudo block, in the following consequence:
-	// 1. elements: - this filter removes any bogus node, then check
-	// if it's an empty block that requires a filler.
-	// 2. elements:
 - After cleaned with bogus, this filter checks the real
-	// line-break BR to compensate a filler after it.
-	//
-	// Terms definitions:
-	// filler: An element that's either 
 or &NBSP; at the end of block that established line height.
-	// bogus: Whenever a filler is proceeded with inline content, it becomes a bogus which is subjected to be removed.
-	//
-	// Various forms of the filler:
-	// In output HTML: Filler should be consistently &NBSP; 
 at the end of block is always considered as bogus.
-	// In Wysiwyg HTML: Browser dependent - see env.needsBrFiller. Either BR for when needsBrFiller is true, or &NBSP; otherwise.
-	// 
 is NEVER considered as bogus when needsBrFiller is true.
-	function createBogusAndFillerRules( editor, type ) {
-		function createFiller( isOutput ) {
-			return isOutput || CKEDITOR.env.needsNbspFiller ?
-				new CKEDITOR.htmlParser.text( '\xa0' ) :
-				new CKEDITOR.htmlParser.element( 'br', { 'data-cke-bogus': 1 } );
-		}
-
-		// This text block filter, remove any bogus and create the filler on demand.
-		function blockFilter( isOutput, fillEmptyBlock ) {
-
-			return function( block ) {
-
-				// DO NOT apply the filer if it's a fragment node.
-				if ( block.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT )
-					return;
-
-				cleanBogus( block );
-
-				// [Opera] it's mandatory for the filler to present inside of empty block when in WYSIWYG.
-				if ( ( ( CKEDITOR.env.opera && !isOutput ) ||
-						( typeof fillEmptyBlock == 'function' ? fillEmptyBlock( block ) !== false : fillEmptyBlock ) ) &&
-						 isEmptyBlockNeedFiller( block ) )
-				{
-					block.add( createFiller( isOutput ) );
-				}
-			};
-		}
-
-		// Append a filler right after the last line-break BR, found at the end of block.
-		function brFilter( isOutput ) {
-			return function( br ) {
-
-				// DO NOT apply the filer if parent's a fragment node.
-				if ( br.parent.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT )
-					return;
-
-				var attrs = br.attributes;
-				// Dismiss BRs that are either bogus or eol marker.
-				if ( 'data-cke-bogus' in attrs ||
-						 'data-cke-eol' in attrs ) {
-					delete attrs [ 'data-cke-bogus' ];
-					return;
-				}
-
-				// Judge the tail line-break BR, and to insert bogus after it.
-				var next = getNext( br ), previous = getPrevious( br );
-
-				if ( !next && isBlockBoundary( br.parent ) )
-					append( br.parent, createFiller( isOutput ) );
-				else if ( isBlockBoundary( next ) && previous && !isBlockBoundary( previous ) )
-					createFiller( isOutput ).insertBefore( next );
-			};
-		}
-
-		// Determinate whether this node is potentially a bogus node.
-		function maybeBogus( node, atBlockEnd ) {
-
-			// BR that's not from IE<11 DOM, except for a EOL marker.
-			if ( !( isOutput && !CKEDITOR.env.needsBrFiller ) &&
-					 node.type == CKEDITOR.NODE_ELEMENT && node.name == 'br' &&
-					 !node.attributes[ 'data-cke-eol' ] )
-				return true;
-
-			var match;
-			// NBSP, possibly.
-			if ( node.type == CKEDITOR.NODE_TEXT &&
-					 ( match = node.value.match( tailNbspRegex ) ) )
-			{
-				// We need to separate tail NBSP out of a text node, for later removal.
-				if ( match.index ) {
-					( new CKEDITOR.htmlParser.text( node.value.substring( 0, match.index ) ) ).insertBefore( node );
-					node.value = match[ 0 ];
-				}
-
-				// From IE<11 DOM, at the end of a text block, or before block boundary.
-				if ( !CKEDITOR.env.needsBrFiller && isOutput && ( !atBlockEnd || node.parent.name in textBlockTags ) )
-					return true;
-
-				// From the output.
-				if ( !isOutput ) {
-					var previous = node.previous;
-
-					// Following a line-break at the end of block.
-					if ( previous && previous.name == 'br' )
-						return true;
-
-					// Or a single NBSP between two blocks.
-					if ( !previous || isBlockBoundary( previous ) )
-						return true;
-				}
-			}
-
-			return false;
-		}
-
-		// Removes all bogus inside of this block, and to convert fillers into the proper form.
-		function cleanBogus( block ) {
-			var bogus = [];
-			var last = getLast( block ), node, previous;
-			if ( last ) {
-
-				// Check for bogus at the end of this block.
-				// e.g. 
foo

-				maybeBogus( last, 1 ) && bogus.push( last );
-
-				while ( last ) {
-
-					// Check for bogus at the end of any pseudo block contained.
-					if ( isBlockBoundary( last ) &&
-							 ( node = getPrevious( last ) ) &&
-							 maybeBogus( node ) )
-					{
-						// Bogus must have inline proceeding, instead single BR between two blocks,
-						// is considered as filler, e.g. 


-						if ( ( previous = getPrevious( node ) ) && !isBlockBoundary( previous ) )
-							bogus.push( node );
-						// Convert the filler into appropriate form.
-						else {
-							createFiller( isOutput ).insertAfter( node );
-							node.remove();
-						}
-					}
-
-					last = last.previous;
-				}
-			}
-
-			// Now remove all bogus collected from above.
-			for ( var i = 0 ; i < bogus.length ; i++ )
-				bogus[ i ].remove();
-		}
-
-		// Judge whether it's an empty block that requires a filler node.
-		function isEmptyBlockNeedFiller( block ) {
-
-			// DO NOT fill empty editable in IE<11.
-			if ( !isOutput && !CKEDITOR.env.needsBrFiller && block.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT )
-				return false;
-
-			// 1. For IE version >=8,  empty blocks are displayed correctly themself in wysiwiyg;
-			// 2. For the rest, at least table cell and list item need no filler space. (#6248)
-			if ( !isOutput && !CKEDITOR.env.needsBrFiller &&
-					 ( document.documentMode > 7 ||
-						 block.name in CKEDITOR.dtd.tr ||
-						 block.name in CKEDITOR.dtd.$listItem ) ) {
-				return false;
-			}
-
-			var last = getLast( block );
-			return !last || block.name == 'form' && last.name == 'input' ;
-		}
-
-		var rules = { elements: {} };
-		var isOutput = type == 'html';
-
-		// Build the list of text blocks.
-		var textBlockTags = CKEDITOR.tools.extend( {}, blockLikeTags );
-		for ( var i in textBlockTags ) {
-			if ( !( '#' in dtd[ i ] ) )
-				delete textBlockTags[ i ];
-		}
-
-		for ( i in textBlockTags )
-			rules.elements[ i ] = blockFilter( isOutput, editor.config.fillEmptyBlocks !== false );
-
-		// Editable element is to be checked separately.
-		rules.root = blockFilter( isOutput );
-		rules.elements.br = brFilter( isOutput );
-		return rules;
-	}
-
-	function getFixBodyTag( enterMode, autoParagraph ) {
-		return ( enterMode != CKEDITOR.ENTER_BR && autoParagraph !== false ) ? enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
-	}
-
-	// Regex to scan for   at the end of blocks, which are actually placeholders.
-	// Safari transforms the   to \xa0. (#4172)
-	var tailNbspRegex = /(?: |\xa0)$/;
-
-	var protectedSourceMarker = '{cke_protected}';
-
-	function getLast( node ) {
-		var last = node.children[ node.children.length - 1 ];
-		while ( last && isEmpty( last ) )
-			last = last.previous;
-		return last;
-	}
-
-	function getNext( node ) {
-		var next = node.next;
-		while ( next && isEmpty( next ) )
-			next = next.next;
-		return next;
-	}
-
-	function getPrevious( node ) {
-		var previous = node.previous;
-		while ( previous && isEmpty( previous ) )
-			previous = previous.previous;
-		return previous;
-	}
-
-	// Judge whether the node is an ghost node to be ignored, when traversing.
-	function isEmpty( node ) {
-		return node.type == CKEDITOR.NODE_TEXT &&
-		  !CKEDITOR.tools.trim( node.value ) ||
-		  node.type == CKEDITOR.NODE_ELEMENT &&
-		  node.attributes[ 'data-cke-bookmark' ];
-	}
-
-	// Judge whether the node is a block-like element.
-	function isBlockBoundary( node ) {
-		return node &&
-					 ( node.type == CKEDITOR.NODE_ELEMENT && node.name in blockLikeTags ||
-						 node.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT );
-	}
-
-	function append( parent, node ) {
-		var last = parent.children[ parent.children.length -1 ];
-		parent.children.push( node );
-		node.parent = parent;
-		if ( last ) {
-			last.next = node;
-			node.previous = last;
-		}
-	}
-
-	function getNodeIndex( node ) {
-		return node.parent ? node.getIndex() : -1;
-	}
-
-	var dtd = CKEDITOR.dtd,
-		// Define orders of table elements.
-		tableOrder = [ 'caption', 'colgroup', 'col', 'thead', 'tfoot', 'tbody' ],
-		// List of all block elements.
-		blockLikeTags = CKEDITOR.tools.extend( {}, dtd.$blockLimit, dtd.$block );
-
-	//
-	// DATA filter rules ------------------------------------------------------
-	//
-
-	var defaultDataFilterRulesEditableOnly = {
-		elements: {
-			input: protectReadOnly,
-			textarea: protectReadOnly
-		}
-	};
-
-	// These rules will also be applied to non-editable content.
-	var defaultDataFilterRulesForAll = {
-		attributeNames: [
-			// Event attributes (onXYZ) must not be directly set. They can become
-			// active in the editing area (IE|WebKit).
-			[ ( /^on/ ), 'data-cke-pa-on' ],
-
-			// Don't let some old expando enter editor. Concerns only IE8,
-			// but for consistency remove on all browsers.
-			[ ( /^data-cke-expando$/ ), '' ]
-		]
-	};
-
-	// Disable form elements editing mode provided by some browsers. (#5746)
-	function protectReadOnly( element ) {
-		var attrs = element.attributes;
-
-		// We should flag that the element was locked by our code so
-		// it'll be editable by the editor functions (#6046).
-		if ( attrs.contenteditable != 'false' )
-			attrs[ 'data-cke-editable' ] = attrs.contenteditable ? 'true' : 1;
-
-		attrs.contenteditable = 'false';
-	}
-
-	//
-	// HTML filter rules ------------------------------------------------------
-	//
-
-	var defaultHtmlFilterRulesEditableOnly = {
-		elements: {
-			embed: function( element ) {
-				var parent = element.parent;
-
-				// If the  is child of a , copy the width
-				// and height attributes from it.
-				if ( parent && parent.name == 'object' ) {
-					var parentWidth = parent.attributes.width,
-						parentHeight = parent.attributes.height;
-					if ( parentWidth )
-						element.attributes.width = parentWidth;
-					if ( parentHeight )
-						element.attributes.height = parentHeight;
-				}
-			},
-
-			// Remove empty link but not empty anchor. (#3829)
-			a: function( element ) {
-				if ( !( element.children.length || element.attributes.name || element.attributes[ 'data-cke-saved-name' ] ) )
-					return false;
-			}
-		}
-	};
-
-	// These rules will also be applied to non-editable content.
-	var defaultHtmlFilterRulesForAll = {
-		elementNames: [
-			// Remove the "cke:" namespace prefix.
-			[ ( /^cke:/ ), '' ],
-
-			// Ignore  tags.
-			[ ( /^\?xml:namespace$/ ), '' ]
-		],
-
-		attributeNames: [
-			// Attributes saved for changes and protected attributes.
-			[ ( /^data-cke-(saved|pa)-/ ), '' ],
-
-			// All "data-cke-" attributes are to be ignored.
-			[ ( /^data-cke-.*/ ), '' ],
-
-			[ 'hidefocus', '' ]
-		],
-
-		elements: {
-			$: function( element ) {
-				var attribs = element.attributes;
-
-				if ( attribs ) {
-					// Elements marked as temporary are to be ignored.
-					if ( attribs[ 'data-cke-temp' ] )
-						return false;
-
-					// Remove duplicated attributes - #3789.
-					var attributeNames = [ 'name', 'href', 'src' ],
-						savedAttributeName;
-					for ( var i = 0; i < attributeNames.length; i++ ) {
-						savedAttributeName = 'data-cke-saved-' + attributeNames[ i ];
-						savedAttributeName in attribs && ( delete attribs[ attributeNames[ i ] ] );
-					}
-				}
-
-				return element;
-			},
-
-			// The contents of table should be in correct order (#4809).
-			table: function( element ) {
-					// Clone the array as it would become empty during the sort call.
-					var children = element.children.slice( 0 );
-					children.sort( function( node1, node2 ) {
-						var index1, index2;
-
-						// Compare in the predefined order.
-						if ( node1.type == CKEDITOR.NODE_ELEMENT &&
-								 node2.type == node1.type ) {
-							index1 = CKEDITOR.tools.indexOf( tableOrder, node1.name );
-							index2 = CKEDITOR.tools.indexOf( tableOrder, node2.name );
-						}
-
-						// Make sure the sort is stable, if no order can be established above.
-						if ( !( index1 > -1 && index2 > -1 && index1 != index2 ) ) {
-							index1 = getNodeIndex( node1 );
-							index2 = getNodeIndex( node2 );
-						}
-
-						return index1 > index2 ? 1 : -1;
-					} );
-			},
-
-			// Restore param elements into self-closing.
-			param: function( param ) {
-				param.children = [];
-				param.isEmpty = true;
-				return param;
-			},
-
-			// Remove dummy span in webkit.
-			span: function( element ) {
-				if ( element.attributes[ 'class' ] == 'Apple-style-span' )
-					delete element.name;
-			},
-
-			html: function( element ) {
-				delete element.attributes.contenteditable;
-				delete element.attributes[ 'class' ];
-			},
-
-			body: function( element ) {
-				delete element.attributes.spellcheck;
-				delete element.attributes.contenteditable;
-			},
-
-			style: function( element ) {
-				var child = element.children[ 0 ];
-				if ( child && child.value )
-					child.value = CKEDITOR.tools.trim( child.value );
-
-				if ( !element.attributes.type )
-					element.attributes.type = 'text/css';
-			},
-
-			title: function( element ) {
-				var titleText = element.children[ 0 ];
-
-				// Append text-node to title tag if not present (i.e. non-IEs) (#9882).
-				!titleText && append( element, titleText = new CKEDITOR.htmlParser.text() );
-
-				// Transfer data-saved title to title tag.
-				titleText.value = element.attributes[ 'data-cke-title' ] || '';
-			},
-
-			input: unprotectReadyOnly,
-			textarea: unprotectReadyOnly
-		},
-
-		attributes: {
-			'class': function( value, element ) {
-				// Remove all class names starting with "cke_".
-				return CKEDITOR.tools.ltrim( value.replace( /(?:^|\s+)cke_[^\s]*/g, '' ) ) || false;
-			}
-		}
-	};
-
-	if ( CKEDITOR.env.ie ) {
-		// IE outputs style attribute in capital letters. We should convert
-		// them back to lower case, while not hurting the values (#5930)
-		defaultHtmlFilterRulesForAll.attributes.style = function( value, element ) {
-			return value.replace( /(^|;)([^\:]+)/g, function( match ) {
-				return match.toLowerCase();
-			} );
-		};
-	}
-
-	// Disable form elements editing mode provided by some browsers. (#5746)
-	function unprotectReadyOnly( element ) {
-		var attrs = element.attributes;
-		switch ( attrs[ 'data-cke-editable' ] ) {
-			case 'true':
-				attrs.contenteditable = 'true';
-				break;
-			case '1':
-				delete attrs.contenteditable;
-				break;
-		}
-	}
-
-	//
-	// Preprocessor filters ---------------------------------------------------
-	//
-
-	var protectElementRegex = /<(a|area|img|input|source)\b([^>]*)>/gi,
-		// Be greedy while looking for protected attributes. This will let us avoid an unfortunate
-		// situation when "nested attributes", which may appear valid, are also protected.
-		// I.e. if we consider the following HTML:
-		//
-		// 	
-		//
-		// then the "non-greedy match" returns:
-		//
-		// 	'href' => '"X"' // It's wrong! Href is not an attribute of .
-		//
-		// while greedy match returns:
-		//
-		// 	'data-x' => '<a href="X"'
-		//
-		// which, can be easily filtered out (#11508).
-		protectAttributeRegex = /([\w-]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,
-		protectAttributeNameRegex = /^(href|src|name)$/i;
-
-		// Note: we use lazy star '*?' to prevent eating everything up to the last occurrence of  or .
-	var protectElementsRegex = /(?:])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
-		protectTextareaRegex = /(])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,
-		encodedElementsRegex = /([^<]*)<\/cke:encoded>/gi;
-
-	var protectElementNamesRegex = /(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,
-		unprotectElementNamesRegex = /(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi;
-
-	var protectSelfClosingRegex = /]*?)\/?>(?!\s*<\/cke:\1)/gi;
-
-	function protectAttributes( html ) {
-		return html.replace( protectElementRegex, function( element, tag, attributes ) {
-			return '<' + tag + attributes.replace( protectAttributeRegex, function( fullAttr, attrName ) {
-				// Avoid corrupting the inline event attributes (#7243).
-				// We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (#5218)
-				if ( protectAttributeNameRegex.test( attrName ) && attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )
-					return ' data-cke-saved-' + fullAttr + ' data-cke-' + CKEDITOR.rnd + '-' + fullAttr;
-
-				return fullAttr;
-			} ) + '>';
-		} );
-	}
-
-	function protectElements( html, regex ) {
-		return html.replace( regex, function( match, tag, content ) {
-			// Encode < and > in textarea because this won't be done by a browser, since
-			// textarea will be protected during passing data through fix bin.
-			if ( match.indexOf( '/g, '>' ) + '';
-
-			return '' + encodeURIComponent( match ) + '';
-		} );
-	}
-
-	function unprotectElements( html ) {
-		return html.replace( encodedElementsRegex, function( match, encoded ) {
-			return decodeURIComponent( encoded );
-		} );
-	}
-
-	function protectElementsNames( html ) {
-		return html.replace( protectElementNamesRegex, '$1cke:$2' );
-	}
-
-	function unprotectElementNames( html ) {
-		return html.replace( unprotectElementNamesRegex, '$1$2' );
-	}
-
-	function protectSelfClosingElements( html ) {
-		return html.replace( protectSelfClosingRegex, '' );
-	}
-
-	function protectPreFormatted( html ) {
-		return CKEDITOR.env.opera ? html : html.replace( /(]*>)(\r\n|\n)/g, '$1$2$2' );
-	}
-
-	function protectRealComments( html ) {
-		return html.replace( //g, function( match ) {
-			return '';
-		} );
-	}
-
-	function unprotectRealComments( html ) {
-		return html.replace( //g, function( match, data ) {
-			return decodeURIComponent( data );
-		} );
-	}
-
-	function unprotectSource( html, editor ) {
-		var store = editor._.dataStore;
-
-		return html.replace( //g, function( match, data ) {
-			return decodeURIComponent( data );
-		} ).replace( /\{cke_protected_(\d+)\}/g, function( match, id ) {
-			return store && store[ id ] || '';
-		} );
-	}
-
-	function protectSource( data, editor ) {
-		var protectedHtml = [],
-			protectRegexes = editor.config.protectedSource,
-			store = editor._.dataStore || ( editor._.dataStore = { id: 1 } ),
-			tempRegex = /<\!--\{cke_temp(comment)?\}(\d*?)-->/g;
-
-		var regexes = [
-			// Script tags will also be forced to be protected, otherwise
-			// IE will execute them.
-			( //gi ),
-
-			//
'. fieldLabel('Name','name',1).'
'.fieldLabel('Address','address',0).''; print ''; print '
'.fieldLabel('Zip','zipcode',0).''; print $formcompany->select_ziptown(GETPOST('zipcode', 'alpha'), 'zipcode', array ( 'town', @@ -216,7 +202,7 @@ if ($action == 'create') // Town print '
'.fieldLabel('Town','town',0).''; print $formcompany->select_ziptown(GETPOST('town', 'alpha'), 'town', array ( 'zipcode', @@ -227,7 +213,7 @@ if ($action == 'create') // Country print '
'.fieldLabel('Country','selectcountry_id',0).''; print $form->select_country($mysoc->country_id,'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); @@ -236,7 +222,7 @@ if ($action == 'create') // Status print '
'.fieldLabel('Status','status',1).''; print $form->selectarray('status',$status2label,GETPOST('status')); print '
'.$langs->trans("Ref").''; - print $object->rowid; + print ''.$langs->trans("Ref").''; + print $object->id; print '
'; + print '
'.fieldLabel('Name','name',1).''; print ''; print '
'.fieldLabel('Address','address',0).''; print ''; - print '
'; + print '
'.fieldLabel('Zip','zipcode',0).''; print $formcompany->select_ziptown($object->zip, 'zipcode', array ( 'town', 'selectcountry_id' ), 6) . '
'; + print '
'.fieldLabel('Town','town',0).''; print $formcompany->select_ziptown($object->town, 'town', array ( 'zipcode', 'selectcountry_id' )) . '
'.fieldLabel('Country','selectcountry_id',0).''; - print $form->select_country($object->fk_pays,'country_id'); + print $form->select_country($object->fk_country,'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
'; + print '
'.fieldLabel('Status','status',1).''; print $form->selectarray('status',$status2label,$object->status); print '
'.$langs->trans("Ref").''; - print $object->rowid; + print $object->id; print ''; print $linkback; print '
'.$langs->trans("Country").''.getCountry($object->fk_pays,1).''; + if ($object->country_id > 0) + { + $img=picto_from_langcode($object->country_code); + print $img?$img.' ':''; + print getCountry($object->getCountryCode(),0,$db); + } + print '
' + - '' + - '' + - '' + - '' + - '
' + - '' + - '', lang.auto, '
' + - '' + - '' ); - - // Render the color boxes. - for ( var i = 0; i < colors.length; i++ ) { - if ( ( i % 8 ) === 0 ) - output.push( '' ); - - var parts = colors[ i ].split( '/' ), - colorName = parts[ 0 ], - colorCode = parts[ 1 ] || colorName; - - // The data can be only a color code (without #) or colorName + color code - // If only a color code is provided, then the colorName is the color with the hash - // Convert the color from RGB to RRGGBB for better compatibility with IE and . See #5676 - if ( !parts[ 1 ] ) - colorName = '#' + colorName.replace( /^(.)(.)(.)$/, '$1$1$2$2$3$3' ); - - var colorLabel = editor.lang.colorbutton.colors[ colorCode ] || colorCode; - output.push( '' ); - } - - // Render the "More Colors" button. - if ( editor.plugins.colordialog && config.colorButton_enableMore === undefined || config.colorButton_enableMore ) { - output.push( '' + - '' + - '' ); // tr is later in the code. - } - - output.push( '
' + - '' + - '' + - '' + - '
' + - '', lang.more, '' + - '
' ); - - return output.join( '' ); - } - - function isUnstylable( ele ) { - return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' ); - } - } -} ); - -/** - * Whether to enable the **More Colors*** button in the color selectors. - * - * config.colorButton_enableMore = false; - * - * @cfg {Boolean} [colorButton_enableMore=true] - * @member CKEDITOR.config - */ - -/** - * Defines the colors to be displayed in the color selectors. This is a string - * containing hexadecimal notation for HTML colors, without the `'#'` prefix. - * - * **Since 3.3:** A color name may optionally be defined by prefixing the entries with - * a name and the slash character. For example, `'FontColor1/FF9900'` will be - * displayed as the color `#FF9900` in the selector, but will be output as `'FontColor1'`. - * - * // Brazil colors only. - * config.colorButton_colors = '00923E,F8C100,28166F'; - * - * config.colorButton_colors = 'FontColor1/FF9900,FontColor2/0066CC,FontColor3/F00'; - * - * @cfg {String} [colorButton_colors=see source] - * @member CKEDITOR.config - */ -CKEDITOR.config.colorButton_colors = '000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,' + - 'B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,' + - 'F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,' + - 'FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,' + - 'FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF'; - -/** - * Stores the style definition that applies the text foreground color. - * - * // This is actually the default value. - * config.colorButton_foreStyle = { - * element: 'span', - * styles: { color: '#(color)' } - * }; - * - * @cfg [colorButton_foreStyle=see source] - * @member CKEDITOR.config - */ -CKEDITOR.config.colorButton_foreStyle = { - element: 'span', - styles: { 'color': '#(color)' }, - overrides: [ { - element: 'font', attributes: { 'color': null } - } ] -}; - -/** - * Stores the style definition that applies the text background color. - * - * // This is actually the default value. - * config.colorButton_backStyle = { - * element: 'span', - * styles: { 'background-color': '#(color)' } - * }; - * - * @cfg [colorButton_backStyle=see source] - * @member CKEDITOR.config - */ -CKEDITOR.config.colorButton_backStyle = { - element: 'span', - styles: { 'background-color': '#(color)' } -}; diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/dialogs/colordialog.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/dialogs/colordialog.js deleted file mode 100644 index f719cf421c5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/dialogs/colordialog.js +++ /dev/null @@ -1,338 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.dialog.add( 'colordialog', function( editor ) { - // Define some shorthands. - var $el = CKEDITOR.dom.element, - $doc = CKEDITOR.document, - lang = editor.lang.colordialog; - - // Reference the dialog. - var dialog; - - var spacer = { - type: 'html', - html: ' ' - }; - - var selected; - - function clearSelected() { - $doc.getById( selHiColorId ).removeStyle( 'background-color' ); - dialog.getContentElement( 'picker', 'selectedColor' ).setValue( '' ); - selected && selected.removeAttribute( 'aria-selected' ); - selected = null; - } - - function updateSelected( evt ) { - var target = evt.data.getTarget(), - color; - - if ( target.getName() == 'td' && ( color = target.getChild( 0 ).getHtml() ) ) { - selected = target; - selected.setAttribute( 'aria-selected', true ); - dialog.getContentElement( 'picker', 'selectedColor' ).setValue( color ); - } - } - - // Basing black-white decision off of luma scheme using the Rec. 709 version - function whiteOrBlack( color ) { - color = color.replace( /^#/, '' ); - for ( var i = 0, rgb = []; i <= 2; i++ ) - rgb[ i ] = parseInt( color.substr( i * 2, 2 ), 16 ); - var luma = ( 0.2126 * rgb[ 0 ] ) + ( 0.7152 * rgb[ 1 ] ) + ( 0.0722 * rgb[ 2 ] ); - return '#' + ( luma >= 165 ? '000' : 'fff' ); - } - - // Distinguish focused and hover states. - var focused, hovered; - - // Apply highlight style. - function updateHighlight( event ) { - // Convert to event. - !event.name && ( event = new CKEDITOR.event( event ) ); - - var isFocus = !( /mouse/ ).test( event.name ), - target = event.data.getTarget(), - color; - - if ( target.getName() == 'td' && ( color = target.getChild( 0 ).getHtml() ) ) { - removeHighlight( event ); - - isFocus ? focused = target : hovered = target; - - // Apply outline style to show focus. - if ( isFocus ) { - target.setStyle( 'border-color', whiteOrBlack( color ) ); - target.setStyle( 'border-style', 'dotted' ); - } - - $doc.getById( hicolorId ).setStyle( 'background-color', color ); - $doc.getById( hicolorTextId ).setHtml( color ); - } - } - - function clearHighlight() { - var color = focused.getChild( 0 ).getHtml(); - focused.setStyle( 'border-color', color ); - focused.setStyle( 'border-style', 'solid' ); - $doc.getById( hicolorId ).removeStyle( 'background-color' ); - $doc.getById( hicolorTextId ).setHtml( ' ' ); - focused = null; - } - - // Remove previously focused style. - function removeHighlight( event ) { - var isFocus = !( /mouse/ ).test( event.name ), - target = isFocus && focused; - - if ( target ) { - var color = target.getChild( 0 ).getHtml(); - target.setStyle( 'border-color', color ); - target.setStyle( 'border-style', 'solid' ); - } - - if ( !( focused || hovered ) ) { - $doc.getById( hicolorId ).removeStyle( 'background-color' ); - $doc.getById( hicolorTextId ).setHtml( ' ' ); - } - } - - function onKeyStrokes( evt ) { - var domEvt = evt.data; - - var element = domEvt.getTarget(); - var relative, nodeToMove; - var keystroke = domEvt.getKeystroke(), - rtl = editor.lang.dir == 'rtl'; - - switch ( keystroke ) { - // UP-ARROW - case 38: - // relative is TR - if ( ( relative = element.getParent().getPrevious() ) ) { - nodeToMove = relative.getChild( [ element.getIndex() ] ); - nodeToMove.focus(); - } - domEvt.preventDefault(); - break; - // DOWN-ARROW - case 40: - // relative is TR - if ( ( relative = element.getParent().getNext() ) ) { - nodeToMove = relative.getChild( [ element.getIndex() ] ); - if ( nodeToMove && nodeToMove.type == 1 ) - nodeToMove.focus(); - - } - domEvt.preventDefault(); - break; - - // SPACE - // ENTER - case 32: - case 13: - updateSelected( evt ); - domEvt.preventDefault(); - break; - - // RIGHT-ARROW - case rtl ? 37 : 39: - // relative is TD - if ( ( nodeToMove = element.getNext() ) ) { - if ( nodeToMove.type == 1 ) { - nodeToMove.focus(); - domEvt.preventDefault( true ); - } - } - // relative is TR - else if ( ( relative = element.getParent().getNext() ) ) { - nodeToMove = relative.getChild( [ 0 ] ); - if ( nodeToMove && nodeToMove.type == 1 ) { - nodeToMove.focus(); - domEvt.preventDefault( true ); - } - } - break; - - // LEFT-ARROW - case rtl ? 39 : 37: - // relative is TD - if ( ( nodeToMove = element.getPrevious() ) ) { - nodeToMove.focus(); - domEvt.preventDefault( true ); - } - // relative is TR - else if ( ( relative = element.getParent().getPrevious() ) ) { - nodeToMove = relative.getLast(); - nodeToMove.focus(); - domEvt.preventDefault( true ); - } - break; - default: - // Do not stop not handled events. - return; - } - } - - function createColorTable() { - table = CKEDITOR.dom.element.createFromHtml( '' + - '' + - '
' + lang.options + '
' ); - - table.on( 'mouseover', updateHighlight ); - table.on( 'mouseout', removeHighlight ); - - // Create the base colors array. - var aColors = [ '00', '33', '66', '99', 'cc', 'ff' ]; - - // This function combines two ranges of three values from the color array into a row. - function appendColorRow( rangeA, rangeB ) { - for ( var i = rangeA; i < rangeA + 3; i++ ) { - var row = new $el( table.$.insertRow( -1 ) ); - row.setAttribute( 'role', 'row' ); - - for ( var j = rangeB; j < rangeB + 3; j++ ) { - for ( var n = 0; n < 6; n++ ) { - appendColorCell( row.$, '#' + aColors[ j ] + aColors[ n ] + aColors[ i ] ); - } - } - } - } - - // This function create a single color cell in the color table. - function appendColorCell( targetRow, color ) { - var cell = new $el( targetRow.insertCell( -1 ) ); - cell.setAttribute( 'class', 'ColorCell' ); - cell.setAttribute( 'tabIndex', -1 ); - cell.setAttribute( 'role', 'gridcell' ); - - cell.on( 'keydown', onKeyStrokes ); - cell.on( 'click', updateSelected ); - cell.on( 'focus', updateHighlight ); - cell.on( 'blur', removeHighlight ); - - cell.setStyle( 'background-color', color ); - cell.setStyle( 'border', '1px solid ' + color ); - - cell.setStyle( 'width', '14px' ); - cell.setStyle( 'height', '14px' ); - - var colorLabel = numbering( 'color_table_cell' ); - cell.setAttribute( 'aria-labelledby', colorLabel ); - cell.append( CKEDITOR.dom.element.createFromHtml( '' + color + '', CKEDITOR.document ) ); - } - - appendColorRow( 0, 0 ); - appendColorRow( 3, 0 ); - appendColorRow( 0, 3 ); - appendColorRow( 3, 3 ); - - // Create the last row. - var oRow = new $el( table.$.insertRow( -1 ) ); - oRow.setAttribute( 'role', 'row' ); - - // Create the gray scale colors cells. - for ( var n = 0; n < 6; n++ ) { - appendColorCell( oRow.$, '#' + aColors[ n ] + aColors[ n ] + aColors[ n ] ); - } - - // Fill the row with black cells. - for ( var i = 0; i < 12; i++ ) { - appendColorCell( oRow.$, '#000000' ); - } - } - - var numbering = function( id ) { - return CKEDITOR.tools.getNextId() + '_' + id; - }, - hicolorId = numbering( 'hicolor' ), - hicolorTextId = numbering( 'hicolortext' ), - selHiColorId = numbering( 'selhicolor' ), - table; - - createColorTable(); - - return { - title: lang.title, - minWidth: 360, - minHeight: 220, - onLoad: function() { - // Update reference. - dialog = this; - }, - onHide: function() { - clearSelected(); - clearHighlight(); - }, - contents: [ - { - id: 'picker', - label: lang.title, - accessKey: 'I', - elements: [ - { - type: 'hbox', - padding: 0, - widths: [ '70%', '10%', '30%' ], - children: [ - { - type: 'html', - html: '
', - onLoad: function() { - CKEDITOR.document.getById( this.domId ).append( table ); - }, - focus: function() { - // Restore the previously focused cell, - // otherwise put the initial focus on the first table cell. - ( focused || this.getElement().getElementsByTag( 'td' ).getItem( 0 ) ).focus(); - } - }, - spacer, - { - type: 'vbox', - padding: 0, - widths: [ '70%', '5%', '25%' ], - children: [ - { - type: 'html', - html: '' + lang.highlight + '\ -
\ -
 
' + lang.selected + '\ -
' - }, - { - type: 'text', - label: lang.selected, - labelStyle: 'display:none', - id: 'selectedColor', - style: 'width: 74px', - onChange: function() { - // Try to update color preview with new value. If fails, then set it no none. - try { - $doc.getById( selHiColorId ).setStyle( 'background-color', this.getValue() ); - } catch ( e ) { - clearSelected(); - } - } - }, - spacer, - { - type: 'button', - id: 'clear', - style: 'margin-top: 5px', - label: lang.clear, - onClick: clearSelected - } - ] - } - ] - } - ] - } - ] - }; -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/af.js deleted file mode 100644 index c903b64a0b3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/af.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'af', { - clear: 'Herstel', - highlight: 'Aktief', - options: 'Kleuropsies', - selected: 'Geselekteer', - title: 'Kies kleur' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ar.js deleted file mode 100644 index 64e19936bb1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ar.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ar', { - clear: 'مسح', - highlight: 'تحديد', - options: 'اختيارات الألوان', - selected: 'اللون المختار', - title: 'اختر اللون' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bg.js deleted file mode 100644 index e7d379c25d3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bg.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'bg', { - clear: 'Изчистване', - highlight: 'Осветяване', - options: 'Цветови опции', - selected: 'Изберете цвят', - title: 'Изберете цвят' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bn.js deleted file mode 100644 index e025402fd5c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bn.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'bn', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bs.js deleted file mode 100644 index f2648168966..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/bs.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'bs', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ca.js deleted file mode 100644 index eeb75232c19..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ca.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ca', { - clear: 'Neteja', - highlight: 'Destacat', - options: 'Opcions del color', - selected: 'Color Seleccionat', - title: 'Seleccioni el color' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/cs.js deleted file mode 100644 index 37d4866bf85..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/cs.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'cs', { - clear: 'Vyčistit', - highlight: 'Zvýraznit', - options: 'Nastavení barvy', - selected: 'Vybráno', - title: 'Výběr barvy' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/cy.js deleted file mode 100644 index 39b3035cb8d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/cy.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'cy', { - clear: 'Clirio', - highlight: 'Uwcholeuo', - options: 'Opsiynau Lliw', - selected: 'Lliw a Ddewiswyd', - title: 'Dewis lliw' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/da.js deleted file mode 100644 index 9a2fdeae718..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/da.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'da', { - clear: 'Nulstil', - highlight: 'Markér', - options: 'Farvemuligheder', - selected: 'Valgt farve', - title: 'Vælg farve' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/de.js deleted file mode 100644 index 854ab90e1cb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/de.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'de', { - clear: 'Entfernen', - highlight: 'Hervorheben', - options: 'Farbeoptionen', - selected: 'Ausgewählte Farbe', - title: 'Farbe wählen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/el.js deleted file mode 100644 index 5a696a6386f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/el.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'el', { - clear: 'Εκκαθάριση', - highlight: 'Σήμανση', - options: 'Επιλογές Χρωμάτων', - selected: 'Επιλεγμένο Χρώμα', - title: 'Επιλογή χρώματος' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-au.js deleted file mode 100644 index f541bd3a684..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-au.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'en-au', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-ca.js deleted file mode 100644 index fe5c2c4b083..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-ca.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'en-ca', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-gb.js deleted file mode 100644 index 02aaf71361d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en-gb.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'en-gb', { - clear: 'Clear', - highlight: 'Highlight', - options: 'Colour Options', - selected: 'Selected Colour', - title: 'Select colour' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en.js deleted file mode 100644 index 2b39632fb24..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/en.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'en', { - clear: 'Clear', - highlight: 'Highlight', - options: 'Color Options', - selected: 'Selected Color', - title: 'Select color' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/eo.js deleted file mode 100644 index 46902b85ae7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/eo.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'eo', { - clear: 'Forigi', - highlight: 'Detaloj', - options: 'Opcioj pri koloroj', - selected: 'Selektita koloro', - title: 'Selekti koloron' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/es.js deleted file mode 100644 index d192b57244a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/es.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'es', { - clear: 'Borrar', - highlight: 'Muestra', - options: 'Opciones de colores', - selected: 'Elegido', - title: 'Elegir color' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/et.js deleted file mode 100644 index 9f126d24a38..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/et.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'et', { - clear: 'Eemalda', - highlight: 'Näidis', - options: 'Värvi valikud', - selected: 'Valitud värv', - title: 'Värvi valimine' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/eu.js deleted file mode 100644 index fc81779c568..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/eu.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'eu', { - clear: 'Garbitu', - highlight: 'Nabarmendu', - options: 'Kolore Aukerak', - selected: 'Hautatutako Kolorea', - title: 'Kolorea Hautatu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fa.js deleted file mode 100644 index 0d03daf59bb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fa.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'fa', { - clear: 'پاک کردن', - highlight: 'متمایز', - options: 'گزینه​های رنگ', - selected: 'رنگ انتخاب شده', - title: 'انتخاب رنگ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fi.js deleted file mode 100644 index 77e5d7ab769..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fi.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'fi', { - clear: 'Poista', - highlight: 'Korostus', - options: 'Värin ominaisuudet', - selected: 'Valittu', - title: 'Valitse väri' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fo.js deleted file mode 100644 index c22dad70ffc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fo.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'fo', { - clear: 'Strika', - highlight: 'Framheva', - options: 'Litmøguleikar', - selected: 'Valdur litur', - title: 'Vel lit' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fr-ca.js deleted file mode 100644 index e11e6764180..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fr-ca.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'fr-ca', { - clear: 'Effacer', - highlight: 'Surligner', - options: 'Options de couleur', - selected: 'Couleur sélectionnée', - title: 'Choisir une couleur' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fr.js deleted file mode 100644 index c94f280e8ae..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/fr.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'fr', { - clear: 'Effacer', - highlight: 'Détails', - options: 'Option des couleurs', - selected: 'Couleur choisie', - title: 'Choisir une couleur' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/gl.js deleted file mode 100644 index 28025cea456..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/gl.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'gl', { - clear: 'Limpar', - highlight: 'Resaltar', - options: 'Opcións de cor', - selected: 'Cor seleccionado', - title: 'Seleccione unha cor' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/gu.js deleted file mode 100644 index 95a20c2139a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/gu.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'gu', { - clear: 'સાફ કરવું', - highlight: 'હાઈઈટ', - options: 'રંગના વિકલ્પ', - selected: 'પસંદ કરેલો રંગ', - title: 'રંગ પસંદ કરો' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/he.js deleted file mode 100644 index 3cfed661bd5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/he.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'he', { - clear: 'ניקוי', - highlight: 'סימון', - options: 'אפשרויות צבע', - selected: 'בחירה', - title: 'בחירת צבע' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hi.js deleted file mode 100644 index 49b2f0acaac..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hi.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'hi', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hr.js deleted file mode 100644 index 049ac1aae93..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hr.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'hr', { - clear: 'Očisti', - highlight: 'Istaknuto', - options: 'Opcije boje', - selected: 'Odabrana boja', - title: 'Odaberi boju' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hu.js deleted file mode 100644 index a43d5d95ed9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/hu.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'hu', { - clear: 'Ürítés', - highlight: 'Nagyítás', - options: 'Szín opciók', - selected: 'Kiválasztott', - title: 'Válasszon színt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/is.js deleted file mode 100644 index 4bb810e241f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/is.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'is', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/it.js deleted file mode 100644 index 7dc0eeb2369..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/it.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'it', { - clear: 'cancella', - highlight: 'Evidenzia', - options: 'Opzioni colore', - selected: 'Seleziona il colore', - title: 'Selezionare il colore' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ja.js deleted file mode 100644 index 4226f879973..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ja.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ja', { - clear: 'クリア', - highlight: 'ハイライト', - options: 'カラーオプション', - selected: '選択された色', - title: '色選択' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ka.js deleted file mode 100644 index 4327480ca47..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ka.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ka', { - clear: 'გასუფთავება', - highlight: 'ჩვენება', - options: 'ფერის პარამეტრები', - selected: 'არჩეული ფერი', - title: 'ფერის შეცვლა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/km.js deleted file mode 100644 index 5af47248100..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/km.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'km', { - clear: 'សម្អាត', - highlight: 'បន្លិច​ពណ៌', - options: 'ជម្រើស​ពណ៌', - selected: 'ពណ៌​ដែល​បាន​រើស', - title: 'រើស​ពណ៌' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ko.js deleted file mode 100644 index cc01f3e756b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ko.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ko', { - clear: '제거', - highlight: '하이라이트', - options: '색상 옵션', - selected: '색상 선택됨', - title: '색상 선택' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ku.js deleted file mode 100644 index 913bdb083fa..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ku.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ku', { - clear: 'پاکیکەوە', - highlight: 'نیشانکردن', - options: 'هەڵبژاردەی ڕەنگەکان', - selected: 'ڕەنگی هەڵبژێردراو', - title: 'هەڵبژاردنی ڕەنگ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/lt.js deleted file mode 100644 index 2e7245c4d58..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/lt.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'lt', { - clear: 'Išvalyti', - highlight: 'Paryškinti', - options: 'Spalvos nustatymai', - selected: 'Pasirinkta spalva', - title: 'Pasirinkite spalvą' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/lv.js deleted file mode 100644 index 02e439075e5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/lv.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'lv', { - clear: 'Notīrīt', - highlight: 'Paraugs', - options: 'Krāsas uzstādījumi', - selected: 'Izvēlētā krāsa', - title: 'Izvēlies krāsu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/mk.js deleted file mode 100644 index cfcd958a76c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/mk.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'mk', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/mn.js deleted file mode 100644 index d7d03b04b04..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/mn.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'mn', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ms.js deleted file mode 100644 index bc27089f315..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ms.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ms', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/nb.js deleted file mode 100644 index 0b43ae19fee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/nb.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'nb', { - clear: 'Tøm', - highlight: 'Merk', - options: 'Alternativer for farge', - selected: 'Valgt', - title: 'Velg farge' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/nl.js deleted file mode 100644 index ecbe471d406..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/nl.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'nl', { - clear: 'Wissen', - highlight: 'Actief', - options: 'Kleuropties', - selected: 'Geselecteerde kleur', - title: 'Selecteer kleur' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/no.js deleted file mode 100644 index 68c71152007..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/no.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'no', { - clear: 'Tøm', - highlight: 'Merk', - options: 'Alternativer for farge', - selected: 'Valgt', - title: 'Velg farge' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pl.js deleted file mode 100644 index 7b72de8cf2c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pl.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'pl', { - clear: 'Wyczyść', - highlight: 'Zaznacz', - options: 'Opcje koloru', - selected: 'Wybrany', - title: 'Wybierz kolor' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pt-br.js deleted file mode 100644 index 6094191e405..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pt-br.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'pt-br', { - clear: 'Limpar', - highlight: 'Grifar', - options: 'Opções de Cor', - selected: 'Cor Selecionada', - title: 'Selecione uma Cor' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pt.js deleted file mode 100644 index b210f1bacb6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/pt.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'pt', { - clear: 'Limpar', - highlight: 'Realçar', - options: 'Opções da Cor', - selected: 'Cor Selecionada', - title: 'Selecionar Cor' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ro.js deleted file mode 100644 index 0a06503c890..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ro.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ro', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ru.js deleted file mode 100644 index c55b6cb7a43..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ru.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ru', { - clear: 'Очистить', - highlight: 'Под курсором', - options: 'Настройки цвета', - selected: 'Выбранный цвет', - title: 'Выберите цвет' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/si.js deleted file mode 100644 index b127f4d1165..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/si.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'si', { - clear: 'පැහැදිලි', - highlight: 'මතුකර පෙන්වන්න', - options: 'වර්ණ විකල්ප', - selected: 'තෙරු වර්ණ', - title: 'වර්ණ තෝරන්න' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sk.js deleted file mode 100644 index 5f44790bea9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sk.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'sk', { - clear: 'Vyčistiť', - highlight: 'Zvýrazniť', - options: 'Možnosti farby', - selected: 'Vybraná farba', - title: 'Vyberte farbu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sl.js deleted file mode 100644 index ab85aa5d0cc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sl.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'sl', { - clear: 'Počisti', - highlight: 'Poudarjeno', - options: 'Barvne Možnosti', - selected: 'Izbrano', - title: 'Izberi barvo' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sq.js deleted file mode 100644 index 755411f46d2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sq.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'sq', { - clear: 'Pastro', - highlight: 'Thekso', - options: 'Përzgjedhjet e Ngjyrave', - selected: 'Ngjyra e Përzgjedhur', - title: 'Përzgjidh një ngjyrë' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sr-latn.js deleted file mode 100644 index 779c68848d2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sr-latn.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'sr-latn', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sr.js deleted file mode 100644 index 8361de37046..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sr.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'sr', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sv.js deleted file mode 100644 index 7c2b9f36d5b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/sv.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'sv', { - clear: 'Rensa', - highlight: 'Markera', - options: 'Färgalternativ', - selected: 'Vald färg', - title: 'Välj färg' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/th.js deleted file mode 100644 index dbf5f777fee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/th.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'th', { - clear: 'Clear', // MISSING - highlight: 'Highlight', // MISSING - options: 'Color Options', // MISSING - selected: 'Selected Color', // MISSING - title: 'Select color' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/tr.js deleted file mode 100644 index 47f5d9d3570..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/tr.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'tr', { - clear: 'Temizle', - highlight: 'İşaretle', - options: 'Renk Seçenekleri', - selected: 'Seçilmiş', - title: 'Renk seç' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ug.js deleted file mode 100644 index 9fd50f91ef8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/ug.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'ug', { - clear: 'تازىلا', - highlight: 'يورۇت', - options: 'رەڭ تاللانمىسى', - selected: 'رەڭ تاللاڭ', - title: 'رەڭ تاللاڭ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/uk.js deleted file mode 100644 index 9fb160dc8d4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/uk.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'uk', { - clear: 'Очистити', - highlight: 'Колір, на який вказує курсор', - options: 'Опції кольорів', - selected: 'Обраний колір', - title: 'Обрати колір' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/vi.js deleted file mode 100644 index 1fd2326217f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/vi.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'vi', { - clear: 'Xóa bỏ', - highlight: 'Màu chọn', - options: 'Tùy chọn màu', - selected: 'Màu đã chọn', - title: 'Chọn màu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/zh-cn.js deleted file mode 100644 index d9d20175b69..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/zh-cn.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'zh-cn', { - clear: '清除', - highlight: '高亮', - options: '颜色选项', - selected: '选择颜色', - title: '选择颜色' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/zh.js deleted file mode 100644 index 2e129fec771..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/lang/zh.js +++ /dev/null @@ -1,11 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'colordialog', 'zh', { - clear: '清除', - highlight: '高亮', - options: '色彩選項', - selected: '選取的色彩', - title: '選取色彩' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/plugin.js deleted file mode 100644 index 0925bab5985..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/colordialog/plugin.js +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.colordialog = { - requires: 'dialog', - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - init: function( editor ) { - var cmd = new CKEDITOR.dialogCommand( 'colordialog' ); - cmd.editorFocus = false; - - editor.addCommand( 'colordialog', cmd ); - - CKEDITOR.dialog.add( 'colordialog', this.path + 'dialogs/colordialog.js' ); - - /** - * Open up color dialog and to receive the selected color. - * - * @param {Function} callback The callback when color dialog is closed - * @param {String} callback.color The color value received if selected on the dialog. - * @param [scope] The scope in which the callback will be bound. - * @member CKEDITOR.editor - */ - editor.getColorFromDialog = function( callback, scope ) { - var onClose = function( evt ) { - releaseHandlers( this ); - var color = evt.name == 'ok' ? this.getValueOf( 'picker', 'selectedColor' ) : null; - callback.call( scope, color ); - }; - var releaseHandlers = function( dialog ) { - dialog.removeListener( 'ok', onClose ); - dialog.removeListener( 'cancel', onClose ); - }; - var bindToDialog = function( dialog ) { - dialog.on( 'ok', onClose ); - dialog.on( 'cancel', onClose ); - }; - - editor.execCommand( 'colordialog' ); - - if ( editor._.storedDialogs && editor._.storedDialogs.colordialog ) - bindToDialog( editor._.storedDialogs.colordialog ); - else { - CKEDITOR.on( 'dialogDefinition', function( e ) { - if ( e.data.name != 'colordialog' ) - return; - - var definition = e.data.definition; - - e.removeListener(); - definition.onLoad = CKEDITOR.tools.override( definition.onLoad, - function( orginal ) { - return function() { - bindToDialog( this ); - definition.onLoad = orginal; - if ( typeof orginal == 'function' ) - orginal.call( this ); - }; - } ); - } ); - } - }; - - - } -}; - -CKEDITOR.plugins.add( 'colordialog', CKEDITOR.plugins.colordialog ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/af.js deleted file mode 100644 index 9109123d662..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'af', { - options: 'Konteks Spyskaart-opsies' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ar.js deleted file mode 100644 index bc0b4484f84..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ar', { - options: 'خصائص قائمة السياق' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bg.js deleted file mode 100644 index 36ba4cfb843..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'bg', { - options: 'Опции на контекстното меню' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bn.js deleted file mode 100644 index 9a07e71941e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'bn', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bs.js deleted file mode 100644 index 7c17e7d7e56..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'bs', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ca.js deleted file mode 100644 index a6c59b5fbc4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ca', { - options: 'Opcions del menú contextual' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/cs.js deleted file mode 100644 index fd28a840c38..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'cs', { - options: 'Nastavení kontextové nabídky' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/cy.js deleted file mode 100644 index 6a4e4a8b275..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'cy', { - options: 'Opsiynau Dewislen Cyd-destun' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/da.js deleted file mode 100644 index 5336bb71b3c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'da', { - options: 'Muligheder for hjælpemenu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/de.js deleted file mode 100644 index c51ded1d459..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'de', { - options: 'Kontextmenü Optionen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/el.js deleted file mode 100644 index 7f0813beb38..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'el', { - options: 'Επιλογές Αναδυόμενου Μενού' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-au.js deleted file mode 100644 index 9e4b58b2876..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'en-au', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-ca.js deleted file mode 100644 index b61046ecbd8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'en-ca', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-gb.js deleted file mode 100644 index 2b79207b712..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'en-gb', { - options: 'Context Menu Options' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en.js deleted file mode 100644 index 98471b49bf6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'en', { - options: 'Context Menu Options' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/eo.js deleted file mode 100644 index 020df9830cb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'eo', { - options: 'Opcioj de Kunteksta Menuo' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/es.js deleted file mode 100644 index d6e361eea6d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'es', { - options: 'Opciones del menú contextual' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/et.js deleted file mode 100644 index f3eb7ab15be..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'et', { - options: 'Kontekstimenüü valikud' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/eu.js deleted file mode 100644 index ddf1884c2cc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'eu', { - options: 'Testuingurko Menuaren Aukerak' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fa.js deleted file mode 100644 index 5baeaff1c05..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'fa', { - options: 'گزینه​های منوی زمینه' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fi.js deleted file mode 100644 index 29decedfb1b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'fi', { - options: 'Pikavalikon ominaisuudet' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fo.js deleted file mode 100644 index fd549553fbc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'fo', { - options: 'Context Menu Options' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fr-ca.js deleted file mode 100644 index 7d8eda45406..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'fr-ca', { - options: 'Options du menu contextuel' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fr.js deleted file mode 100644 index 71fa2b84256..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'fr', { - options: 'Options du menu contextuel' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/gl.js deleted file mode 100644 index ff9d6b685d8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'gl', { - options: 'Opcións do menú contextual' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/gu.js deleted file mode 100644 index 1f125e27c95..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'gu', { - options: 'કોન્તેક્ષ્ત્ મેનુના વિકલ્પો' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/he.js deleted file mode 100644 index 8139a71a2b0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'he', { - options: 'אפשרויות תפריט ההקשר' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hi.js deleted file mode 100644 index aabe9b25115..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'hi', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hr.js deleted file mode 100644 index 95783ba84f5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'hr', { - options: 'Opcije izbornika' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hu.js deleted file mode 100644 index a3ad44f141f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'hu', { - options: 'Helyi menü opciók' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/id.js deleted file mode 100644 index 1d75d2cb8c9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'id', { - options: 'Opsi Konteks Pilihan' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/is.js deleted file mode 100644 index b0ce9edc955..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'is', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/it.js deleted file mode 100644 index edafe96b647..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'it', { - options: 'Opzioni del menù contestuale' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ja.js deleted file mode 100644 index edcc47dcbb8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ja', { - options: 'コンテキストメニューオプション' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ka.js deleted file mode 100644 index 3a944635e69..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ka', { - options: 'კონტექსტური მენიუს პარამეტრები' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/km.js deleted file mode 100644 index a2e7d544772..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'km', { - options: 'ជម្រើស​ម៉ឺនុយ​បរិបទ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ko.js deleted file mode 100644 index 4f60bb0a81b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ko', { - options: '컨텍스트 메뉴 옵션' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ku.js deleted file mode 100644 index 77214191a8d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ku', { - options: 'هەڵبژاردەی لیستەی کلیکی دەستی ڕاست' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/lt.js deleted file mode 100644 index 48edbb75de6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'lt', { - options: 'Kontekstinio meniu parametrai' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/lv.js deleted file mode 100644 index bc1a1631a03..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'lv', { - options: 'Uznirstošās izvēlnes uzstādījumi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/mk.js deleted file mode 100644 index 7c5b271c0c0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'mk', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/mn.js deleted file mode 100644 index 12469af1524..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'mn', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ms.js deleted file mode 100644 index df31fe04cb2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ms', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/nb.js deleted file mode 100644 index 8dd99a4465e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'nb', { - options: 'Alternativer for høyreklikkmeny' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/nl.js deleted file mode 100644 index 25b9d8d6d4b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'nl', { - options: 'Contextmenu opties' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/no.js deleted file mode 100644 index 38195cd8f7f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'no', { - options: 'Alternativer for høyreklikkmeny' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pl.js deleted file mode 100644 index e20b1cd86e1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'pl', { - options: 'Opcje menu kontekstowego' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pt-br.js deleted file mode 100644 index 1117c9a40ff..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'pt-br', { - options: 'Opções Menu de Contexto' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pt.js deleted file mode 100644 index 205eb6fdf71..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'pt', { - options: 'Menu de opções de contexto' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ro.js deleted file mode 100644 index df44813a1c2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ro', { - options: 'Opțiuni Meniu Contextual' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ru.js deleted file mode 100644 index 741126ffd2f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ru', { - options: 'Параметры контекстного меню' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/si.js deleted file mode 100644 index e8a340805b5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'si', { - options: 'අනතර්ග ලේඛණ විකල්ප' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sk.js deleted file mode 100644 index a94fe858fb8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'sk', { - options: 'Možnosti kontextového menu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sl.js deleted file mode 100644 index 60696241e30..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'sl', { - options: 'Možnosti Kontekstnega Menija' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sq.js deleted file mode 100644 index 8ff40cd88a4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'sq', { - options: 'Mundësitë e Menysë së Kontekstit' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sr-latn.js deleted file mode 100644 index 36ae082226f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'sr-latn', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sr.js deleted file mode 100644 index 64ddf2407dc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'sr', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sv.js deleted file mode 100644 index 71e4884cb87..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'sv', { - options: 'Context Menu Options' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/th.js deleted file mode 100644 index a8e41d8d197..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'th', { - options: 'Context Menu Options' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/tr.js deleted file mode 100644 index ea4a3f92771..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'tr', { - options: 'İçerik Menüsü Seçenekleri' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ug.js deleted file mode 100644 index da08efdcd4a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'ug', { - options: 'قىسقا يول تىزىملىك تاللانمىسى' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/uk.js deleted file mode 100644 index c2cbe39316b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'uk', { - options: 'Опції контекстного меню' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/vi.js deleted file mode 100644 index e6148849530..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'vi', { - options: 'Tùy chọn menu bổ xung' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/zh-cn.js deleted file mode 100644 index 2c2b677a8e1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'zh-cn', { - options: '快捷菜单选项' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/zh.js deleted file mode 100644 index f134584b3d1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'contextmenu', 'zh', { - options: '內容功能表選項' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/plugin.js deleted file mode 100644 index fb54db4ee67..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/contextmenu/plugin.js +++ /dev/null @@ -1,143 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.add( 'contextmenu', { - requires: 'menu', - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - - // Make sure the base class (CKEDITOR.menu) is loaded before it (#3318). - onLoad: function() { - /** - * Class replacing the non-configurable native context menu with configurable CKEditor's equivalent. - * - * @class - * @extends CKEDITOR.menu - */ - CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass( { - base: CKEDITOR.menu, - - /** - * Creates the CKEDITOR.plugins.contextMenu class instance. - * - * @constructor - * @param {CKEDITOR.editor} editor - */ - $: function( editor ) { - this.base.call( this, editor, { - panel: { - className: 'cke_menu_panel', - attributes: { - 'aria-label': editor.lang.contextmenu.options - } - } - } ); - }, - - proto: { - /** - * Starts watching on native context menu triggers (option key, right click) on given element. - * - * @param {CKEDITOR.dom.element} element - * @param {Boolean} [nativeContextMenuOnCtrl] Whether to open native context menu if - * *Ctrl* key is hold on opening the context menu. See {@link CKEDITOR.config#browserContextMenuOnCtrl}. - */ - addTarget: function( element, nativeContextMenuOnCtrl ) { - element.on( 'contextmenu', function( event ) { - var domEvent = event.data, - isCtrlKeyDown = - // Safari on Windows always show 'ctrlKey' as true in 'contextmenu' event, - // which make this property unreliable. (#4826) - ( CKEDITOR.env.webkit ? holdCtrlKey : ( CKEDITOR.env.mac ? domEvent.$.metaKey : domEvent.$.ctrlKey ) ); - - if ( nativeContextMenuOnCtrl && isCtrlKeyDown ) - return; - - // Cancel the browser context menu. - domEvent.preventDefault(); - - var doc = domEvent.getTarget().getDocument(), - offsetParent = domEvent.getTarget().getDocument().getDocumentElement(), - fromFrame = !doc.equals( CKEDITOR.document ), - scroll = doc.getWindow().getScrollPosition(), - offsetX = fromFrame ? domEvent.$.clientX : domEvent.$.pageX || scroll.x + domEvent.$.clientX, - offsetY = fromFrame ? domEvent.$.clientY : domEvent.$.pageY || scroll.y + domEvent.$.clientY; - - CKEDITOR.tools.setTimeout( function() { - this.open( offsetParent, null, offsetX, offsetY ); - - // IE needs a short while to allow selection change before opening menu. (#7908) - }, CKEDITOR.env.ie ? 200 : 0, this ); - }, this ); - - if ( CKEDITOR.env.webkit ) { - var holdCtrlKey, - onKeyDown = function( event ) { - holdCtrlKey = CKEDITOR.env.mac ? event.data.$.metaKey : event.data.$.ctrlKey; - }, - resetOnKeyUp = function() { - holdCtrlKey = 0; - }; - - element.on( 'keydown', onKeyDown ); - element.on( 'keyup', resetOnKeyUp ); - element.on( 'contextmenu', resetOnKeyUp ); - } - }, - - /** - * Opens context menu in given location. See the {@link CKEDITOR.menu#show} method. - * - * @param {CKEDITOR.dom.element} offsetParent - * @param {Number} [corner] - * @param {Number} [offsetX] - * @param {Number} [offsetY] - */ - open: function( offsetParent, corner, offsetX, offsetY ) { - this.editor.focus(); - offsetParent = offsetParent || CKEDITOR.document.getDocumentElement(); - - // #9362: Force selection check to update commands' states in the new context. - this.editor.selectionChange( 1 ); - - this.show( offsetParent, corner, offsetX, offsetY ); - } - } - } ); - }, - - beforeInit: function( editor ) { - /** - * @readonly - * @property {CKEDITOR.plugins.contextMenu} contextMenu - * @member CKEDITOR.editor - */ - var contextMenu = editor.contextMenu = new CKEDITOR.plugins.contextMenu( editor ); - - editor.on( 'contentDom', function() { - contextMenu.addTarget( editor.editable(), editor.config.browserContextMenuOnCtrl !== false ); - } ); - - editor.addCommand( 'contextMenu', { - exec: function() { - editor.contextMenu.open( editor.document.getBody() ); - } - } ); - - editor.setKeystroke( CKEDITOR.SHIFT + 121 /*F10*/, 'contextMenu' ); - editor.setKeystroke( CKEDITOR.CTRL + CKEDITOR.SHIFT + 121 /*F10*/, 'contextMenu' ); - } -} ); - -/** - * Whether to show the browser native context menu when the *Ctrl* or - * *Meta* (Mac) key is pressed on opening the context menu with the - * right mouse button click or the *Menu* key. - * - * config.browserContextMenuOnCtrl = false; - * - * @since 3.0.2 - * @cfg {Boolean} [browserContextMenuOnCtrl=true] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialog/dialogDefinition.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialog/dialogDefinition.js deleted file mode 100644 index 0e2a642ee2b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialog/dialogDefinition.js +++ /dev/null @@ -1,1006 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview Defines the "virtual" dialog, dialog content and dialog button - * definition classes. - */ - -/** - * The definition of a dialog window. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create dialogs. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * CKEDITOR.dialog.add( 'testOnly', function( editor ) { - * return { - * title: 'Test Dialog', - * resizable: CKEDITOR.DIALOG_RESIZE_BOTH, - * minWidth: 500, - * minHeight: 400, - * contents: [ - * { - * id: 'tab1', - * label: 'First Tab', - * title: 'First Tab Title', - * accessKey: 'Q', - * elements: [ - * { - * type: 'text', - * label: 'Test Text 1', - * id: 'testText1', - * 'default': 'hello world!' - * } - * ] - * } - * ] - * }; - * } ); - * - * @class CKEDITOR.dialog.definition - */ - -/** - * The dialog title, displayed in the dialog's header. Required. - * - * @property {String} title - */ - -/** - * How the dialog can be resized, must be one of the four contents defined below. - * - * * {@link CKEDITOR#DIALOG_RESIZE_NONE} - * * {@link CKEDITOR#DIALOG_RESIZE_WIDTH} - * * {@link CKEDITOR#DIALOG_RESIZE_HEIGHT} - * * {@link CKEDITOR#DIALOG_RESIZE_BOTH} - * - * @property {Number} [resizable=CKEDITOR.DIALOG_RESIZE_NONE] - */ - -/** - * The minimum width of the dialog, in pixels. - * - * @property {Number} [minWidth=600] - */ - -/** - * The minimum height of the dialog, in pixels. - * - * @property {Number} [minHeight=400] - */ - - -/** - * The initial width of the dialog, in pixels. - * - * @since 3.5.3 - * @property {Number} [width=CKEDITOR.dialog.definition#minWidth] - */ - -/** - * The initial height of the dialog, in pixels. - * - * @since 3.5.3 - * @property {Number} [height=CKEDITOR.dialog.definition.minHeight] - */ - -/** - * The buttons in the dialog, defined as an array of - * {@link CKEDITOR.dialog.definition.button} objects. - * - * @property {Array} [buttons=[ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ]] - */ - -/** - * The contents in the dialog, defined as an array of - * {@link CKEDITOR.dialog.definition.content} objects. Required. - * - * @property {Array} contents - */ - -/** - * The function to execute when OK is pressed. - * - * @property {Function} onOk - */ - -/** - * The function to execute when Cancel is pressed. - * - * @property {Function} onCancel - */ - -/** - * The function to execute when the dialog is displayed for the first time. - * - * @property {Function} onLoad - */ - -/** - * The function to execute when the dialog is loaded (executed every time the dialog is opened). - * - * @property {Function} onShow - */ - -/** - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create dialog content pages. - * - * @class CKEDITOR.dialog.definition.content. - */ - -/** - * The id of the content page. - * - * @property {String} id - */ - -/** - * The tab label of the content page. - * - * @property {String} label - */ - -/** - * The popup message of the tab label. - * - * @property {String} title - */ - -/** - * The CTRL hotkey for switching to the tab. - * - * contentDefinition.accessKey = 'Q'; // Switch to this page when CTRL-Q is pressed. - * - * @property {String} accessKey - */ - -/** - * The UI elements contained in this content page, defined as an array of - * {@link CKEDITOR.dialog.definition.uiElement} objects. - * - * @property {Array} elements - */ - -/** - * The definition of user interface element (textarea, radio etc). - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create dialog UI elements. - * - * @class CKEDITOR.dialog.definition.uiElement - * @see CKEDITOR.ui.dialog.uiElement - */ - -/** - * The id of the UI element. - * - * @property {String} id - */ - -/** - * The type of the UI element. Required. - * - * @property {String} type - */ - -/** - * The popup label of the UI element. - * - * @property {String} title - */ - -/** - * The content that needs to be allowed to enable this UI element. - * All formats accepted by {@link CKEDITOR.filter#check} may be used. - * - * When all UI elements in a tab are disabled, this tab will be disabled automatically. - * - * @property {String/Object/CKEDITOR.style} requiredContent - */ - -/** - * CSS class names to append to the UI element. - * - * @property {String} className - */ - -/** - * Inline CSS classes to append to the UI element. - * - * @property {String} style - */ - -/** - * Horizontal alignment (in container) of the UI element. - * - * @property {String} align - */ - -/** - * Function to execute the first time the UI element is displayed. - * - * @property {Function} onLoad - */ - -/** - * Function to execute whenever the UI element's parent dialog is displayed. - * - * @property {Function} onShow - */ - -/** - * Function to execute whenever the UI element's parent dialog is closed. - * - * @property {Function} onHide - */ - -/** - * Function to execute whenever the UI element's parent - * dialog's {@link CKEDITOR.dialog#setupContent} method is executed. - * It usually takes care of the respective UI element as a standalone element. - * - * @property {Function} setup - */ - -/** - * Function to execute whenever the UI element's parent - * dialog's {@link CKEDITOR.dialog#commitContent} method is executed. - * It usually takes care of the respective UI element as a standalone element. - * - * @property {Function} commit - */ - -// ----- hbox ----------------------------------------------------------------- - -/** - * Horizontal layout box for dialog UI elements, auto-expends to available width of container. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create horizontal layouts. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.hbox} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example: - * { - * type: 'hbox', - * widths: [ '25%', '25%', '50%' ], - * children: [ - * { - * type: 'text', - * id: 'id1', - * width: '40px', - * }, - * { - * type: 'text', - * id: 'id2', - * width: '40px', - * }, - * { - * type: 'text', - * id: 'id3' - * } - * ] - * } - * - * @class CKEDITOR.dialog.definition.hbox - * @extends CKEDITOR.dialog.definition.uiElement - */ - -/** - * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container. - * - * @property {Array} children - */ - -/** - * (Optional) The widths of child cells. - * - * @property {Array} widths - */ - -/** - * (Optional) The height of the layout. - * - * @property {Number} height - */ - -/** - * The CSS styles to apply to this element. - * - * @property {String} styles - */ - -/** - * (Optional) The padding width inside child cells. Example: 0, 1. - * - * @property {Number} padding - */ - -/** - * (Optional) The alignment of the whole layout. Example: center, top. - * - * @property {String} align - */ - -// ----- vbox ----------------------------------------------------------------- - -/** - * Vertical layout box for dialog UI elements. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create vertical layouts. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.vbox} object and can - * be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example: - * { - * type: 'vbox', - * align: 'right', - * width: '200px', - * children: [ - * { - * type: 'text', - * id: 'age', - * label: 'Age' - * }, - * { - * type: 'text', - * id: 'sex', - * label: 'Sex' - * }, - * { - * type: 'text', - * id: 'nationality', - * label: 'Nationality' - * } - * ] - * } - * - * @class CKEDITOR.dialog.definition.vbox - * @extends CKEDITOR.dialog.definition.uiElement - */ - -/** - * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container. - * - * @property {Array} children - */ - -/** - * (Optional) The width of the layout. - * - * @property {Array} width - */ - -/** - * (Optional) The heights of individual cells. - * - * @property {Number} heights - */ - -/** - * The CSS styles to apply to this element. - * - * @property {String} styles - */ - -/** - * (Optional) The padding width inside child cells. Example: 0, 1. - * - * @property {Number} padding - */ - -/** - * (Optional) The alignment of the whole layout. Example: center, top. - * - * @property {String} align - */ - -/** - * (Optional) Whether the layout should expand vertically to fill its container. - * - * @property {Boolean} expand - */ - -// ----- labeled element ------------------------------------------------------ - -/** - * The definition of labeled user interface element (textarea, textInput etc). - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create dialog UI elements. - * - * @class CKEDITOR.dialog.definition.labeledElement - * @extends CKEDITOR.dialog.definition.uiElement - * @see CKEDITOR.ui.dialog.labeledElement - */ - -/** - * The label of the UI element. - * - * { - * type: 'text', - * label: 'My Label' - * } - * - * @property {String} label - */ - -/** - * (Optional) Specify the layout of the label. Set to `'horizontal'` for horizontal layout. - * The default layout is vertical. - * - * { - * type: 'text', - * label: 'My Label', - * labelLayout: 'horizontal' - * } - * - * @property {String} labelLayout - */ - -/** - * (Optional) Applies only to horizontal layouts: a two elements array of lengths to specify the widths of the - * label and the content element. See also {@link CKEDITOR.dialog.definition.labeledElement#labelLayout}. - * - * { - * type: 'text', - * label: 'My Label', - * labelLayout: 'horizontal', - * widths: [100, 200] - * } - * - * @property {Array} widths - */ - -/** - * Specify the inline style of the uiElement label. - * - * { - * type: 'text', - * label: 'My Label', - * labelStyle: 'color: red' - * } - * - * @property {String} labelStyle - */ - - -/** - * Specify the inline style of the input element. - * - * { - * type: 'text', - * label: 'My Label', - * inputStyle: 'text-align: center' - * } - * - * @since 3.6.1 - * @property {String} inputStyle - */ - -/** - * Specify the inline style of the input element container. - * - * { - * type: 'text', - * label: 'My Label', - * controlStyle: 'width: 3em' - * } - * - * @since 3.6.1 - * @property {String} controlStyle - */ - -// ----- button --------------------------------------------------------------- - -/** - * The definition of a button. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create buttons. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.button} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example: - * { - * type: 'button', - * id: 'buttonId', - * label: 'Click me', - * title: 'My title', - * onClick: function() { - * // this = CKEDITOR.ui.dialog.button - * alert( 'Clicked: ' + this.id ); - * } - * } - * - * @class CKEDITOR.dialog.definition.button - * @extends CKEDITOR.dialog.definition.uiElement - */ - -/** - * Whether the button is disabled. - * - * @property {Boolean} disabled - */ - -/** - * The label of the UI element. - * - * @property {String} label - */ - -// ----- checkbox ------ -/** - * The definition of a checkbox element. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create groups of checkbox buttons. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.checkbox} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example: - * { - * type: 'checkbox', - * id: 'agree', - * label: 'I agree', - * 'default': 'checked', - * onClick: function() { - * // this = CKEDITOR.ui.dialog.checkbox - * alert( 'Checked: ' + this.getValue() ); - * } - * } - * - * @class CKEDITOR.dialog.definition.checkbox - * @extends CKEDITOR.dialog.definition.uiElement - */ - -/** - * (Optional) The validation function. - * - * @property {Function} validate - */ - -/** - * The label of the UI element. - * - * @property {String} label - */ - -/** - * The default state. - * - * @property {String} [default='' (unchecked)] - */ - -// ----- file ----------------------------------------------------------------- - -/** - * The definition of a file upload input. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create file upload elements. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.file} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example: - * { - * type: 'file', - * id: 'upload', - * label: 'Select file from your computer', - * size: 38 - * }, - * { - * type: 'fileButton', - * id: 'fileId', - * label: 'Upload file', - * 'for': [ 'tab1', 'upload' ], - * filebrowser: { - * onSelect: function( fileUrl, data ) { - * alert( 'Successfully uploaded: ' + fileUrl ); - * } - * } - * } - * - * @class CKEDITOR.dialog.definition.file - * @extends CKEDITOR.dialog.definition.labeledElement - */ - -/** - * (Optional) The validation function. - * - * @property {Function} validate - */ - -/** - * (Optional) The action attribute of the form element associated with this file upload input. - * If empty, CKEditor will use path to server connector for currently opened folder. - * - * @property {String} action - */ - -/** - * The size of the UI element. - * - * @property {Number} size - */ - -// ----- fileButton ----------------------------------------------------------- - -/** - * The definition of a button for submitting the file in a file upload input. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create a button for submitting the file in a file upload input. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.fileButton} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * - * @class CKEDITOR.dialog.definition.fileButton - * @extends CKEDITOR.dialog.definition.uiElement - */ - -/** - * (Optional) The validation function. - * - * @property {Function} validate - */ - -/** - * The label of the UI element. - * - * @property {String} label - */ - -/** - * The instruction for CKEditor how to deal with file upload. - * By default, the file and fileButton elements will not work "as expected" if this attribute is not set. - * - * // Update field with id 'txtUrl' in the 'tab1' tab when file is uploaded. - * filebrowser: 'tab1:txtUrl' - * - * // Call custom onSelect function when file is successfully uploaded. - * filebrowser: { - * onSelect: function( fileUrl, data ) { - * alert( 'Successfully uploaded: ' + fileUrl ); - * } - * } - * - * @property {String} filebrowser/Object - */ - -/** - * An array that contains pageId and elementId of the file upload input element for which this button is created. - * - * [ pageId, elementId ] - * - * @property {String} for - */ - -// ----- html ----------------------------------------------------------------- - -/** - * The definition of a raw HTML element. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create elements made from raw HTML code. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.html} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * To access HTML elements use {@link CKEDITOR.dom.document#getById}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example 1: - * { - * type: 'html', - * html: '

This is some sample HTML content.

' - * } - * - * // Example 2: - * // Complete sample with document.getById() call when the "Ok" button is clicked. - * var dialogDefinition = { - * title: 'Sample dialog', - * minWidth: 300, - * minHeight: 200, - * onOk: function() { - * // "this" is now a CKEDITOR.dialog object. - * var document = this.getElement().getDocument(); - * // document = CKEDITOR.dom.document - * var element = document.getById( 'myDiv' ); - * if ( element ) - * alert( element.getHtml() ); - * }, - * contents: [ - * { - * id: 'tab1', - * label: '', - * title: '', - * elements: [ - * { - * type: 'html', - * html: '
Sample text.
Another div.
' - * } - * ] - * } - * ], - * buttons: [ CKEDITOR.dialog.cancelButton, CKEDITOR.dialog.okButton ] - * }; - * - * @class CKEDITOR.dialog.definition.html - * @extends CKEDITOR.dialog.definition.uiElement - */ - -/** - * (Required) HTML code of this element. - * - * @property {String} html - */ - -// ----- radio ---------------------------------------------------------------- - -/** - * The definition of a radio group. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create groups of radio buttons. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.radio} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example: - * { - * type: 'radio', - * id: 'country', - * label: 'Which country is bigger', - * items: [ [ 'France', 'FR' ], [ 'Germany', 'DE' ] ], - * style: 'color: green', - * 'default': 'DE', - * onClick: function() { - * // this = CKEDITOR.ui.dialog.radio - * alert( 'Current value: ' + this.getValue() ); - * } - * } - * - * @class CKEDITOR.dialog.definition.radio - * @extends CKEDITOR.dialog.definition.labeledElement - */ - -/** - * The default value. - * - * @property {String} default - */ - -/** - * (Optional) The validation function. - * - * @property {Function} validate - */ - -/** - * An array of options. Each option is a 1- or 2-item array of format `[ 'Description', 'Value' ]`. - * If `'Value'` is missing, then the value would be assumed to be the same as the description. - * - * @property {Array} items - */ - -// ----- selectElement -------------------------------------------------------- - -/** - * The definition of a select element. - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create select elements. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.select} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * // Example: - * { - * type: 'select', - * id: 'sport', - * label: 'Select your favourite sport', - * items: [ [ 'Basketball' ], [ 'Baseball' ], [ 'Hockey' ], [ 'Football' ] ], - * 'default': 'Football', - * onChange: function( api ) { - * // this = CKEDITOR.ui.dialog.select - * alert( 'Current value: ' + this.getValue() ); - * } - * } - * - * @class CKEDITOR.dialog.definition.select - * @extends CKEDITOR.dialog.definition.labeledElement - */ - -/** - * The default value. - * - * @property {String} default - */ - -/** - * (Optional) The validation function. - * - * @property {Function} validate - */ - -/** - * An array of options. Each option is a 1- or 2-item array of format `[ 'Description', 'Value' ]`. - * If `'Value'` is missing, then the value would be assumed to be the same as the description. - * - * @property {Array} items - */ - -/** - * (Optional) Set this to true if you'd like to have a multiple-choice select box. - * - * @property {Boolean} [multiple=false] - */ - -/** - * (Optional) The number of items to display in the select box. - * - * @property {Number} size - */ - -// ----- textInput ------------------------------------------------------------ - -/** - * The definition of a text field (single line). - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create text fields. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.textInput} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * - * // There is no constructor for this class, the user just has to define an - * // object with the appropriate properties. - * - * { - * type: 'text', - * id: 'name', - * label: 'Your name', - * 'default': '', - * validate: function() { - * if ( !this.getValue() ) { - * api.openMsgDialog( '', 'Name cannot be empty.' ); - * return false; - * } - * } - * } - * - * @class CKEDITOR.dialog.definition.textInput - * @extends CKEDITOR.dialog.definition.labeledElement - */ - -/** - * The default value. - * - * @property {String} default - */ - -/** - * (Optional) The maximum length. - * - * @property {Number} maxLength - */ - -/** - * (Optional) The size of the input field. - * - * @property {Number} size - */ - -/** - * (Optional) The validation function. - * - * @property {Function} validate - */ - -// ----- textarea ------------------------------------------------------------- - -/** - * The definition of a text field (multiple lines). - * - * This class is not really part of the API. It just illustrates the properties - * that developers can use to define and create textarea. - * - * Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.textarea} object - * and can be accessed with {@link CKEDITOR.dialog#getContentElement}. - * - * For a complete example of dialog definition, please check {@link CKEDITOR.dialog#add}. - * -* // There is no constructor for this class, the user just has to define an -* // object with the appropriate properties. -* -* // Example: -* { -* type: 'textarea', -* id: 'message', -* label: 'Your comment', -* 'default': '', -* validate: function() { -* if ( this.getValue().length < 5 ) { -* api.openMsgDialog( 'The comment is too short.' ); -* return false; -* } -* } -* } - * - * @class CKEDITOR.dialog.definition.textarea - * @extends CKEDITOR.dialog.definition.labeledElement - */ - -/** - * The number of rows. - * - * @property {Number} rows - */ - -/** - * The number of columns. - * - * @property {Number} cols - */ - -/** - * (Optional) The validation function. - * - * @property {Function} validate - */ - -/** - * The default value. - * - * @property {String} default - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialog/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialog/plugin.js deleted file mode 100644 index 5382f01531b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialog/plugin.js +++ /dev/null @@ -1,3267 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview The floating dialog plugin. - */ - -/** - * No resize for this dialog. - * - * @readonly - * @property {Number} [=0] - * @member CKEDITOR - */ -CKEDITOR.DIALOG_RESIZE_NONE = 0; - -/** - * Only allow horizontal resizing for this dialog, disable vertical resizing. - * - * @readonly - * @property {Number} [=1] - * @member CKEDITOR - */ -CKEDITOR.DIALOG_RESIZE_WIDTH = 1; - -/** - * Only allow vertical resizing for this dialog, disable horizontal resizing. - * - * @readonly - * @property {Number} [=2] - * @member CKEDITOR - */ -CKEDITOR.DIALOG_RESIZE_HEIGHT = 2; - -/** - * Allow the dialog to be resized in both directions. - * - * @readonly - * @property {Number} [=3] - * @member CKEDITOR - */ -CKEDITOR.DIALOG_RESIZE_BOTH = 3; - -( function() { - var cssLength = CKEDITOR.tools.cssLength; - - function isTabVisible( tabId ) { - return !!this._.tabs[ tabId ][ 0 ].$.offsetHeight; - } - - function getPreviousVisibleTab() { - var tabId = this._.currentTabId, - length = this._.tabIdList.length, - tabIndex = CKEDITOR.tools.indexOf( this._.tabIdList, tabId ) + length; - - for ( var i = tabIndex - 1; i > tabIndex - length; i-- ) { - if ( isTabVisible.call( this, this._.tabIdList[ i % length ] ) ) - return this._.tabIdList[ i % length ]; - } - - return null; - } - - function getNextVisibleTab() { - var tabId = this._.currentTabId, - length = this._.tabIdList.length, - tabIndex = CKEDITOR.tools.indexOf( this._.tabIdList, tabId ); - - for ( var i = tabIndex + 1; i < tabIndex + length; i++ ) { - if ( isTabVisible.call( this, this._.tabIdList[ i % length ] ) ) - return this._.tabIdList[ i % length ]; - } - - return null; - } - - - function clearOrRecoverTextInputValue( container, isRecover ) { - var inputs = container.$.getElementsByTagName( 'input' ); - for ( var i = 0, length = inputs.length; i < length; i++ ) { - var item = new CKEDITOR.dom.element( inputs[ i ] ); - - if ( item.getAttribute( 'type' ).toLowerCase() == 'text' ) { - if ( isRecover ) { - item.setAttribute( 'value', item.getCustomData( 'fake_value' ) || '' ); - item.removeCustomData( 'fake_value' ); - } else { - item.setCustomData( 'fake_value', item.getAttribute( 'value' ) ); - item.setAttribute( 'value', '' ); - } - } - } - } - - // Handle dialog element validation state UI changes. - function handleFieldValidated( isValid, msg ) { - var input = this.getInputElement(); - if ( input ) - isValid ? input.removeAttribute( 'aria-invalid' ) : input.setAttribute( 'aria-invalid', true ); - - if ( !isValid ) { - if ( this.select ) - this.select(); - else - this.focus(); - } - - msg && alert( msg ); - - this.fire( 'validated', { valid: isValid, msg: msg } ); - } - - function resetField() { - var input = this.getInputElement(); - input && input.removeAttribute( 'aria-invalid' ); - } - - var templateSource = ''; - - function buildDialog( editor ) { - var element = CKEDITOR.dom.element.createFromHtml( CKEDITOR.addTemplate( 'dialog', templateSource ).output( { - id: CKEDITOR.tools.getNextNumber(), - editorId: editor.id, - langDir: editor.lang.dir, - langCode: editor.langCode, - editorDialogClass: 'cke_editor_' + editor.name.replace( /\./g, '\\.' ) + '_dialog', - closeTitle: editor.lang.common.close, - hidpi: CKEDITOR.env.hidpi ? 'cke_hidpi' : '' - } ) ); - - // TODO: Change this to getById(), so it'll support custom templates. - var body = element.getChild( [ 0, 0, 0, 0, 0 ] ), - title = body.getChild( 0 ), - close = body.getChild( 1 ); - - // IFrame shim for dialog that masks activeX in IE. (#7619) - if ( CKEDITOR.env.ie && !CKEDITOR.env.ie6Compat ) { - var src = 'javascript:void(function(){' + encodeURIComponent( 'document.open();(' + CKEDITOR.tools.fixDomain + ')();document.close();' ) + '}())', - iframe = CKEDITOR.dom.element.createFromHtml( '' ); - iframe.appendTo( body.getParent() ); - } - - // Make the Title and Close Button unselectable. - title.unselectable(); - close.unselectable(); - - return { - element: element, - parts: { - dialog: element.getChild( 0 ), - title: title, - close: close, - tabs: body.getChild( 2 ), - contents: body.getChild( [ 3, 0, 0, 0 ] ), - footer: body.getChild( [ 3, 0, 1, 0 ] ) - } - }; - } - - /** - * This is the base class for runtime dialog objects. An instance of this - * class represents a single named dialog for a single editor instance. - * - * var dialogObj = new CKEDITOR.dialog( editor, 'smiley' ); - * - * @class - * @constructor Creates a dialog class instance. - * @param {Object} editor The editor which created the dialog. - * @param {String} dialogName The dialog's registered name. - */ - CKEDITOR.dialog = function( editor, dialogName ) { - // Load the dialog definition. - var definition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ], - defaultDefinition = CKEDITOR.tools.clone( defaultDialogDefinition ), - buttonsOrder = editor.config.dialog_buttonsOrder || 'OS', - dir = editor.lang.dir, - tabsToRemove = {}, - i, processed, stopPropagation; - - if ( ( buttonsOrder == 'OS' && CKEDITOR.env.mac ) || // The buttons in MacOS Apps are in reverse order (#4750) - ( buttonsOrder == 'rtl' && dir == 'ltr' ) || ( buttonsOrder == 'ltr' && dir == 'rtl' ) ) - defaultDefinition.buttons.reverse(); - - - // Completes the definition with the default values. - definition = CKEDITOR.tools.extend( definition( editor ), defaultDefinition ); - - // Clone a functionally independent copy for this dialog. - definition = CKEDITOR.tools.clone( definition ); - - // Create a complex definition object, extending it with the API - // functions. - definition = new definitionObject( this, definition ); - - var doc = CKEDITOR.document; - - var themeBuilt = buildDialog( editor ); - - // Initialize some basic parameters. - this._ = { - editor: editor, - element: themeBuilt.element, - name: dialogName, - contentSize: { width: 0, height: 0 }, - size: { width: 0, height: 0 }, - contents: {}, - buttons: {}, - accessKeyMap: {}, - - // Initialize the tab and page map. - tabs: {}, - tabIdList: [], - currentTabId: null, - currentTabIndex: null, - pageCount: 0, - lastTab: null, - tabBarMode: false, - - // Initialize the tab order array for input widgets. - focusList: [], - currentFocusIndex: 0, - hasFocus: false - }; - - this.parts = themeBuilt.parts; - - CKEDITOR.tools.setTimeout( function() { - editor.fire( 'ariaWidget', this.parts.contents ); - }, 0, this ); - - // Set the startup styles for the dialog, avoiding it enlarging the - // page size on the dialog creation. - var startStyles = { - position: CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed', - top: 0, - visibility: 'hidden' - }; - - startStyles[ dir == 'rtl' ? 'right' : 'left' ] = 0; - this.parts.dialog.setStyles( startStyles ); - - - // Call the CKEDITOR.event constructor to initialize this instance. - CKEDITOR.event.call( this ); - - // Fire the "dialogDefinition" event, making it possible to customize - // the dialog definition. - this.definition = definition = CKEDITOR.fire( 'dialogDefinition', { - name: dialogName, - definition: definition - }, editor ).definition; - - // Cache tabs that should be removed. - if ( !( 'removeDialogTabs' in editor._ ) && editor.config.removeDialogTabs ) { - var removeContents = editor.config.removeDialogTabs.split( ';' ); - - for ( i = 0; i < removeContents.length; i++ ) { - var parts = removeContents[ i ].split( ':' ); - if ( parts.length == 2 ) { - var removeDialogName = parts[ 0 ]; - if ( !tabsToRemove[ removeDialogName ] ) - tabsToRemove[ removeDialogName ] = []; - tabsToRemove[ removeDialogName ].push( parts[ 1 ] ); - } - } - editor._.removeDialogTabs = tabsToRemove; - } - - // Remove tabs of this dialog. - if ( editor._.removeDialogTabs && ( tabsToRemove = editor._.removeDialogTabs[ dialogName ] ) ) { - for ( i = 0; i < tabsToRemove.length; i++ ) - definition.removeContents( tabsToRemove[ i ] ); - } - - // Initialize load, show, hide, ok and cancel events. - if ( definition.onLoad ) - this.on( 'load', definition.onLoad ); - - if ( definition.onShow ) - this.on( 'show', definition.onShow ); - - if ( definition.onHide ) - this.on( 'hide', definition.onHide ); - - if ( definition.onOk ) { - this.on( 'ok', function( evt ) { - // Dialog confirm might probably introduce content changes (#5415). - editor.fire( 'saveSnapshot' ); - setTimeout( function() { - editor.fire( 'saveSnapshot' ); - }, 0 ); - if ( definition.onOk.call( this, evt ) === false ) - evt.data.hide = false; - } ); - } - - if ( definition.onCancel ) { - this.on( 'cancel', function( evt ) { - if ( definition.onCancel.call( this, evt ) === false ) - evt.data.hide = false; - } ); - } - - var me = this; - - // Iterates over all items inside all content in the dialog, calling a - // function for each of them. - var iterContents = function( func ) { - var contents = me._.contents, - stop = false; - - for ( var i in contents ) { - for ( var j in contents[ i ] ) { - stop = func.call( this, contents[ i ][ j ] ); - if ( stop ) - return; - } - } - }; - - this.on( 'ok', function( evt ) { - iterContents( function( item ) { - if ( item.validate ) { - var retval = item.validate( this ), - invalid = typeof( retval ) == 'string' || retval === false; - - if ( invalid ) { - evt.data.hide = false; - evt.stop(); - } - - handleFieldValidated.call( item, !invalid, typeof retval == 'string' ? retval : undefined ); - return invalid; - } - } ); - }, this, null, 0 ); - - this.on( 'cancel', function( evt ) { - iterContents( function( item ) { - if ( item.isChanged() ) { - if ( !editor.config.dialog_noConfirmCancel && !confirm( editor.lang.common.confirmCancel ) ) - evt.data.hide = false; - return true; - } - } ); - }, this, null, 0 ); - - this.parts.close.on( 'click', function( evt ) { - if ( this.fire( 'cancel', { hide: true } ).hide !== false ) - this.hide(); - evt.data.preventDefault(); - }, this ); - - // Sort focus list according to tab order definitions. - function setupFocus() { - var focusList = me._.focusList; - focusList.sort( function( a, b ) { - // Mimics browser tab order logics; - if ( a.tabIndex != b.tabIndex ) - return b.tabIndex - a.tabIndex; - // Sort is not stable in some browsers, - // fall-back the comparator to 'focusIndex'; - else - return a.focusIndex - b.focusIndex; - } ); - - var size = focusList.length; - for ( var i = 0; i < size; i++ ) - focusList[ i ].focusIndex = i; - } - - function changeFocus( offset ) { - var focusList = me._.focusList; - offset = offset || 0; - - if ( focusList.length < 1 ) - return; - - var current = me._.currentFocusIndex; - - // Trigger the 'blur' event of any input element before anything, - // since certain UI updates may depend on it. - try { - focusList[ current ].getInputElement().$.blur(); - } catch ( e ) {} - - var startIndex = ( current + offset + focusList.length ) % focusList.length, - currentIndex = startIndex; - while ( offset && !focusList[ currentIndex ].isFocusable() ) { - currentIndex = ( currentIndex + offset + focusList.length ) % focusList.length; - if ( currentIndex == startIndex ) - break; - } - - focusList[ currentIndex ].focus(); - - // Select whole field content. - if ( focusList[ currentIndex ].type == 'text' ) - focusList[ currentIndex ].select(); - } - - this.changeFocus = changeFocus; - - - function keydownHandler( evt ) { - // If I'm not the top dialog, ignore. - if ( me != CKEDITOR.dialog._.currentTop ) - return; - - var keystroke = evt.data.getKeystroke(), - rtl = editor.lang.dir == 'rtl', - button; - - processed = stopPropagation = 0; - - if ( keystroke == 9 || keystroke == CKEDITOR.SHIFT + 9 ) { - var shiftPressed = ( keystroke == CKEDITOR.SHIFT + 9 ); - - // Handling Tab and Shift-Tab. - if ( me._.tabBarMode ) { - // Change tabs. - var nextId = shiftPressed ? getPreviousVisibleTab.call( me ) : getNextVisibleTab.call( me ); - me.selectPage( nextId ); - me._.tabs[ nextId ][ 0 ].focus(); - } else { - // Change the focus of inputs. - changeFocus( shiftPressed ? -1 : 1 ); - } - - processed = 1; - } else if ( keystroke == CKEDITOR.ALT + 121 && !me._.tabBarMode && me.getPageCount() > 1 ) { - // Alt-F10 puts focus into the current tab item in the tab bar. - me._.tabBarMode = true; - me._.tabs[ me._.currentTabId ][ 0 ].focus(); - processed = 1; - } else if ( ( keystroke == 37 || keystroke == 39 ) && me._.tabBarMode ) { - // Arrow keys - used for changing tabs. - nextId = ( keystroke == ( rtl ? 39 : 37 ) ? getPreviousVisibleTab.call( me ) : getNextVisibleTab.call( me ) ); - me.selectPage( nextId ); - me._.tabs[ nextId ][ 0 ].focus(); - processed = 1; - } else if ( ( keystroke == 13 || keystroke == 32 ) && me._.tabBarMode ) { - this.selectPage( this._.currentTabId ); - this._.tabBarMode = false; - this._.currentFocusIndex = -1; - changeFocus( 1 ); - processed = 1; - } - // If user presses enter key in a text box, it implies clicking OK for the dialog. - else if ( keystroke == 13 /*ENTER*/ ) { - // Don't do that for a target that handles ENTER. - var target = evt.data.getTarget(); - if ( !target.is( 'a', 'button', 'select', 'textarea' ) && ( !target.is( 'input' ) || target.$.type != 'button' ) ) { - button = this.getButton( 'ok' ); - button && CKEDITOR.tools.setTimeout( button.click, 0, button ); - processed = 1; - } - stopPropagation = 1; // Always block the propagation (#4269) - } else if ( keystroke == 27 /*ESC*/ ) { - button = this.getButton( 'cancel' ); - - // If there's a Cancel button, click it, else just fire the cancel event and hide the dialog. - if ( button ) - CKEDITOR.tools.setTimeout( button.click, 0, button ); - else { - if ( this.fire( 'cancel', { hide: true } ).hide !== false ) - this.hide(); - } - stopPropagation = 1; // Always block the propagation (#4269) - } else - return; - - keypressHandler( evt ); - } - - function keypressHandler( evt ) { - if ( processed ) - evt.data.preventDefault( 1 ); - else if ( stopPropagation ) - evt.data.stopPropagation(); - } - - var dialogElement = this._.element; - - editor.focusManager.add( dialogElement, 1 ); - - // Add the dialog keyboard handlers. - this.on( 'show', function() { - dialogElement.on( 'keydown', keydownHandler, this ); - - // Some browsers instead, don't cancel key events in the keydown, but in the - // keypress. So we must do a longer trip in those cases. (#4531,#8985) - if ( CKEDITOR.env.opera || CKEDITOR.env.gecko ) - dialogElement.on( 'keypress', keypressHandler, this ); - - } ); - this.on( 'hide', function() { - dialogElement.removeListener( 'keydown', keydownHandler ); - if ( CKEDITOR.env.opera || CKEDITOR.env.gecko ) - dialogElement.removeListener( 'keypress', keypressHandler ); - - // Reset fields state when closing dialog. - iterContents( function( item ) { - resetField.apply( item ); - } ); - } ); - this.on( 'iframeAdded', function( evt ) { - var doc = new CKEDITOR.dom.document( evt.data.iframe.$.contentWindow.document ); - doc.on( 'keydown', keydownHandler, this, null, 0 ); - } ); - - // Auto-focus logic in dialog. - this.on( 'show', function() { - // Setup tabIndex on showing the dialog instead of on loading - // to allow dynamic tab order happen in dialog definition. - setupFocus(); - - if ( editor.config.dialog_startupFocusTab && me._.pageCount > 1 ) { - me._.tabBarMode = true; - me._.tabs[ me._.currentTabId ][ 0 ].focus(); - } else if ( !this._.hasFocus ) { - this._.currentFocusIndex = -1; - - // Decide where to put the initial focus. - if ( definition.onFocus ) { - var initialFocus = definition.onFocus.call( this ); - // Focus the field that the user specified. - initialFocus && initialFocus.focus(); - } - // Focus the first field in layout order. - else - changeFocus( 1 ); - } - }, this, null, 0xffffffff ); - - // IE6 BUG: Text fields and text areas are only half-rendered the first time the dialog appears in IE6 (#2661). - // This is still needed after [2708] and [2709] because text fields in hidden TR tags are still broken. - if ( CKEDITOR.env.ie6Compat ) { - this.on( 'load', function( evt ) { - var outer = this.getElement(), - inner = outer.getFirst(); - inner.remove(); - inner.appendTo( outer ); - }, this ); - } - - initDragAndDrop( this ); - initResizeHandles( this ); - - // Insert the title. - ( new CKEDITOR.dom.text( definition.title, CKEDITOR.document ) ).appendTo( this.parts.title ); - - // Insert the tabs and contents. - for ( i = 0; i < definition.contents.length; i++ ) { - var page = definition.contents[ i ]; - page && this.addPage( page ); - } - - this.parts[ 'tabs' ].on( 'click', function( evt ) { - var target = evt.data.getTarget(); - // If we aren't inside a tab, bail out. - if ( target.hasClass( 'cke_dialog_tab' ) ) { - // Get the ID of the tab, without the 'cke_' prefix and the unique number suffix. - var id = target.$.id; - this.selectPage( id.substring( 4, id.lastIndexOf( '_' ) ) ); - - if ( this._.tabBarMode ) { - this._.tabBarMode = false; - this._.currentFocusIndex = -1; - changeFocus( 1 ); - } - evt.data.preventDefault(); - } - }, this ); - - // Insert buttons. - var buttonsHtml = [], - buttons = CKEDITOR.dialog._.uiElementBuilders.hbox.build( this, { - type: 'hbox', - className: 'cke_dialog_footer_buttons', - widths: [], - children: definition.buttons - }, buttonsHtml ).getChild(); - this.parts.footer.setHtml( buttonsHtml.join( '' ) ); - - for ( i = 0; i < buttons.length; i++ ) - this._.buttons[ buttons[ i ].id ] = buttons[ i ]; - }; - - // Focusable interface. Use it via dialog.addFocusable. - function Focusable( dialog, element, index ) { - this.element = element; - this.focusIndex = index; - // TODO: support tabIndex for focusables. - this.tabIndex = 0; - this.isFocusable = function() { - return !element.getAttribute( 'disabled' ) && element.isVisible(); - }; - this.focus = function() { - dialog._.currentFocusIndex = this.focusIndex; - this.element.focus(); - }; - // Bind events - element.on( 'keydown', function( e ) { - if ( e.data.getKeystroke() in { 32: 1, 13: 1 } ) - this.fire( 'click' ); - } ); - element.on( 'focus', function() { - this.fire( 'mouseover' ); - } ); - element.on( 'blur', function() { - this.fire( 'mouseout' ); - } ); - } - - // Re-layout the dialog on window resize. - function resizeWithWindow( dialog ) { - var win = CKEDITOR.document.getWindow(); - function resizeHandler() { dialog.layout(); } - win.on( 'resize', resizeHandler ); - dialog.on( 'hide', function() { win.removeListener( 'resize', resizeHandler ); } ); - } - - CKEDITOR.dialog.prototype = { - destroy: function() { - this.hide(); - this._.element.remove(); - }, - - /** - * Resizes the dialog. - * - * dialogObj.resize( 800, 640 ); - * - * @method - * @param {Number} width The width of the dialog in pixels. - * @param {Number} height The height of the dialog in pixels. - */ - resize: ( function() { - return function( width, height ) { - if ( this._.contentSize && this._.contentSize.width == width && this._.contentSize.height == height ) - return; - - CKEDITOR.dialog.fire( 'resize', { - dialog: this, - width: width, - height: height - }, this._.editor ); - - this.fire( 'resize', { - width: width, - height: height - }, this._.editor ); - - var contents = this.parts.contents; - contents.setStyles( { - width: width + 'px', - height: height + 'px' - } ); - - // Update dialog position when dimension get changed in RTL. - if ( this._.editor.lang.dir == 'rtl' && this._.position ) - this._.position.x = CKEDITOR.document.getWindow().getViewPaneSize().width - this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 ); - - this._.contentSize = { width: width, height: height }; - }; - } )(), - - /** - * Gets the current size of the dialog in pixels. - * - * var width = dialogObj.getSize().width; - * - * @returns {Object} - * @returns {Number} return.width - * @returns {Number} return.height - */ - getSize: function() { - var element = this._.element.getFirst(); - return { width: element.$.offsetWidth || 0, height: element.$.offsetHeight || 0 }; - }, - - /** - * Moves the dialog to an `(x, y)` coordinate relative to the window. - * - * dialogObj.move( 10, 40 ); - * - * @method - * @param {Number} x The target x-coordinate. - * @param {Number} y The target y-coordinate. - * @param {Boolean} save Flag indicate whether the dialog position should be remembered on next open up. - */ - move: function( x, y, save ) { - - // The dialog may be fixed positioned or absolute positioned. Ask the - // browser what is the current situation first. - var element = this._.element.getFirst(), rtl = this._.editor.lang.dir == 'rtl'; - var isFixed = element.getComputedStyle( 'position' ) == 'fixed'; - - // (#8888) In some cases of a very small viewport, dialog is incorrectly - // positioned in IE7. It also happens that it remains sticky and user cannot - // scroll down/up to reveal dialog's content below/above the viewport; this is - // cumbersome. - // The only way to fix this is to move mouse out of the browser and - // go back to see that dialog position is automagically fixed. No events, - // no style change - pure magic. This is a IE7 rendering issue, which can be - // fixed with dummy style redraw on each move. - if ( CKEDITOR.env.ie ) - element.setStyle( 'zoom', '100%' ); - - if ( isFixed && this._.position && this._.position.x == x && this._.position.y == y ) - return; - - // Save the current position. - this._.position = { x: x, y: y }; - - // If not fixed positioned, add scroll position to the coordinates. - if ( !isFixed ) { - var scrollPosition = CKEDITOR.document.getWindow().getScrollPosition(); - x += scrollPosition.x; - y += scrollPosition.y; - } - - // Translate coordinate for RTL. - if ( rtl ) { - var dialogSize = this.getSize(), viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(); - x = viewPaneSize.width - dialogSize.width - x; - } - - var styles = { 'top': ( y > 0 ? y : 0 ) + 'px' }; - styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + 'px'; - - element.setStyles( styles ); - - save && ( this._.moved = 1 ); - }, - - /** - * Gets the dialog's position in the window. - * - * var dialogX = dialogObj.getPosition().x; - * - * @returns {Object} - * @returns {Number} return.x - * @returns {Number} return.y - */ - getPosition: function() { - return CKEDITOR.tools.extend( {}, this._.position ); - }, - - /** - * Shows the dialog box. - * - * dialogObj.show(); - */ - show: function() { - // Insert the dialog's element to the root document. - var element = this._.element; - var definition = this.definition; - if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) ) - element.appendTo( CKEDITOR.document.getBody() ); - else - element.setStyle( 'display', 'block' ); - - // FIREFOX BUG: Fix vanishing caret for Firefox 2 or Gecko 1.8. - if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) { - var dialogElement = this.parts.dialog; - dialogElement.setStyle( 'position', 'absolute' ); - setTimeout( function() { - dialogElement.setStyle( 'position', 'fixed' ); - }, 0 ); - } - - - // First, set the dialog to an appropriate size. - this.resize( this._.contentSize && this._.contentSize.width || definition.width || definition.minWidth, this._.contentSize && this._.contentSize.height || definition.height || definition.minHeight ); - - // Reset all inputs back to their default value. - this.reset(); - - // Select the first tab by default. - this.selectPage( this.definition.contents[ 0 ].id ); - - // Set z-index. - if ( CKEDITOR.dialog._.currentZIndex === null ) - CKEDITOR.dialog._.currentZIndex = this._.editor.config.baseFloatZIndex; - this._.element.getFirst().setStyle( 'z-index', CKEDITOR.dialog._.currentZIndex += 10 ); - - // Maintain the dialog ordering and dialog cover. - if ( CKEDITOR.dialog._.currentTop === null ) { - CKEDITOR.dialog._.currentTop = this; - this._.parentDialog = null; - showCover( this._.editor ); - - } else { - this._.parentDialog = CKEDITOR.dialog._.currentTop; - var parentElement = this._.parentDialog.getElement().getFirst(); - parentElement.$.style.zIndex -= Math.floor( this._.editor.config.baseFloatZIndex / 2 ); - CKEDITOR.dialog._.currentTop = this; - } - - element.on( 'keydown', accessKeyDownHandler ); - element.on( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler ); - - // Reset the hasFocus state. - this._.hasFocus = false; - - for ( var i in definition.contents ) { - if ( !definition.contents[ i ] ) - continue; - - var content = definition.contents[ i ], - tab = this._.tabs[ content.id ], - requiredContent = content.requiredContent, - enableElements = 0; - - if ( !tab ) - continue; - - for ( var j in this._.contents[ content.id ] ) { - var elem = this._.contents[ content.id ][ j ]; - - if ( elem.type == 'hbox' || elem.type == 'vbox' || !elem.getInputElement() ) - continue; - - if ( elem.requiredContent && !this._.editor.activeFilter.check( elem.requiredContent ) ) - elem.disable(); - else { - elem.enable(); - enableElements++; - } - } - - if ( !enableElements || ( requiredContent && !this._.editor.activeFilter.check( requiredContent ) ) ) - tab[ 0 ].addClass( 'cke_dialog_tab_disabled' ); - else - tab[ 0 ].removeClass( 'cke_dialog_tab_disabled' ); - } - - CKEDITOR.tools.setTimeout( function() { - this.layout(); - resizeWithWindow( this ); - - this.parts.dialog.setStyle( 'visibility', '' ); - - // Execute onLoad for the first show. - this.fireOnce( 'load', {} ); - CKEDITOR.ui.fire( 'ready', this ); - - this.fire( 'show', {} ); - this._.editor.fire( 'dialogShow', this ); - - if ( !this._.parentDialog ) - this._.editor.focusManager.lock(); - - // Save the initial values of the dialog. - this.foreach( function( contentObj ) { - contentObj.setInitValue && contentObj.setInitValue(); - } ); - - }, 100, this ); - }, - - /** - * Rearrange the dialog to its previous position or the middle of the window. - * - * @since 3.5 - */ - layout: function() { - var el = this.parts.dialog; - var dialogSize = this.getSize(); - var win = CKEDITOR.document.getWindow(), - viewSize = win.getViewPaneSize(); - - var posX = ( viewSize.width - dialogSize.width ) / 2, - posY = ( viewSize.height - dialogSize.height ) / 2; - - // Switch to absolute position when viewport is smaller than dialog size. - if ( !CKEDITOR.env.ie6Compat ) { - if ( dialogSize.height + ( posY > 0 ? posY : 0 ) > viewSize.height || - dialogSize.width + ( posX > 0 ? posX : 0 ) > viewSize.width ) - el.setStyle( 'position', 'absolute' ); - else - el.setStyle( 'position', 'fixed' ); - } - - this.move( this._.moved ? this._.position.x : posX, - this._.moved ? this._.position.y : posY ); - }, - - /** - * Executes a function for each UI element. - * - * @param {Function} fn Function to execute for each UI element. - * @returns {CKEDITOR.dialog} The current dialog object. - */ - foreach: function( fn ) { - for ( var i in this._.contents ) { - for ( var j in this._.contents[ i ] ) - fn.call( this, this._.contents[ i ][ j ] ); - } - return this; - }, - - /** - * Resets all input values in the dialog. - * - * dialogObj.reset(); - * - * @method - * @chainable - */ - reset: ( function() { - var fn = function( widget ) { - if ( widget.reset ) - widget.reset( 1 ); - }; - return function() { - this.foreach( fn ); - return this; - }; - } )(), - - - /** - * Calls the {@link CKEDITOR.dialog.definition.uiElement#setup} method of each - * of the UI elements, with the arguments passed through it. - * It is usually being called when the dialog is opened, to put the initial value inside the field. - * - * dialogObj.setupContent(); - * - * var timestamp = ( new Date() ).valueOf(); - * dialogObj.setupContent( timestamp ); - */ - setupContent: function() { - var args = arguments; - this.foreach( function( widget ) { - if ( widget.setup ) - widget.setup.apply( widget, args ); - } ); - }, - - /** - * Calls the {@link CKEDITOR.dialog.definition.uiElement#commit} method of each - * of the UI elements, with the arguments passed through it. - * It is usually being called when the user confirms the dialog, to process the values. - * - * dialogObj.commitContent(); - * - * var timestamp = ( new Date() ).valueOf(); - * dialogObj.commitContent( timestamp ); - */ - commitContent: function() { - var args = arguments; - this.foreach( function( widget ) { - // Make sure IE triggers "change" event on last focused input before closing the dialog. (#7915) - if ( CKEDITOR.env.ie && this._.currentFocusIndex == widget.focusIndex ) - widget.getInputElement().$.blur(); - - if ( widget.commit ) - widget.commit.apply( widget, args ); - } ); - }, - - /** - * Hides the dialog box. - * - * dialogObj.hide(); - */ - hide: function() { - if ( !this.parts.dialog.isVisible() ) - return; - - this.fire( 'hide', {} ); - this._.editor.fire( 'dialogHide', this ); - // Reset the tab page. - this.selectPage( this._.tabIdList[ 0 ] ); - var element = this._.element; - element.setStyle( 'display', 'none' ); - this.parts.dialog.setStyle( 'visibility', 'hidden' ); - // Unregister all access keys associated with this dialog. - unregisterAccessKey( this ); - - // Close any child(top) dialogs first. - while ( CKEDITOR.dialog._.currentTop != this ) - CKEDITOR.dialog._.currentTop.hide(); - - // Maintain dialog ordering and remove cover if needed. - if ( !this._.parentDialog ) - hideCover( this._.editor ); - else { - var parentElement = this._.parentDialog.getElement().getFirst(); - parentElement.setStyle( 'z-index', parseInt( parentElement.$.style.zIndex, 10 ) + Math.floor( this._.editor.config.baseFloatZIndex / 2 ) ); - } - CKEDITOR.dialog._.currentTop = this._.parentDialog; - - // Deduct or clear the z-index. - if ( !this._.parentDialog ) { - CKEDITOR.dialog._.currentZIndex = null; - - // Remove access key handlers. - element.removeListener( 'keydown', accessKeyDownHandler ); - element.removeListener( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler ); - - var editor = this._.editor; - editor.focus(); - - // Give a while before unlock, waiting for focus to return to the editable. (#172) - setTimeout( function() { editor.focusManager.unlock(); }, 0 ); - - } else - CKEDITOR.dialog._.currentZIndex -= 10; - - delete this._.parentDialog; - // Reset the initial values of the dialog. - this.foreach( function( contentObj ) { - contentObj.resetInitValue && contentObj.resetInitValue(); - } ); - }, - - /** - * Adds a tabbed page into the dialog. - * - * @param {Object} contents Content definition. - */ - addPage: function( contents ) { - if ( contents.requiredContent && !this._.editor.filter.check( contents.requiredContent ) ) - return; - - var pageHtml = [], - titleHtml = contents.label ? ' title="' + CKEDITOR.tools.htmlEncode( contents.label ) + '"' : '', - elements = contents.elements, - vbox = CKEDITOR.dialog._.uiElementBuilders.vbox.build( this, { - type: 'vbox', - className: 'cke_dialog_page_contents', - children: contents.elements, - expand: !!contents.expand, - padding: contents.padding, - style: contents.style || 'width: 100%;' - }, pageHtml ); - - var contentMap = this._.contents[ contents.id ] = {}, - cursor, - children = vbox.getChild(), - enabledFields = 0; - - while ( ( cursor = children.shift() ) ) { - // Count all allowed fields. - if ( !cursor.notAllowed && cursor.type != 'hbox' && cursor.type != 'vbox' ) - enabledFields++; - - contentMap[ cursor.id ] = cursor; - if ( typeof( cursor.getChild ) == 'function' ) - children.push.apply( children, cursor.getChild() ); - } - - // If all fields are disabled (because they are not allowed) hide this tab. - if ( !enabledFields ) - contents.hidden = true; - - // Create the HTML for the tab and the content block. - var page = CKEDITOR.dom.element.createFromHtml( pageHtml.join( '' ) ); - page.setAttribute( 'role', 'tabpanel' ); - - var env = CKEDITOR.env; - var tabId = 'cke_' + contents.id + '_' + CKEDITOR.tools.getNextNumber(), - tab = CKEDITOR.dom.element.createFromHtml( [ - ' 0 ? ' cke_last' : 'cke_first' ), - titleHtml, - ( !!contents.hidden ? ' style="display:none"' : '' ), - ' id="', tabId, '"', - env.gecko && env.version >= 10900 && !env.hc ? '' : ' href="javascript:void(0)"', - ' tabIndex="-1"', - ' hidefocus="true"', - ' role="tab">', - contents.label, - '' - ].join( '' ) ); - - page.setAttribute( 'aria-labelledby', tabId ); - - // Take records for the tabs and elements created. - this._.tabs[ contents.id ] = [ tab, page ]; - this._.tabIdList.push( contents.id ); - !contents.hidden && this._.pageCount++; - this._.lastTab = tab; - this.updateStyle(); - - // Attach the DOM nodes. - - page.setAttribute( 'name', contents.id ); - page.appendTo( this.parts.contents ); - - tab.unselectable(); - this.parts.tabs.append( tab ); - - // Add access key handlers if access key is defined. - if ( contents.accessKey ) { - registerAccessKey( this, this, 'CTRL+' + contents.accessKey, tabAccessKeyDown, tabAccessKeyUp ); - this._.accessKeyMap[ 'CTRL+' + contents.accessKey ] = contents.id; - } - }, - - /** - * Activates a tab page in the dialog by its id. - * - * dialogObj.selectPage( 'tab_1' ); - * - * @param {String} id The id of the dialog tab to be activated. - */ - selectPage: function( id ) { - if ( this._.currentTabId == id ) - return; - - if ( this._.tabs[ id ][ 0 ].hasClass( 'cke_dialog_tab_disabled' ) ) - return; - - // If event was canceled - do nothing. - if ( this.fire( 'selectPage', { page: id, currentPage: this._.currentTabId } ) === false ) - return; - - // Hide the non-selected tabs and pages. - for ( var i in this._.tabs ) { - var tab = this._.tabs[ i ][ 0 ], - page = this._.tabs[ i ][ 1 ]; - if ( i != id ) { - tab.removeClass( 'cke_dialog_tab_selected' ); - page.hide(); - } - page.setAttribute( 'aria-hidden', i != id ); - } - - var selected = this._.tabs[ id ]; - selected[ 0 ].addClass( 'cke_dialog_tab_selected' ); - - // [IE] an invisible input[type='text'] will enlarge it's width - // if it's value is long when it shows, so we clear it's value - // before it shows and then recover it (#5649) - if ( CKEDITOR.env.ie6Compat || CKEDITOR.env.ie7Compat ) { - clearOrRecoverTextInputValue( selected[ 1 ] ); - selected[ 1 ].show(); - setTimeout( function() { - clearOrRecoverTextInputValue( selected[ 1 ], 1 ); - }, 0 ); - } else - selected[ 1 ].show(); - - this._.currentTabId = id; - this._.currentTabIndex = CKEDITOR.tools.indexOf( this._.tabIdList, id ); - }, - - /** - * Dialog state-specific style updates. - */ - updateStyle: function() { - // If only a single page shown, a different style is used in the central pane. - this.parts.dialog[ ( this._.pageCount === 1 ? 'add' : 'remove' ) + 'Class' ]( 'cke_single_page' ); - }, - - /** - * Hides a page's tab away from the dialog. - * - * dialog.hidePage( 'tab_3' ); - * - * @param {String} id The page's Id. - */ - hidePage: function( id ) { - var tab = this._.tabs[ id ] && this._.tabs[ id ][ 0 ]; - if ( !tab || this._.pageCount == 1 || !tab.isVisible() ) - return; - // Switch to other tab first when we're hiding the active tab. - else if ( id == this._.currentTabId ) - this.selectPage( getPreviousVisibleTab.call( this ) ); - - tab.hide(); - this._.pageCount--; - this.updateStyle(); - }, - - /** - * Unhides a page's tab. - * - * dialog.showPage( 'tab_2' ); - * - * @param {String} id The page's Id. - */ - showPage: function( id ) { - var tab = this._.tabs[ id ] && this._.tabs[ id ][ 0 ]; - if ( !tab ) - return; - tab.show(); - this._.pageCount++; - this.updateStyle(); - }, - - /** - * Gets the root DOM element of the dialog. - * - * var dialogElement = dialogObj.getElement().getFirst(); - * dialogElement.setStyle( 'padding', '5px' ); - * - * @returns {CKEDITOR.dom.element} The `` element containing this dialog. - */ - getElement: function() { - return this._.element; - }, - - /** - * Gets the name of the dialog. - * - * var dialogName = dialogObj.getName(); - * - * @returns {String} The name of this dialog. - */ - getName: function() { - return this._.name; - }, - - /** - * Gets a dialog UI element object from a dialog page. - * - * dialogObj.getContentElement( 'tabId', 'elementId' ).setValue( 'Example' ); - * - * @param {String} pageId id of dialog page. - * @param {String} elementId id of UI element. - * @returns {CKEDITOR.ui.dialog.uiElement} The dialog UI element. - */ - getContentElement: function( pageId, elementId ) { - var page = this._.contents[ pageId ]; - return page && page[ elementId ]; - }, - - /** - * Gets the value of a dialog UI element. - * - * alert( dialogObj.getValueOf( 'tabId', 'elementId' ) ); - * - * @param {String} pageId id of dialog page. - * @param {String} elementId id of UI element. - * @returns {Object} The value of the UI element. - */ - getValueOf: function( pageId, elementId ) { - return this.getContentElement( pageId, elementId ).getValue(); - }, - - /** - * Sets the value of a dialog UI element. - * - * dialogObj.setValueOf( 'tabId', 'elementId', 'Example' ); - * - * @param {String} pageId id of the dialog page. - * @param {String} elementId id of the UI element. - * @param {Object} value The new value of the UI element. - */ - setValueOf: function( pageId, elementId, value ) { - return this.getContentElement( pageId, elementId ).setValue( value ); - }, - - /** - * Gets the UI element of a button in the dialog's button row. - * - * @returns {CKEDITOR.ui.dialog.button} The button object. - * - * @param {String} id The id of the button. - */ - getButton: function( id ) { - return this._.buttons[ id ]; - }, - - /** - * Simulates a click to a dialog button in the dialog's button row. - * - * @returns The return value of the dialog's `click` event. - * - * @param {String} id The id of the button. - */ - click: function( id ) { - return this._.buttons[ id ].click(); - }, - - /** - * Disables a dialog button. - * - * @param {String} id The id of the button. - */ - disableButton: function( id ) { - return this._.buttons[ id ].disable(); - }, - - /** - * Enables a dialog button. - * - * @param {String} id The id of the button. - */ - enableButton: function( id ) { - return this._.buttons[ id ].enable(); - }, - - /** - * Gets the number of pages in the dialog. - * - * @returns {Number} Page count. - */ - getPageCount: function() { - return this._.pageCount; - }, - - /** - * Gets the editor instance which opened this dialog. - * - * @returns {CKEDITOR.editor} Parent editor instances. - */ - getParentEditor: function() { - return this._.editor; - }, - - /** - * Gets the element that was selected when opening the dialog, if any. - * - * @returns {CKEDITOR.dom.element} The element that was selected, or `null`. - */ - getSelectedElement: function() { - return this.getParentEditor().getSelection().getSelectedElement(); - }, - - /** - * Adds element to dialog's focusable list. - * - * @param {CKEDITOR.dom.element} element - * @param {Number} [index] - */ - addFocusable: function( element, index ) { - if ( typeof index == 'undefined' ) { - index = this._.focusList.length; - this._.focusList.push( new Focusable( this, element, index ) ); - } else { - this._.focusList.splice( index, 0, new Focusable( this, element, index ) ); - for ( var i = index + 1; i < this._.focusList.length; i++ ) - this._.focusList[ i ].focusIndex++; - } - } - }; - - CKEDITOR.tools.extend( CKEDITOR.dialog, { - /** - * Registers a dialog. - * - * // Full sample plugin, which does not only register a dialog window but also adds an item to the context menu. - * // To open the dialog window, choose "Open dialog" in the context menu. - * CKEDITOR.plugins.add( 'myplugin', { - * init: function( editor ) { - * editor.addCommand( 'mydialog',new CKEDITOR.dialogCommand( 'mydialog' ) ); - * - * if ( editor.contextMenu ) { - * editor.addMenuGroup( 'mygroup', 10 ); - * editor.addMenuItem( 'My Dialog', { - * label: 'Open dialog', - * command: 'mydialog', - * group: 'mygroup' - * } ); - * editor.contextMenu.addListener( function( element ) { - * return { 'My Dialog': CKEDITOR.TRISTATE_OFF }; - * } ); - * } - * - * CKEDITOR.dialog.add( 'mydialog', function( api ) { - * // CKEDITOR.dialog.definition - * var dialogDefinition = { - * title: 'Sample dialog', - * minWidth: 390, - * minHeight: 130, - * contents: [ - * { - * id: 'tab1', - * label: 'Label', - * title: 'Title', - * expand: true, - * padding: 0, - * elements: [ - * { - * type: 'html', - * html: '

This is some sample HTML content.

' - * }, - * { - * type: 'textarea', - * id: 'textareaId', - * rows: 4, - * cols: 40 - * } - * ] - * } - * ], - * buttons: [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ], - * onOk: function() { - * // "this" is now a CKEDITOR.dialog object. - * // Accessing dialog elements: - * var textareaObj = this.getContentElement( 'tab1', 'textareaId' ); - * alert( "You have entered: " + textareaObj.getValue() ); - * } - * }; - * - * return dialogDefinition; - * } ); - * } - * } ); - * - * CKEDITOR.replace( 'editor1', { extraPlugins: 'myplugin' } ); - * - * @static - * @param {String} name The dialog's name. - * @param {Function/String} dialogDefinition - * A function returning the dialog's definition, or the URL to the `.js` file holding the function. - * The function should accept an argument `editor` which is the current editor instance, and - * return an object conforming to {@link CKEDITOR.dialog.definition}. - * @see CKEDITOR.dialog.definition - */ - add: function( name, dialogDefinition ) { - // Avoid path registration from multiple instances override definition. - if ( !this._.dialogDefinitions[ name ] || typeof dialogDefinition == 'function' ) - this._.dialogDefinitions[ name ] = dialogDefinition; - }, - - /** - * @static - * @todo - */ - exists: function( name ) { - return !!this._.dialogDefinitions[ name ]; - }, - - /** - * @static - * @todo - */ - getCurrent: function() { - return CKEDITOR.dialog._.currentTop; - }, - - /** - * Check whether tab wasn't removed by {@link CKEDITOR.config#removeDialogTabs}. - * - * @since 4.1 - * @static - * @param {CKEDITOR.editor} editor - * @param {String} dialogName - * @param {String} tabName - * @returns {Boolean} - */ - isTabEnabled: function( editor, dialogName, tabName ) { - var cfg = editor.config.removeDialogTabs; - - return !( cfg && cfg.match( new RegExp( '(?:^|;)' + dialogName + ':' + tabName + '(?:$|;)', 'i' ) ) ); - }, - - /** - * The default OK button for dialogs. Fires the `ok` event and closes the dialog if the event succeeds. - * - * @static - * @method - */ - okButton: ( function() { - var retval = function( editor, override ) { - override = override || {}; - return CKEDITOR.tools.extend( { - id: 'ok', - type: 'button', - label: editor.lang.common.ok, - 'class': 'cke_dialog_ui_button_ok', - onClick: function( evt ) { - var dialog = evt.data.dialog; - if ( dialog.fire( 'ok', { hide: true } ).hide !== false ) - dialog.hide(); - } - }, override, true ); - }; - retval.type = 'button'; - retval.override = function( override ) { - return CKEDITOR.tools.extend( function( editor ) { - return retval( editor, override ); - }, { type: 'button' }, true ); - }; - return retval; - } )(), - - /** - * The default cancel button for dialogs. Fires the `cancel` event and - * closes the dialog if no UI element value changed. - * - * @static - * @method - */ - cancelButton: ( function() { - var retval = function( editor, override ) { - override = override || {}; - return CKEDITOR.tools.extend( { - id: 'cancel', - type: 'button', - label: editor.lang.common.cancel, - 'class': 'cke_dialog_ui_button_cancel', - onClick: function( evt ) { - var dialog = evt.data.dialog; - if ( dialog.fire( 'cancel', { hide: true } ).hide !== false ) - dialog.hide(); - } - }, override, true ); - }; - retval.type = 'button'; - retval.override = function( override ) { - return CKEDITOR.tools.extend( function( editor ) { - return retval( editor, override ); - }, { type: 'button' }, true ); - }; - return retval; - } )(), - - /** - * Registers a dialog UI element. - * - * @static - * @param {String} typeName The name of the UI element. - * @param {Function} builder The function to build the UI element. - */ - addUIElement: function( typeName, builder ) { - this._.uiElementBuilders[ typeName ] = builder; - } - } ); - - CKEDITOR.dialog._ = { - uiElementBuilders: {}, - - dialogDefinitions: {}, - - currentTop: null, - - currentZIndex: null - }; - - // "Inherit" (copy actually) from CKEDITOR.event. - CKEDITOR.event.implementOn( CKEDITOR.dialog ); - CKEDITOR.event.implementOn( CKEDITOR.dialog.prototype ); - - var defaultDialogDefinition = { - resizable: CKEDITOR.DIALOG_RESIZE_BOTH, - minWidth: 600, - minHeight: 400, - buttons: [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ] - }; - - // Tool function used to return an item from an array based on its id - // property. - var getById = function( array, id, recurse ) { - for ( var i = 0, item; - ( item = array[ i ] ); i++ ) { - if ( item.id == id ) - return item; - if ( recurse && item[ recurse ] ) { - var retval = getById( item[ recurse ], id, recurse ); - if ( retval ) - return retval; - } - } - return null; - }; - - // Tool function used to add an item into an array. - var addById = function( array, newItem, nextSiblingId, recurse, nullIfNotFound ) { - if ( nextSiblingId ) { - for ( var i = 0, item; - ( item = array[ i ] ); i++ ) { - if ( item.id == nextSiblingId ) { - array.splice( i, 0, newItem ); - return newItem; - } - - if ( recurse && item[ recurse ] ) { - var retval = addById( item[ recurse ], newItem, nextSiblingId, recurse, true ); - if ( retval ) - return retval; - } - } - - if ( nullIfNotFound ) - return null; - } - - array.push( newItem ); - return newItem; - }; - - // Tool function used to remove an item from an array based on its id. - var removeById = function( array, id, recurse ) { - for ( var i = 0, item; - ( item = array[ i ] ); i++ ) { - if ( item.id == id ) - return array.splice( i, 1 ); - if ( recurse && item[ recurse ] ) { - var retval = removeById( item[ recurse ], id, recurse ); - if ( retval ) - return retval; - } - } - return null; - }; - - /** - * This class is not really part of the API. It is the `definition` property value - * passed to `dialogDefinition` event handlers. - * - * CKEDITOR.on( 'dialogDefinition', function( evt ) { - * var definition = evt.data.definition; - * var content = definition.getContents( 'page1' ); - * // ... - * } ); - * - * @private - * @class CKEDITOR.dialog.definitionObject - * @extends CKEDITOR.dialog.definition - * @constructor Creates a definitionObject class instance. - */ - var definitionObject = function( dialog, dialogDefinition ) { - // TODO : Check if needed. - this.dialog = dialog; - - // Transform the contents entries in contentObjects. - var contents = dialogDefinition.contents; - for ( var i = 0, content; - ( content = contents[ i ] ); i++ ) - contents[ i ] = content && new contentObject( dialog, content ); - - CKEDITOR.tools.extend( this, dialogDefinition ); - }; - - definitionObject.prototype = { - /** - * Gets a content definition. - * - * @param {String} id The id of the content definition. - * @returns {CKEDITOR.dialog.definition.content} The content definition matching id. - */ - getContents: function( id ) { - return getById( this.contents, id ); - }, - - /** - * Gets a button definition. - * - * @param {String} id The id of the button definition. - * @returns {CKEDITOR.dialog.definition.button} The button definition matching id. - */ - getButton: function( id ) { - return getById( this.buttons, id ); - }, - - /** - * Adds a content definition object under this dialog definition. - * - * @param {CKEDITOR.dialog.definition.content} contentDefinition The - * content definition. - * @param {String} [nextSiblingId] The id of an existing content - * definition which the new content definition will be inserted - * before. Omit if the new content definition is to be inserted as - * the last item. - * @returns {CKEDITOR.dialog.definition.content} The inserted content definition. - */ - addContents: function( contentDefinition, nextSiblingId ) { - return addById( this.contents, contentDefinition, nextSiblingId ); - }, - - /** - * Adds a button definition object under this dialog definition. - * - * @param {CKEDITOR.dialog.definition.button} buttonDefinition The - * button definition. - * @param {String} [nextSiblingId] The id of an existing button - * definition which the new button definition will be inserted - * before. Omit if the new button definition is to be inserted as - * the last item. - * @returns {CKEDITOR.dialog.definition.button} The inserted button definition. - */ - addButton: function( buttonDefinition, nextSiblingId ) { - return addById( this.buttons, buttonDefinition, nextSiblingId ); - }, - - /** - * Removes a content definition from this dialog definition. - * - * @param {String} id The id of the content definition to be removed. - * @returns {CKEDITOR.dialog.definition.content} The removed content definition. - */ - removeContents: function( id ) { - removeById( this.contents, id ); - }, - - /** - * Removes a button definition from the dialog definition. - * - * @param {String} id The id of the button definition to be removed. - * @returns {CKEDITOR.dialog.definition.button} The removed button definition. - */ - removeButton: function( id ) { - removeById( this.buttons, id ); - } - }; - - /** - * This class is not really part of the API. It is the template of the - * objects representing content pages inside the - * CKEDITOR.dialog.definitionObject. - * - * CKEDITOR.on( 'dialogDefinition', function( evt ) { - * var definition = evt.data.definition; - * var content = definition.getContents( 'page1' ); - * content.remove( 'textInput1' ); - * // ... - * } ); - * - * @private - * @class CKEDITOR.dialog.definition.contentObject - * @constructor Creates a contentObject class instance. - */ - function contentObject( dialog, contentDefinition ) { - this._ = { - dialog: dialog - }; - - CKEDITOR.tools.extend( this, contentDefinition ); - } - - contentObject.prototype = { - /** - * Gets a UI element definition under the content definition. - * - * @param {String} id The id of the UI element definition. - * @returns {CKEDITOR.dialog.definition.uiElement} - */ - get: function( id ) { - return getById( this.elements, id, 'children' ); - }, - - /** - * Adds a UI element definition to the content definition. - * - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition The - * UI elemnet definition to be added. - * @param {String} nextSiblingId The id of an existing UI element - * definition which the new UI element definition will be inserted - * before. Omit if the new button definition is to be inserted as - * the last item. - * @returns {CKEDITOR.dialog.definition.uiElement} The element definition inserted. - */ - add: function( elementDefinition, nextSiblingId ) { - return addById( this.elements, elementDefinition, nextSiblingId, 'children' ); - }, - - /** - * Removes a UI element definition from the content definition. - * - * @param {String} id The id of the UI element definition to be removed. - * @returns {CKEDITOR.dialog.definition.uiElement} The element definition removed. - */ - remove: function( id ) { - removeById( this.elements, id, 'children' ); - } - }; - - function initDragAndDrop( dialog ) { - var lastCoords = null, - abstractDialogCoords = null, - element = dialog.getElement().getFirst(), - editor = dialog.getParentEditor(), - magnetDistance = editor.config.dialog_magnetDistance, - margins = CKEDITOR.skin.margins || [ 0, 0, 0, 0 ]; - - if ( typeof magnetDistance == 'undefined' ) - magnetDistance = 20; - - function mouseMoveHandler( evt ) { - var dialogSize = dialog.getSize(), - viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(), - x = evt.data.$.screenX, - y = evt.data.$.screenY, - dx = x - lastCoords.x, - dy = y - lastCoords.y, - realX, realY; - - lastCoords = { x: x, y: y }; - abstractDialogCoords.x += dx; - abstractDialogCoords.y += dy; - - if ( abstractDialogCoords.x + margins[ 3 ] < magnetDistance ) - realX = -margins[ 3 ]; - else if ( abstractDialogCoords.x - margins[ 1 ] > viewPaneSize.width - dialogSize.width - magnetDistance ) - realX = viewPaneSize.width - dialogSize.width + ( editor.lang.dir == 'rtl' ? 0 : margins[ 1 ] ); - else - realX = abstractDialogCoords.x; - - if ( abstractDialogCoords.y + margins[ 0 ] < magnetDistance ) - realY = -margins[ 0 ]; - else if ( abstractDialogCoords.y - margins[ 2 ] > viewPaneSize.height - dialogSize.height - magnetDistance ) - realY = viewPaneSize.height - dialogSize.height + margins[ 2 ]; - else - realY = abstractDialogCoords.y; - - dialog.move( realX, realY, 1 ); - - evt.data.preventDefault(); - } - - function mouseUpHandler( evt ) { - CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler ); - CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler ); - - if ( CKEDITOR.env.ie6Compat ) { - var coverDoc = currentCover.getChild( 0 ).getFrameDocument(); - coverDoc.removeListener( 'mousemove', mouseMoveHandler ); - coverDoc.removeListener( 'mouseup', mouseUpHandler ); - } - } - - dialog.parts.title.on( 'mousedown', function( evt ) { - lastCoords = { x: evt.data.$.screenX, y: evt.data.$.screenY }; - - CKEDITOR.document.on( 'mousemove', mouseMoveHandler ); - CKEDITOR.document.on( 'mouseup', mouseUpHandler ); - abstractDialogCoords = dialog.getPosition(); - - if ( CKEDITOR.env.ie6Compat ) { - var coverDoc = currentCover.getChild( 0 ).getFrameDocument(); - coverDoc.on( 'mousemove', mouseMoveHandler ); - coverDoc.on( 'mouseup', mouseUpHandler ); - } - - evt.data.preventDefault(); - }, dialog ); - } - - function initResizeHandles( dialog ) { - var def = dialog.definition, - resizable = def.resizable; - - if ( resizable == CKEDITOR.DIALOG_RESIZE_NONE ) - return; - - var editor = dialog.getParentEditor(); - var wrapperWidth, wrapperHeight, viewSize, origin, startSize, dialogCover; - - var mouseDownFn = CKEDITOR.tools.addFunction( function( $event ) { - startSize = dialog.getSize(); - - var content = dialog.parts.contents, - iframeDialog = content.$.getElementsByTagName( 'iframe' ).length; - - // Shim to help capturing "mousemove" over iframe. - if ( iframeDialog ) { - dialogCover = CKEDITOR.dom.element.createFromHtml( '
' ); - content.append( dialogCover ); - } - - // Calculate the offset between content and chrome size. - wrapperHeight = startSize.height - dialog.parts.contents.getSize( 'height', !( CKEDITOR.env.gecko || CKEDITOR.env.opera || CKEDITOR.env.ie && CKEDITOR.env.quirks ) ); - wrapperWidth = startSize.width - dialog.parts.contents.getSize( 'width', 1 ); - - origin = { x: $event.screenX, y: $event.screenY }; - - viewSize = CKEDITOR.document.getWindow().getViewPaneSize(); - - CKEDITOR.document.on( 'mousemove', mouseMoveHandler ); - CKEDITOR.document.on( 'mouseup', mouseUpHandler ); - - if ( CKEDITOR.env.ie6Compat ) { - var coverDoc = currentCover.getChild( 0 ).getFrameDocument(); - coverDoc.on( 'mousemove', mouseMoveHandler ); - coverDoc.on( 'mouseup', mouseUpHandler ); - } - - $event.preventDefault && $event.preventDefault(); - } ); - - // Prepend the grip to the dialog. - dialog.on( 'load', function() { - var direction = ''; - if ( resizable == CKEDITOR.DIALOG_RESIZE_WIDTH ) - direction = ' cke_resizer_horizontal'; - else if ( resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT ) - direction = ' cke_resizer_vertical'; - var resizer = CKEDITOR.dom.element.createFromHtml( - '' + - // BLACK LOWER RIGHT TRIANGLE (ltr) - // BLACK LOWER LEFT TRIANGLE (rtl) - ( editor.lang.dir == 'ltr' ? '\u25E2' : '\u25E3' ) + - '
' ); - dialog.parts.footer.append( resizer, 1 ); - } ); - editor.on( 'destroy', function() { - CKEDITOR.tools.removeFunction( mouseDownFn ); - } ); - - function mouseMoveHandler( evt ) { - var rtl = editor.lang.dir == 'rtl', - dx = ( evt.data.$.screenX - origin.x ) * ( rtl ? -1 : 1 ), - dy = evt.data.$.screenY - origin.y, - width = startSize.width, - height = startSize.height, - internalWidth = width + dx * ( dialog._.moved ? 1 : 2 ), - internalHeight = height + dy * ( dialog._.moved ? 1 : 2 ), - element = dialog._.element.getFirst(), - right = rtl && element.getComputedStyle( 'right' ), - position = dialog.getPosition(); - - if ( position.y + internalHeight > viewSize.height ) - internalHeight = viewSize.height - position.y; - - if ( ( rtl ? right : position.x ) + internalWidth > viewSize.width ) - internalWidth = viewSize.width - ( rtl ? right : position.x ); - - // Make sure the dialog will not be resized to the wrong side when it's in the leftmost position for RTL. - if ( ( resizable == CKEDITOR.DIALOG_RESIZE_WIDTH || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) ) - width = Math.max( def.minWidth || 0, internalWidth - wrapperWidth ); - - if ( resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) - height = Math.max( def.minHeight || 0, internalHeight - wrapperHeight ); - - dialog.resize( width, height ); - - if ( !dialog._.moved ) - dialog.layout(); - - evt.data.preventDefault(); - } - - function mouseUpHandler() { - CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler ); - CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler ); - - if ( dialogCover ) { - dialogCover.remove(); - dialogCover = null; - } - - if ( CKEDITOR.env.ie6Compat ) { - var coverDoc = currentCover.getChild( 0 ).getFrameDocument(); - coverDoc.removeListener( 'mouseup', mouseUpHandler ); - coverDoc.removeListener( 'mousemove', mouseMoveHandler ); - } - } - } - - var resizeCover; - // Caching resuable covers and allowing only one cover - // on screen. - var covers = {}, - currentCover; - - function cancelEvent( ev ) { - ev.data.preventDefault( 1 ); - } - - function showCover( editor ) { - var win = CKEDITOR.document.getWindow(); - var config = editor.config, - backgroundColorStyle = config.dialog_backgroundCoverColor || 'white', - backgroundCoverOpacity = config.dialog_backgroundCoverOpacity, - baseFloatZIndex = config.baseFloatZIndex, - coverKey = CKEDITOR.tools.genKey( backgroundColorStyle, backgroundCoverOpacity, baseFloatZIndex ), - coverElement = covers[ coverKey ]; - - if ( !coverElement ) { - var html = [ - '
' - ]; - - if ( CKEDITOR.env.ie6Compat ) { - // Support for custom document.domain in IE. - var iframeHtml = ''; - - html.push( '' + - '' ); - } - - html.push( '
' ); - - coverElement = CKEDITOR.dom.element.createFromHtml( html.join( '' ) ); - coverElement.setOpacity( backgroundCoverOpacity != undefined ? backgroundCoverOpacity : 0.5 ); - - coverElement.on( 'keydown', cancelEvent ); - coverElement.on( 'keypress', cancelEvent ); - coverElement.on( 'keyup', cancelEvent ); - - coverElement.appendTo( CKEDITOR.document.getBody() ); - covers[ coverKey ] = coverElement; - } else - coverElement.show(); - - // Makes the dialog cover a focus holder as well. - editor.focusManager.add( coverElement ); - - currentCover = coverElement; - var resizeFunc = function() { - var size = win.getViewPaneSize(); - coverElement.setStyles( { - width: size.width + 'px', - height: size.height + 'px' - } ); - }; - - var scrollFunc = function() { - var pos = win.getScrollPosition(), - cursor = CKEDITOR.dialog._.currentTop; - coverElement.setStyles( { - left: pos.x + 'px', - top: pos.y + 'px' - } ); - - if ( cursor ) { - do { - var dialogPos = cursor.getPosition(); - cursor.move( dialogPos.x, dialogPos.y ); - } while ( ( cursor = cursor._.parentDialog ) ); - } - }; - - resizeCover = resizeFunc; - win.on( 'resize', resizeFunc ); - resizeFunc(); - // Using Safari/Mac, focus must be kept where it is (#7027) - if ( !( CKEDITOR.env.mac && CKEDITOR.env.webkit ) ) - coverElement.focus(); - - if ( CKEDITOR.env.ie6Compat ) { - // IE BUG: win.$.onscroll assignment doesn't work.. it must be window.onscroll. - // So we need to invent a really funny way to make it work. - var myScrollHandler = function() { - scrollFunc(); - arguments.callee.prevScrollHandler.apply( this, arguments ); - }; - win.$.setTimeout( function() { - myScrollHandler.prevScrollHandler = window.onscroll || - function() {}; - window.onscroll = myScrollHandler; - }, 0 ); - scrollFunc(); - } - } - - function hideCover( editor ) { - if ( !currentCover ) - return; - - editor.focusManager.remove( currentCover ); - var win = CKEDITOR.document.getWindow(); - currentCover.hide(); - win.removeListener( 'resize', resizeCover ); - - if ( CKEDITOR.env.ie6Compat ) { - win.$.setTimeout( function() { - var prevScrollHandler = window.onscroll && window.onscroll.prevScrollHandler; - window.onscroll = prevScrollHandler || null; - }, 0 ); - } - resizeCover = null; - } - - function removeCovers() { - for ( var coverId in covers ) - covers[ coverId ].remove(); - covers = {}; - } - - var accessKeyProcessors = {}; - - var accessKeyDownHandler = function( evt ) { - var ctrl = evt.data.$.ctrlKey || evt.data.$.metaKey, - alt = evt.data.$.altKey, - shift = evt.data.$.shiftKey, - key = String.fromCharCode( evt.data.$.keyCode ), - keyProcessor = accessKeyProcessors[ ( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '' ) + ( shift ? 'SHIFT+' : '' ) + key ]; - - if ( !keyProcessor || !keyProcessor.length ) - return; - - keyProcessor = keyProcessor[ keyProcessor.length - 1 ]; - keyProcessor.keydown && keyProcessor.keydown.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key ); - evt.data.preventDefault(); - }; - - var accessKeyUpHandler = function( evt ) { - var ctrl = evt.data.$.ctrlKey || evt.data.$.metaKey, - alt = evt.data.$.altKey, - shift = evt.data.$.shiftKey, - key = String.fromCharCode( evt.data.$.keyCode ), - keyProcessor = accessKeyProcessors[ ( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '' ) + ( shift ? 'SHIFT+' : '' ) + key ]; - - if ( !keyProcessor || !keyProcessor.length ) - return; - - keyProcessor = keyProcessor[ keyProcessor.length - 1 ]; - if ( keyProcessor.keyup ) { - keyProcessor.keyup.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key ); - evt.data.preventDefault(); - } - }; - - var registerAccessKey = function( uiElement, dialog, key, downFunc, upFunc ) { - var procList = accessKeyProcessors[ key ] || ( accessKeyProcessors[ key ] = [] ); - procList.push( { - uiElement: uiElement, - dialog: dialog, - key: key, - keyup: upFunc || uiElement.accessKeyUp, - keydown: downFunc || uiElement.accessKeyDown - } ); - }; - - var unregisterAccessKey = function( obj ) { - for ( var i in accessKeyProcessors ) { - var list = accessKeyProcessors[ i ]; - for ( var j = list.length - 1; j >= 0; j-- ) { - if ( list[ j ].dialog == obj || list[ j ].uiElement == obj ) - list.splice( j, 1 ); - } - if ( list.length === 0 ) - delete accessKeyProcessors[ i ]; - } - }; - - var tabAccessKeyUp = function( dialog, key ) { - if ( dialog._.accessKeyMap[ key ] ) - dialog.selectPage( dialog._.accessKeyMap[ key ] ); - }; - - var tabAccessKeyDown = function( dialog, key ) {}; - - ( function() { - CKEDITOR.ui.dialog = { - /** - * The base class of all dialog UI elements. - * - * @class CKEDITOR.ui.dialog.uiElement - * @constructor Creates a uiElement class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition Element - * definition. - * - * Accepted fields: - * - * * `id` (Required) The id of the UI element. See {@link CKEDITOR.dialog#getContentElement}. - * * `type` (Required) The type of the UI element. The - * value to this field specifies which UI element class will be used to - * generate the final widget. - * * `title` (Optional) The popup tooltip for the UI - * element. - * * `hidden` (Optional) A flag that tells if the element - * should be initially visible. - * * `className` (Optional) Additional CSS class names - * to add to the UI element. Separated by space. - * * `style` (Optional) Additional CSS inline styles - * to add to the UI element. A semicolon (;) is required after the last - * style declaration. - * * `accessKey` (Optional) The alphanumeric access key - * for this element. Access keys are automatically prefixed by CTRL. - * * `on*` (Optional) Any UI element definition field that - * starts with `on` followed immediately by a capital letter and - * probably more letters is an event handler. Event handlers may be further - * divided into registered event handlers and DOM event handlers. Please - * refer to {@link CKEDITOR.ui.dialog.uiElement#registerEvents} and - * {@link CKEDITOR.ui.dialog.uiElement#eventProcessors} for more information. - * - * @param {Array} htmlList - * List of HTML code to be added to the dialog's content area. - * @param {Function/String} [nodeNameArg='div'] - * A function returning a string, or a simple string for the node name for - * the root DOM node. - * @param {Function/Object} [stylesArg={}] - * A function returning an object, or a simple object for CSS styles applied - * to the DOM node. - * @param {Function/Object} [attributesArg={}] - * A fucntion returning an object, or a simple object for attributes applied - * to the DOM node. - * @param {Function/String} [contentsArg=''] - * A function returning a string, or a simple string for the HTML code inside - * the root DOM node. Default is empty string. - */ - uiElement: function( dialog, elementDefinition, htmlList, nodeNameArg, stylesArg, attributesArg, contentsArg ) { - if ( arguments.length < 4 ) - return; - - var nodeName = ( nodeNameArg.call ? nodeNameArg( elementDefinition ) : nodeNameArg ) || 'div', - html = [ '<', nodeName, ' ' ], - styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {}, - attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {}, - innerHTML = ( contentsArg && contentsArg.call ? contentsArg.call( this, dialog, elementDefinition ) : contentsArg ) || '', - domId = this.domId = attributes.id || CKEDITOR.tools.getNextId() + '_uiElement', - id = this.id = elementDefinition.id, - i; - - if ( elementDefinition.requiredContent && !dialog.getParentEditor().filter.check( elementDefinition.requiredContent ) ) { - styles.display = 'none'; - this.notAllowed = true; - } - - // Set the id, a unique id is required for getElement() to work. - attributes.id = domId; - - // Set the type and definition CSS class names. - var classes = {}; - if ( elementDefinition.type ) - classes[ 'cke_dialog_ui_' + elementDefinition.type ] = 1; - if ( elementDefinition.className ) - classes[ elementDefinition.className ] = 1; - if ( elementDefinition.disabled ) - classes[ 'cke_disabled' ] = 1; - - var attributeClasses = ( attributes[ 'class' ] && attributes[ 'class' ].split ) ? attributes[ 'class' ].split( ' ' ) : []; - for ( i = 0; i < attributeClasses.length; i++ ) { - if ( attributeClasses[ i ] ) - classes[ attributeClasses[ i ] ] = 1; - } - var finalClasses = []; - for ( i in classes ) - finalClasses.push( i ); - attributes[ 'class' ] = finalClasses.join( ' ' ); - - // Set the popup tooltop. - if ( elementDefinition.title ) - attributes.title = elementDefinition.title; - - // Write the inline CSS styles. - var styleStr = ( elementDefinition.style || '' ).split( ';' ); - - // Element alignment support. - if ( elementDefinition.align ) { - var align = elementDefinition.align; - styles[ 'margin-left' ] = align == 'left' ? 0 : 'auto'; - styles[ 'margin-right' ] = align == 'right' ? 0 : 'auto'; - } - - for ( i in styles ) - styleStr.push( i + ':' + styles[ i ] ); - if ( elementDefinition.hidden ) - styleStr.push( 'display:none' ); - for ( i = styleStr.length - 1; i >= 0; i-- ) { - if ( styleStr[ i ] === '' ) - styleStr.splice( i, 1 ); - } - if ( styleStr.length > 0 ) - attributes.style = ( attributes.style ? ( attributes.style + '; ' ) : '' ) + styleStr.join( '; ' ); - - // Write the attributes. - for ( i in attributes ) - html.push( i + '="' + CKEDITOR.tools.htmlEncode( attributes[ i ] ) + '" ' ); - - // Write the content HTML. - html.push( '>', innerHTML, '' ); - - // Add contents to the parent HTML array. - htmlList.push( html.join( '' ) ); - - ( this._ || ( this._ = {} ) ).dialog = dialog; - - // Override isChanged if it is defined in element definition. - if ( typeof( elementDefinition.isChanged ) == 'boolean' ) - this.isChanged = function() { - return elementDefinition.isChanged; - }; - if ( typeof( elementDefinition.isChanged ) == 'function' ) - this.isChanged = elementDefinition.isChanged; - - // Overload 'get(set)Value' on definition. - if ( typeof( elementDefinition.setValue ) == 'function' ) { - this.setValue = CKEDITOR.tools.override( this.setValue, function( org ) { - return function( val ) { - org.call( this, elementDefinition.setValue.call( this, val ) ); - }; - } ); - } - - if ( typeof( elementDefinition.getValue ) == 'function' ) { - this.getValue = CKEDITOR.tools.override( this.getValue, function( org ) { - return function() { - return elementDefinition.getValue.call( this, org.call( this ) ); - }; - } ); - } - - // Add events. - CKEDITOR.event.implementOn( this ); - - this.registerEvents( elementDefinition ); - if ( this.accessKeyUp && this.accessKeyDown && elementDefinition.accessKey ) - registerAccessKey( this, dialog, 'CTRL+' + elementDefinition.accessKey ); - - var me = this; - dialog.on( 'load', function() { - var input = me.getInputElement(); - if ( input ) { - var focusClass = me.type in { 'checkbox': 1, 'ratio': 1 } && CKEDITOR.env.ie && CKEDITOR.env.version < 8 ? 'cke_dialog_ui_focused' : ''; - input.on( 'focus', function() { - dialog._.tabBarMode = false; - dialog._.hasFocus = true; - me.fire( 'focus' ); - focusClass && this.addClass( focusClass ); - - } ); - - input.on( 'blur', function() { - me.fire( 'blur' ); - focusClass && this.removeClass( focusClass ); - } ); - } - } ); - - // Completes this object with everything we have in the - // definition. - CKEDITOR.tools.extend( this, elementDefinition ); - - // Register the object as a tab focus if it can be included. - if ( this.keyboardFocusable ) { - this.tabIndex = elementDefinition.tabIndex || 0; - - this.focusIndex = dialog._.focusList.push( this ) - 1; - this.on( 'focus', function() { - dialog._.currentFocusIndex = me.focusIndex; - } ); - } - }, - - /** - * Horizontal layout box for dialog UI elements, auto-expends to available width of container. - * - * @class CKEDITOR.ui.dialog.hbox - * @extends CKEDITOR.ui.dialog.uiElement - * @constructor Creates a hbox class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {Array} childObjList - * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container. - * @param {Array} childHtmlList - * Array of HTML code that correspond to the HTML output of all the - * objects in childObjList. - * @param {Array} htmlList - * Array of HTML code that this element will output to. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `widths` (Optional) The widths of child cells. - * * `height` (Optional) The height of the layout. - * * `padding` (Optional) The padding width inside child cells. - * * `align` (Optional) The alignment of the whole layout. - */ - hbox: function( dialog, childObjList, childHtmlList, htmlList, elementDefinition ) { - if ( arguments.length < 4 ) - return; - - this._ || ( this._ = {} ); - - var children = this._.children = childObjList, - widths = elementDefinition && elementDefinition.widths || null, - height = elementDefinition && elementDefinition.height || null, - styles = {}, - i; - /** @ignore */ - var innerHTML = function() { - var html = [ '
' ); - for ( var i = 0; i < childHtmlList.length; i++ ) { - var styles = []; - html.push( '' ); - } - html.push( '
0 ) - html.push( 'style="', styles.join( '; ' ), '" ' ); - html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[ i ], '
' ); - return html.join( '' ); - }; - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type: 'vbox' }, htmlList, 'div', null, { role: 'presentation' }, innerHTML ); - } - }; - } )(); - - /** @class CKEDITOR.ui.dialog.uiElement */ - CKEDITOR.ui.dialog.uiElement.prototype = { - /** - * Gets the root DOM element of this dialog UI object. - * - * uiElement.getElement().hide(); - * - * @returns {CKEDITOR.dom.element} Root DOM element of UI object. - */ - getElement: function() { - return CKEDITOR.document.getById( this.domId ); - }, - - /** - * Gets the DOM element that the user inputs values. - * - * This function is used by {@link #setValue}, {@link #getValue} and {@link #focus}. It should - * be overrided in child classes where the input element isn't the root - * element. - * - * var rawValue = textInput.getInputElement().$.value; - * - * @returns {CKEDITOR.dom.element} The element where the user input values. - */ - getInputElement: function() { - return this.getElement(); - }, - - /** - * Gets the parent dialog object containing this UI element. - * - * var dialog = uiElement.getDialog(); - * - * @returns {CKEDITOR.dialog} Parent dialog object. - */ - getDialog: function() { - return this._.dialog; - }, - - /** - * Sets the value of this dialog UI object. - * - * uiElement.setValue( 'Dingo' ); - * - * @chainable - * @param {Object} value The new value. - * @param {Boolean} noChangeEvent Internal commit, to supress `change` event on this element. - */ - setValue: function( value, noChangeEvent ) { - this.getInputElement().setValue( value ); - !noChangeEvent && this.fire( 'change', { value: value } ); - return this; - }, - - /** - * Gets the current value of this dialog UI object. - * - * var myValue = uiElement.getValue(); - * - * @returns {Object} The current value. - */ - getValue: function() { - return this.getInputElement().getValue(); - }, - - /** - * Tells whether the UI object's value has changed. - * - * if ( uiElement.isChanged() ) - * confirm( 'Value changed! Continue?' ); - * - * @returns {Boolean} `true` if changed, `false` if not changed. - */ - isChanged: function() { - // Override in input classes. - return false; - }, - - /** - * Selects the parent tab of this element. Usually called by focus() or overridden focus() methods. - * - * focus : function() { - * this.selectParentTab(); - * // do something else. - * } - * - * @chainable - */ - selectParentTab: function() { - var element = this.getInputElement(), - cursor = element, - tabId; - while ( ( cursor = cursor.getParent() ) && cursor.$.className.search( 'cke_dialog_page_contents' ) == -1 ) { - /*jsl:pass*/ - } - - // Some widgets don't have parent tabs (e.g. OK and Cancel buttons). - if ( !cursor ) - return this; - - tabId = cursor.getAttribute( 'name' ); - // Avoid duplicate select. - if ( this._.dialog._.currentTabId != tabId ) - this._.dialog.selectPage( tabId ); - return this; - }, - - /** - * Puts the focus to the UI object. Switches tabs if the UI object isn't in the active tab page. - * - * uiElement.focus(); - * - * @chainable - */ - focus: function() { - this.selectParentTab().getInputElement().focus(); - return this; - }, - - /** - * Registers the `on*` event handlers defined in the element definition. - * - * The default behavior of this function is: - * - * 1. If the on* event is defined in the class's eventProcesors list, - * then the registration is delegated to the corresponding function - * in the eventProcessors list. - * 2. If the on* event is not defined in the eventProcessors list, then - * register the event handler under the corresponding DOM event of - * the UI element's input DOM element (as defined by the return value - * of {@link #getInputElement}). - * - * This function is only called at UI element instantiation, but can - * be overridded in child classes if they require more flexibility. - * - * @chainable - * @param {CKEDITOR.dialog.definition.uiElement} definition The UI element - * definition. - */ - registerEvents: function( definition ) { - var regex = /^on([A-Z]\w+)/, - match; - - var registerDomEvent = function( uiElement, dialog, eventName, func ) { - dialog.on( 'load', function() { - uiElement.getInputElement().on( eventName, func, uiElement ); - } ); - }; - - for ( var i in definition ) { - if ( !( match = i.match( regex ) ) ) - continue; - if ( this.eventProcessors[ i ] ) - this.eventProcessors[ i ].call( this, this._.dialog, definition[ i ] ); - else - registerDomEvent( this, this._.dialog, match[ 1 ].toLowerCase(), definition[ i ] ); - } - - return this; - }, - - /** - * The event processor list used by - * {@link CKEDITOR.ui.dialog.uiElement#getInputElement} at UI element - * instantiation. The default list defines three `on*` events: - * - * 1. `onLoad` - Called when the element's parent dialog opens for the - * first time. - * 2. `onShow` - Called whenever the element's parent dialog opens. - * 3. `onHide` - Called whenever the element's parent dialog closes. - * - * // This connects the 'click' event in CKEDITOR.ui.dialog.button to onClick - * // handlers in the UI element's definitions. - * CKEDITOR.ui.dialog.button.eventProcessors = CKEDITOR.tools.extend( {}, - * CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors, - * { onClick : function( dialog, func ) { this.on( 'click', func ); } }, - * true - * ); - * - * @property {Object} - */ - eventProcessors: { - onLoad: function( dialog, func ) { - dialog.on( 'load', func, this ); - }, - - onShow: function( dialog, func ) { - dialog.on( 'show', func, this ); - }, - - onHide: function( dialog, func ) { - dialog.on( 'hide', func, this ); - } - }, - - /** - * The default handler for a UI element's access key down event, which - * tries to put focus to the UI element. - * - * Can be overridded in child classes for more sophisticaed behavior. - * - * @param {CKEDITOR.dialog} dialog The parent dialog object. - * @param {String} key The key combination pressed. Since access keys - * are defined to always include the `CTRL` key, its value should always - * include a `'CTRL+'` prefix. - */ - accessKeyDown: function( dialog, key ) { - this.focus(); - }, - - /** - * The default handler for a UI element's access key up event, which - * does nothing. - * - * Can be overridded in child classes for more sophisticated behavior. - * - * @param {CKEDITOR.dialog} dialog The parent dialog object. - * @param {String} key The key combination pressed. Since access keys - * are defined to always include the `CTRL` key, its value should always - * include a `'CTRL+'` prefix. - */ - accessKeyUp: function( dialog, key ) {}, - - /** - * Disables a UI element. - */ - disable: function() { - var element = this.getElement(), - input = this.getInputElement(); - input.setAttribute( 'disabled', 'true' ); - element.addClass( 'cke_disabled' ); - }, - - /** - * Enables a UI element. - */ - enable: function() { - var element = this.getElement(), - input = this.getInputElement(); - input.removeAttribute( 'disabled' ); - element.removeClass( 'cke_disabled' ); - }, - - /** - * Determines whether an UI element is enabled or not. - * - * @returns {Boolean} Whether the UI element is enabled. - */ - isEnabled: function() { - return !this.getElement().hasClass( 'cke_disabled' ); - }, - - /** - * Determines whether an UI element is visible or not. - * - * @returns {Boolean} Whether the UI element is visible. - */ - isVisible: function() { - return this.getInputElement().isVisible(); - }, - - /** - * Determines whether an UI element is focus-able or not. - * Focus-able is defined as being both visible and enabled. - * - * @returns {Boolean} Whether the UI element can be focused. - */ - isFocusable: function() { - if ( !this.isEnabled() || !this.isVisible() ) - return false; - return true; - } - }; - - /** @class CKEDITOR.ui.dialog.hbox */ - CKEDITOR.ui.dialog.hbox.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement, { - /** - * Gets a child UI element inside this container. - * - * var checkbox = hbox.getChild( [0,1] ); - * checkbox.setValue( true ); - * - * @param {Array/Number} indices An array or a single number to indicate the child's - * position in the container's descendant tree. Omit to get all the children in an array. - * @returns {Array/CKEDITOR.ui.dialog.uiElement} Array of all UI elements in the container - * if no argument given, or the specified UI element if indices is given. - */ - getChild: function( indices ) { - // If no arguments, return a clone of the children array. - if ( arguments.length < 1 ) - return this._.children.concat(); - - // If indices isn't array, make it one. - if ( !indices.splice ) - indices = [ indices ]; - - // Retrieve the child element according to tree position. - if ( indices.length < 2 ) - return this._.children[ indices[ 0 ] ]; - else - return ( this._.children[ indices[ 0 ] ] && this._.children[ indices[ 0 ] ].getChild ) ? this._.children[ indices[ 0 ] ].getChild( indices.slice( 1, indices.length ) ) : null; - } - }, true ); - - CKEDITOR.ui.dialog.vbox.prototype = new CKEDITOR.ui.dialog.hbox(); - - ( function() { - var commonBuilder = { - build: function( dialog, elementDefinition, output ) { - var children = elementDefinition.children, - child, - childHtmlList = [], - childObjList = []; - for ( var i = 0; - ( i < children.length && ( child = children[ i ] ) ); i++ ) { - var childHtml = []; - childHtmlList.push( childHtml ); - childObjList.push( CKEDITOR.dialog._.uiElementBuilders[ child.type ].build( dialog, child, childHtml ) ); - } - return new CKEDITOR.ui.dialog[ elementDefinition.type ]( dialog, childObjList, childHtmlList, output, elementDefinition ); - } - }; - - CKEDITOR.dialog.addUIElement( 'hbox', commonBuilder ); - CKEDITOR.dialog.addUIElement( 'vbox', commonBuilder ); - } )(); - - /** - * Generic dialog command. It opens a specific dialog when executed. - * - * // Register the "link" command, which opens the "link" dialog. - * editor.addCommand( 'link', new CKEDITOR.dialogCommand( 'link' ) ); - * - * @class - * @constructor Creates a dialogCommand class instance. - * @extends CKEDITOR.commandDefinition - * @param {String} dialogName The name of the dialog to open when executing - * this command. - * @param {Object} [ext] Additional command definition's properties. - */ - CKEDITOR.dialogCommand = function( dialogName, ext ) { - this.dialogName = dialogName; - CKEDITOR.tools.extend( this, ext, true ); - }; - - CKEDITOR.dialogCommand.prototype = { - exec: function( editor ) { - // Special treatment for Opera. (#8031) - CKEDITOR.env.opera ? CKEDITOR.tools.setTimeout( function() { - editor.openDialog( this.dialogName ); - }, 0, this ) : editor.openDialog( this.dialogName ); - }, - - // Dialog commands just open a dialog ui, thus require no undo logic, - // undo support should dedicate to specific dialog implementation. - canUndo: false, - - editorFocus: 1 - }; - - ( function() { - var notEmptyRegex = /^([a]|[^a])+$/, - integerRegex = /^\d*$/, - numberRegex = /^\d*(?:\.\d+)?$/, - htmlLengthRegex = /^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/, - cssLengthRegex = /^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i, - inlineStyleRegex = /^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/; - - CKEDITOR.VALIDATE_OR = 1; - CKEDITOR.VALIDATE_AND = 2; - - CKEDITOR.dialog.validate = { - functions: function() { - var args = arguments; - return function() { - /** - * It's important for validate functions to be able to accept the value - * as argument in addition to this.getValue(), so that it is possible to - * combine validate functions together to make more sophisticated - * validators. - */ - var value = this && this.getValue ? this.getValue() : args[ 0 ]; - - var msg = undefined, - relation = CKEDITOR.VALIDATE_AND, - functions = [], - i; - - for ( i = 0; i < args.length; i++ ) { - if ( typeof( args[ i ] ) == 'function' ) - functions.push( args[ i ] ); - else - break; - } - - if ( i < args.length && typeof( args[ i ] ) == 'string' ) { - msg = args[ i ]; - i++; - } - - if ( i < args.length && typeof( args[ i ] ) == 'number' ) - relation = args[ i ]; - - var passed = ( relation == CKEDITOR.VALIDATE_AND ? true : false ); - for ( i = 0; i < functions.length; i++ ) { - if ( relation == CKEDITOR.VALIDATE_AND ) - passed = passed && functions[ i ]( value ); - else - passed = passed || functions[ i ]( value ); - } - - return !passed ? msg : true; - }; - }, - - regex: function( regex, msg ) { - /* - * Can be greatly shortened by deriving from functions validator if code size - * turns out to be more important than performance. - */ - return function() { - var value = this && this.getValue ? this.getValue() : arguments[ 0 ]; - return !regex.test( value ) ? msg : true; - }; - }, - - notEmpty: function( msg ) { - return this.regex( notEmptyRegex, msg ); - }, - - integer: function( msg ) { - return this.regex( integerRegex, msg ); - }, - - 'number': function( msg ) { - return this.regex( numberRegex, msg ); - }, - - 'cssLength': function( msg ) { - return this.functions( function( val ) { - return cssLengthRegex.test( CKEDITOR.tools.trim( val ) ); - }, msg ); - }, - - 'htmlLength': function( msg ) { - return this.functions( function( val ) { - return htmlLengthRegex.test( CKEDITOR.tools.trim( val ) ); - }, msg ); - }, - - 'inlineStyle': function( msg ) { - return this.functions( function( val ) { - return inlineStyleRegex.test( CKEDITOR.tools.trim( val ) ); - }, msg ); - }, - - equals: function( value, msg ) { - return this.functions( function( val ) { - return val == value; - }, msg ); - }, - - notEqual: function( value, msg ) { - return this.functions( function( val ) { - return val != value; - }, msg ); - } - }; - - CKEDITOR.on( 'instanceDestroyed', function( evt ) { - // Remove dialog cover on last instance destroy. - if ( CKEDITOR.tools.isEmpty( CKEDITOR.instances ) ) { - var currentTopDialog; - while ( ( currentTopDialog = CKEDITOR.dialog._.currentTop ) ) - currentTopDialog.hide(); - removeCovers(); - } - - var dialogs = evt.editor._.storedDialogs; - for ( var name in dialogs ) - dialogs[ name ].destroy(); - - } ); - - } )(); - - // Extend the CKEDITOR.editor class with dialog specific functions. - CKEDITOR.tools.extend( CKEDITOR.editor.prototype, { - /** - * Loads and opens a registered dialog. - * - * CKEDITOR.instances.editor1.openDialog( 'smiley' ); - * - * @member CKEDITOR.editor - * @param {String} dialogName The registered name of the dialog. - * @param {Function} callback The function to be invoked after dialog instance created. - * @returns {CKEDITOR.dialog} The dialog object corresponding to the dialog displayed. - * `null` if the dialog name is not registered. - * @see CKEDITOR.dialog#add - */ - openDialog: function( dialogName, callback ) { - var dialog = null, dialogDefinitions = CKEDITOR.dialog._.dialogDefinitions[ dialogName ]; - - if ( CKEDITOR.dialog._.currentTop === null ) - showCover( this ); - - // If the dialogDefinition is already loaded, open it immediately. - if ( typeof dialogDefinitions == 'function' ) { - var storedDialogs = this._.storedDialogs || ( this._.storedDialogs = {} ); - - dialog = storedDialogs[ dialogName ] || ( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) ); - - callback && callback.call( dialog, dialog ); - dialog.show(); - - } else if ( dialogDefinitions == 'failed' ) { - hideCover( this ); - throw new Error( '[CKEDITOR.dialog.openDialog] Dialog "' + dialogName + '" failed when loading definition.' ); - } else if ( typeof dialogDefinitions == 'string' ) { - - CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( dialogDefinitions ), - function() { - var dialogDefinition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ]; - // In case of plugin error, mark it as loading failed. - if ( typeof dialogDefinition != 'function' ) - CKEDITOR.dialog._.dialogDefinitions[ dialogName ] = 'failed'; - - this.openDialog( dialogName, callback ); - }, this, 0, 1 ); - } - - CKEDITOR.skin.loadPart( 'dialog' ); - - return dialog; - } - } ); -} )(); - -CKEDITOR.plugins.add( 'dialog', { - requires: 'dialogui', - init: function( editor ) { - editor.on( 'doubleclick', function( evt ) { - if ( evt.data.dialog ) - editor.openDialog( evt.data.dialog ); - }, null, null, 999 ); - } -} ); - -// Dialog related configurations. - -/** - * The color of the dialog background cover. It should be a valid CSS color string. - * - * config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)'; - * - * @cfg {String} [dialog_backgroundCoverColor='white'] - * @member CKEDITOR.config - */ - -/** - * The opacity of the dialog background cover. It should be a number within the - * range `[0.0, 1.0]`. - * - * config.dialog_backgroundCoverOpacity = 0.7; - * - * @cfg {Number} [dialog_backgroundCoverOpacity=0.5] - * @member CKEDITOR.config - */ - -/** - * If the dialog has more than one tab, put focus into the first tab as soon as dialog is opened. - * - * config.dialog_startupFocusTab = true; - * - * @cfg {Boolean} [dialog_startupFocusTab=false] - * @member CKEDITOR.config - */ - -/** - * The distance of magnetic borders used in moving and resizing dialogs, - * measured in pixels. - * - * config.dialog_magnetDistance = 30; - * - * @cfg {Number} [dialog_magnetDistance=20] - * @member CKEDITOR.config - */ - -/** - * The guideline to follow when generating the dialog buttons. There are 3 possible options: - * - * * `'OS'` - the buttons will be displayed in the default order of the user's OS; - * * `'ltr'` - for Left-To-Right order; - * * `'rtl'` - for Right-To-Left order. - * - * Example: - * - * config.dialog_buttonsOrder = 'rtl'; - * - * @since 3.5 - * @cfg {String} [dialog_buttonsOrder='OS'] - * @member CKEDITOR.config - */ - -/** - * The dialog contents to removed. It's a string composed by dialog name and tab name with a colon between them. - * - * Separate each pair with semicolon (see example). - * - * **Note:** All names are case-sensitive. - * - * **Note:** Be cautious when specifying dialog tabs that are mandatory, - * like `'info'`, dialog functionality might be broken because of this! - * - * config.removeDialogTabs = 'flash:advanced;image:Link'; - * - * @since 3.5 - * @cfg {String} [removeDialogTabs=''] - * @member CKEDITOR.config - */ - -/** - * Tells if user should not be asked to confirm close, if any dialog field was modified. - * By default it is set to `false` meaning that the confirmation dialog will be shown. - * - * config.dialog_noConfirmCancel = true; - * - * @since 4.3 - * @cfg {Boolean} [dialog_noConfirmCancel=false] - * @member CKEDITOR.config - */ - -/** - * Fired when a dialog definition is about to be used to create a dialog into - * an editor instance. This event makes it possible to customize the definition - * before creating it. - * - * Note that this event is called only the first time a specific dialog is - * opened. Successive openings will use the cached dialog, and this event will - * not get fired. - * - * @event dialogDefinition - * @member CKEDITOR - * @param {CKEDITOR.dialog.definition} data The dialog defination that - * is being loaded. - * @param {CKEDITOR.editor} editor The editor instance that will use the dialog. - */ - -/** - * Fired when a tab is going to be selected in a dialog. - * - * @event selectPage - * @member CKEDITOR.dialog - * @param data - * @param {String} data.page The id of the page that it's gonna be selected. - * @param {String} data.currentPage The id of the current page. - */ - -/** - * Fired when the user tries to dismiss a dialog. - * - * @event cancel - * @member CKEDITOR.dialog - * @param data - * @param {Boolean} data.hide Whether the event should proceed or not. - */ - -/** - * Fired when the user tries to confirm a dialog. - * - * @event ok - * @member CKEDITOR.dialog - * @param data - * @param {Boolean} data.hide Whether the event should proceed or not. - */ - -/** - * Fired when a dialog is shown. - * - * @event show - * @member CKEDITOR.dialog - */ - -/** - * Fired when a dialog is shown. - * - * @event dialogShow - * @member CKEDITOR.editor - * @param {CKEDITOR.editor} editor This editor instance. - * @param {CKEDITOR.dialog} data The opened dialog instance. - */ - -/** - * Fired when a dialog is hidden. - * - * @event hide - * @member CKEDITOR.dialog - */ - -/** - * Fired when a dialog is hidden. - * - * @event dialogHide - * @member CKEDITOR.editor - * @param {CKEDITOR.editor} editor This editor instance. - * @param {CKEDITOR.dialog} data The hidden dialog instance. - */ - -/** - * Fired when a dialog is being resized. The event is fired on - * both the {@link CKEDITOR.dialog} object and the dialog instance - * since 3.5.3, previously it's available only in the global object. - * - * @static - * @event resize - * @member CKEDITOR.dialog - * @param data - * @param {CKEDITOR.dialog} data.dialog The dialog being resized (if - * it's fired on the dialog itself, this parameter isn't sent). - * @param {String} data.skin The skin name. - * @param {Number} data.width The new width. - * @param {Number} data.height The new height. - */ - -/** - * Fired when a dialog is being resized. The event is fired on - * both the {@link CKEDITOR.dialog} object and the dialog instance - * since 3.5.3, previously it's available only in the global object. - * - * @since 3.5 - * @event resize - * @member CKEDITOR.dialog - * @param data - * @param {Number} data.width The new width. - * @param {Number} data.height The new height. - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialogadvtab/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialogadvtab/plugin.js deleted file mode 100644 index 506e788ecc9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialogadvtab/plugin.js +++ /dev/null @@ -1,200 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -( function() { - - function setupAdvParams( element ) { - var attrName = this.att; - - var value = element && element.hasAttribute( attrName ) && element.getAttribute( attrName ) || ''; - - if ( value !== undefined ) - this.setValue( value ); - } - - function commitAdvParams() { - // Dialogs may use different parameters in the commit list, so, by - // definition, we take the first CKEDITOR.dom.element available. - var element; - - for ( var i = 0; i < arguments.length; i++ ) { - if ( arguments[ i ] instanceof CKEDITOR.dom.element ) { - element = arguments[ i ]; - break; - } - } - - if ( element ) { - var attrName = this.att, - value = this.getValue(); - - if ( value ) - element.setAttribute( attrName, value ); - else - element.removeAttribute( attrName, value ); - } - } - - var defaultTabConfig = { id: 1, dir: 1, classes: 1, styles: 1 }; - - CKEDITOR.plugins.add( 'dialogadvtab', { - requires : 'dialog', - - // Returns allowed content rule for the content created by this plugin. - allowedContent: function( tabConfig ) { - if ( !tabConfig ) - tabConfig = defaultTabConfig; - - var allowedAttrs = []; - if ( tabConfig.id ) - allowedAttrs.push( 'id' ); - if ( tabConfig.dir ) - allowedAttrs.push( 'dir' ); - - var allowed = ''; - - if ( allowedAttrs.length ) - allowed += '[' + allowedAttrs.join( ',' ) + ']'; - - if ( tabConfig.classes ) - allowed += '(*)'; - if ( tabConfig.styles ) - allowed += '{*}'; - - return allowed; - }, - - // @param tabConfig - // id, dir, classes, styles - createAdvancedTab: function( editor, tabConfig, element ) { - if ( !tabConfig ) - tabConfig = defaultTabConfig; - - var lang = editor.lang.common; - - var result = { - id: 'advanced', - label: lang.advancedTab, - title: lang.advancedTab, - elements: [ - { - type: 'vbox', - padding: 1, - children: [] - } - ] - }; - - var contents = []; - - if ( tabConfig.id || tabConfig.dir ) { - if ( tabConfig.id ) { - contents.push( { - id: 'advId', - att: 'id', - type: 'text', - requiredContent: element ? element + '[id]' : null, - label: lang.id, - setup: setupAdvParams, - commit: commitAdvParams - } ); - } - - if ( tabConfig.dir ) { - contents.push( { - id: 'advLangDir', - att: 'dir', - type: 'select', - requiredContent: element ? element + '[dir]' : null, - label: lang.langDir, - 'default': '', - style: 'width:100%', - items: [ - [ lang.notSet, '' ], - [ lang.langDirLTR, 'ltr' ], - [ lang.langDirRTL, 'rtl' ] - ], - setup: setupAdvParams, - commit: commitAdvParams - } ); - } - - result.elements[ 0 ].children.push( { - type: 'hbox', - widths: [ '50%', '50%' ], - children: [].concat( contents ) - } ); - } - - if ( tabConfig.styles || tabConfig.classes ) { - contents = []; - - if ( tabConfig.styles ) { - contents.push( { - id: 'advStyles', - att: 'style', - type: 'text', - requiredContent: element ? element + '{cke-xyz}' : null, - label: lang.styles, - 'default': '', - - validate: CKEDITOR.dialog.validate.inlineStyle( lang.invalidInlineStyle ), - onChange: function() {}, - - getStyle: function( name, defaultValue ) { - var match = this.getValue().match( new RegExp( '(?:^|;)\\s*' + name + '\\s*:\\s*([^;]*)', 'i' ) ); - return match ? match[ 1 ] : defaultValue; - }, - - updateStyle: function( name, value ) { - var styles = this.getValue(); - - var tmp = editor.document.createElement( 'span' ); - tmp.setAttribute( 'style', styles ); - tmp.setStyle( name, value ); - styles = CKEDITOR.tools.normalizeCssText( tmp.getAttribute( 'style' ) ); - - this.setValue( styles, 1 ); - }, - - setup: setupAdvParams, - - commit: commitAdvParams - - } ); - } - - if ( tabConfig.classes ) { - contents.push( { - type: 'hbox', - widths: [ '45%', '55%' ], - children: [ - { - id: 'advCSSClasses', - att: 'class', - type: 'text', - requiredContent: element ? element + '(cke-xyz)' : null, - label: lang.cssClasses, - 'default': '', - setup: setupAdvParams, - commit: commitAdvParams - - } - ] - } ); - } - - result.elements[ 0 ].children.push( { - type: 'hbox', - widths: [ '50%', '50%' ], - children: [].concat( contents ) - } ); - } - - return result; - } - } ); - -} )(); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialogui/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialogui/plugin.js deleted file mode 100644 index 4b3721c2748..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/dialogui/plugin.js +++ /dev/null @@ -1,1409 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview The "dialogui" plugin. - */ - -CKEDITOR.plugins.add( 'dialogui', { - onLoad: function() { - - var initPrivateObject = function( elementDefinition ) { - this._ || ( this._ = {} ); - this._[ 'default' ] = this._.initValue = elementDefinition[ 'default' ] || ''; - this._.required = elementDefinition[ 'required' ] || false; - var args = [ this._ ]; - for ( var i = 1; i < arguments.length; i++ ) - args.push( arguments[ i ] ); - args.push( true ); - CKEDITOR.tools.extend.apply( CKEDITOR.tools, args ); - return this._; - }, - textBuilder = { - build: function( dialog, elementDefinition, output ) { - return new CKEDITOR.ui.dialog.textInput( dialog, elementDefinition, output ); - } - }, - commonBuilder = { - build: function( dialog, elementDefinition, output ) { - return new CKEDITOR.ui.dialog[ elementDefinition.type ]( dialog, elementDefinition, output ); - } - }, - containerBuilder = { - build: function( dialog, elementDefinition, output ) { - var children = elementDefinition.children, - child, - childHtmlList = [], - childObjList = []; - for ( var i = 0; - ( i < children.length && ( child = children[ i ] ) ); i++ ) { - var childHtml = []; - childHtmlList.push( childHtml ); - childObjList.push( CKEDITOR.dialog._.uiElementBuilders[ child.type ].build( dialog, child, childHtml ) ); - } - return new CKEDITOR.ui.dialog[ elementDefinition.type ]( dialog, childObjList, childHtmlList, output, elementDefinition ); - } - }, - commonPrototype = { - isChanged: function() { - return this.getValue() != this.getInitValue(); - }, - - reset: function( noChangeEvent ) { - this.setValue( this.getInitValue(), noChangeEvent ); - }, - - setInitValue: function() { - this._.initValue = this.getValue(); - }, - - resetInitValue: function() { - this._.initValue = this._[ 'default' ]; - }, - - getInitValue: function() { - return this._.initValue; - } - }, - commonEventProcessors = CKEDITOR.tools.extend( {}, CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors, { - onChange: function( dialog, func ) { - if ( !this._.domOnChangeRegistered ) { - dialog.on( 'load', function() { - this.getInputElement().on( 'change', function() { - // Make sure 'onchange' doesn't get fired after dialog closed. (#5719) - if ( !dialog.parts.dialog.isVisible() ) - return; - - this.fire( 'change', { value: this.getValue() } ); - }, this ); - }, this ); - this._.domOnChangeRegistered = true; - } - - this.on( 'change', func ); - } - }, true ), - eventRegex = /^on([A-Z]\w+)/, - cleanInnerDefinition = function( def ) { - // An inner UI element should not have the parent's type, title or events. - for ( var i in def ) { - if ( eventRegex.test( i ) || i == 'title' || i == 'type' ) - delete def[ i ]; - } - return def; - }; - - CKEDITOR.tools.extend( CKEDITOR.ui.dialog, { - /** - * Base class for all dialog elements with a textual label on the left. - * - * @class CKEDITOR.ui.dialog.labeledElement - * @extends CKEDITOR.ui.dialog.uiElement - * @constructor Creates a labeledElement class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `label` (Required) The label string. - * * `labelLayout` (Optional) Put 'horizontal' here if the - * label element is to be layed out horizontally. Otherwise a vertical - * layout will be used. - * * `widths` (Optional) This applies only for horizontal - * layouts - an 2-element array of lengths to specify the widths of the - * label and the content element. - * - * @param {Array} htmlList List of HTML code to output to. - * @param {Function} contentHtml - * A function returning the HTML code string to be added inside the content - * cell. - */ - labeledElement: function( dialog, elementDefinition, htmlList, contentHtml ) { - if ( arguments.length < 4 ) - return; - - var _ = initPrivateObject.call( this, elementDefinition ); - _.labelId = CKEDITOR.tools.getNextId() + '_label'; - var children = this._.children = []; - - var innerHTML = function() { - var html = [], - requiredClass = elementDefinition.required ? ' cke_required' : ''; - if ( elementDefinition.labelLayout != 'horizontal' ) { - html.push( - '', - '
', - contentHtml.call( this, dialog, elementDefinition ), - '
' ); - } else { - var hboxDefinition = { - type: 'hbox', - widths: elementDefinition.widths, - padding: 0, - children: [ - { - type: 'html', - html: '		 or inline - // container's width, so need to wrap it inside a
. - var html = [ '' ); - return html.join( '' ); - }; - CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML ); - }, - - /** - * A text area with a label on the top or left. - * - * @class CKEDITOR.ui.dialog.textarea - * @extends CKEDITOR.ui.dialog.labeledElement - * @constructor Creates a textarea class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * - * The element definition. Accepted fields: - * - * * `rows` (Optional) The number of rows displayed. - * Defaults to 5 if not defined. - * * `cols` (Optional) The number of cols displayed. - * Defaults to 20 if not defined. Usually overridden by skins. - * * `default` (Optional) The default value. - * * `validate` (Optional) The validation function. - * - * @param {Array} htmlList List of HTML code to output to. - */ - textarea: function( dialog, elementDefinition, htmlList ) { - if ( arguments.length < 3 ) - return; - - initPrivateObject.call( this, elementDefinition ); - var me = this, - domId = this._.inputId = CKEDITOR.tools.getNextId() + '_textarea', - attributes = {}; - - if ( elementDefinition.validate ) - this.validate = elementDefinition.validate; - - // Generates the essential attributes for the textarea tag. - attributes.rows = elementDefinition.rows || 5; - attributes.cols = elementDefinition.cols || 20; - - attributes[ 'class' ] = 'cke_dialog_ui_input_textarea ' + ( elementDefinition[ 'class' ] || '' ); - - if ( typeof elementDefinition.inputStyle != 'undefined' ) - attributes.style = elementDefinition.inputStyle; - - if ( elementDefinition.dir ) - attributes.dir = elementDefinition.dir; - - var innerHTML = function() { - attributes[ 'aria-labelledby' ] = this._.labelId; - this._.required && ( attributes[ 'aria-required' ] = this._.required ); - var html = [ '' ); - return html.join( '' ); - }; - CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML ); - }, - - /** - * A single checkbox with a label on the right. - * - * @class CKEDITOR.ui.dialog.checkbox - * @extends CKEDITOR.ui.dialog.uiElement - * @constructor Creates a checkbox class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `checked` (Optional) Whether the checkbox is checked - * on instantiation. Defaults to false. - * * `validate` (Optional) The validation function. - * * `label` (Optional) The checkbox label. - * - * @param {Array} htmlList List of HTML code to output to. - */ - checkbox: function( dialog, elementDefinition, htmlList ) { - if ( arguments.length < 3 ) - return; - - var _ = initPrivateObject.call( this, elementDefinition, { 'default': !!elementDefinition[ 'default' ] } ); - - if ( elementDefinition.validate ) - this.validate = elementDefinition.validate; - - var innerHTML = function() { - var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition, { - id: elementDefinition.id ? elementDefinition.id + '_checkbox' : CKEDITOR.tools.getNextId() + '_checkbox' - }, true ), - html = []; - - var labelId = CKEDITOR.tools.getNextId() + '_label'; - var attributes = { 'class': 'cke_dialog_ui_checkbox_input', type: 'checkbox', 'aria-labelledby': labelId }; - cleanInnerDefinition( myDefinition ); - if ( elementDefinition[ 'default' ] ) - attributes.checked = 'checked'; - - if ( typeof myDefinition.inputStyle != 'undefined' ) - myDefinition.style = myDefinition.inputStyle; - - _.checkbox = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'input', null, attributes ); - html.push( ' ' ); - return html.join( '' ); - }; - - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'span', null, null, innerHTML ); - }, - - /** - * A group of radio buttons. - * - * @class CKEDITOR.ui.dialog.radio - * @extends CKEDITOR.ui.dialog.labeledElement - * @constructor Creates a radio class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `default` (Required) The default value. - * * `validate` (Optional) The validation function. - * * `items` (Required) An array of options. Each option - * is a 1- or 2-item array of format `[ 'Description', 'Value' ]`. If `'Value'` - * is missing, then the value would be assumed to be the same as the description. - * - * @param {Array} htmlList List of HTML code to output to. - */ - radio: function( dialog, elementDefinition, htmlList ) { - if ( arguments.length < 3 ) - return; - - initPrivateObject.call( this, elementDefinition ); - - if ( !this._[ 'default' ] ) - this._[ 'default' ] = this._.initValue = elementDefinition.items[ 0 ][ 1 ]; - - if ( elementDefinition.validate ) - this.validate = elementDefinition.valdiate; - - var children = [], - me = this; - - var innerHTML = function() { - var inputHtmlList = [], - html = [], - commonName = ( elementDefinition.id ? elementDefinition.id : CKEDITOR.tools.getNextId() ) + '_radio'; - - for ( var i = 0; i < elementDefinition.items.length; i++ ) { - var item = elementDefinition.items[ i ], - title = item[ 2 ] !== undefined ? item[ 2 ] : item[ 0 ], - value = item[ 1 ] !== undefined ? item[ 1 ] : item[ 0 ], - inputId = CKEDITOR.tools.getNextId() + '_radio_input', - labelId = inputId + '_label', - - inputDefinition = CKEDITOR.tools.extend( {}, elementDefinition, { - id: inputId, - title: null, - type: null - }, true ), - - labelDefinition = CKEDITOR.tools.extend( {}, inputDefinition, { - title: title - }, true ), - - inputAttributes = { - type: 'radio', - 'class': 'cke_dialog_ui_radio_input', - name: commonName, - value: value, - 'aria-labelledby': labelId - }, - - inputHtml = []; - - if ( me._[ 'default' ] == value ) - inputAttributes.checked = 'checked'; - - cleanInnerDefinition( inputDefinition ); - cleanInnerDefinition( labelDefinition ); - - if ( typeof inputDefinition.inputStyle != 'undefined' ) - inputDefinition.style = inputDefinition.inputStyle; - - // Make inputs of radio type focusable (#10866). - inputDefinition.keyboardFocusable = true; - - children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) ); - - inputHtml.push( ' ' ); - - new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtml, 'label', null, { - id: labelId, - 'for': inputAttributes.id - }, item[ 0 ] ); - - inputHtmlList.push( inputHtml.join( '' ) ); - } - - new CKEDITOR.ui.dialog.hbox( dialog, children, inputHtmlList, html ); - - return html.join( '' ); - }; - - CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML ); - this._.children = children; - }, - - /** - * A button with a label inside. - * - * @class CKEDITOR.ui.dialog.button - * @extends CKEDITOR.ui.dialog.uiElement - * @constructor Creates a button class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `label` (Required) The button label. - * * `disabled` (Optional) Set to true if you want the - * button to appear in disabled state. - * - * @param {Array} htmlList List of HTML code to output to. - */ - button: function( dialog, elementDefinition, htmlList ) { - if ( !arguments.length ) - return; - - if ( typeof elementDefinition == 'function' ) - elementDefinition = elementDefinition( dialog.getParentEditor() ); - - initPrivateObject.call( this, elementDefinition, { disabled: elementDefinition.disabled || false } ); - - // Add OnClick event to this input. - CKEDITOR.event.implementOn( this ); - - var me = this; - - // Register an event handler for processing button clicks. - dialog.on( 'load', function( eventInfo ) { - var element = this.getElement(); - - ( function() { - element.on( 'click', function( evt ) { - me.click(); - // #9958 - evt.data.preventDefault(); - } ); - - element.on( 'keydown', function( evt ) { - if ( evt.data.getKeystroke() in { 32: 1 } ) { - me.click(); - evt.data.preventDefault(); - } - } ); - } )(); - - element.unselectable(); - }, this ); - - var outerDefinition = CKEDITOR.tools.extend( {}, elementDefinition ); - delete outerDefinition.style; - - var labelId = CKEDITOR.tools.getNextId() + '_label'; - CKEDITOR.ui.dialog.uiElement.call( this, dialog, outerDefinition, htmlList, 'a', null, { - style: elementDefinition.style, - href: 'javascript:void(0)', - title: elementDefinition.label, - hidefocus: 'true', - 'class': elementDefinition[ 'class' ], - role: 'button', - 'aria-labelledby': labelId - }, '' + - CKEDITOR.tools.htmlEncode( elementDefinition.label ) + - '' ); - }, - - /** - * A select box. - * - * @class CKEDITOR.ui.dialog.select - * @extends CKEDITOR.ui.dialog.uiElement - * @constructor Creates a button class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `default` (Required) The default value. - * * `validate` (Optional) The validation function. - * * `items` (Required) An array of options. Each option - * is a 1- or 2-item array of format `[ 'Description', 'Value' ]`. If `'Value'` - * is missing, then the value would be assumed to be the same as the - * description. - * * `multiple` (Optional) Set this to true if you'd like - * to have a multiple-choice select box. - * * `size` (Optional) The number of items to display in - * the select box. - * - * @param {Array} htmlList List of HTML code to output to. - */ - select: function( dialog, elementDefinition, htmlList ) { - if ( arguments.length < 3 ) - return; - - var _ = initPrivateObject.call( this, elementDefinition ); - - if ( elementDefinition.validate ) - this.validate = elementDefinition.validate; - - _.inputId = CKEDITOR.tools.getNextId() + '_select'; - - var innerHTML = function() { - var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition, { - id: elementDefinition.id ? elementDefinition.id + '_select' : CKEDITOR.tools.getNextId() + '_select' - }, true ), - html = [], - innerHTML = [], - attributes = { 'id': _.inputId, 'class': 'cke_dialog_ui_input_select', 'aria-labelledby': this._.labelId }; - - html.push( '' ); - - return html.join( '' ); - }; - - CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML ); - }, - - /** - * A file upload input. - * - * @class CKEDITOR.ui.dialog.file - * @extends CKEDITOR.ui.dialog.labeledElement - * @constructor Creates a file class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `validate` (Optional) The validation function. - * - * @param {Array} htmlList List of HTML code to output to. - */ - file: function( dialog, elementDefinition, htmlList ) { - if ( arguments.length < 3 ) - return; - - if ( elementDefinition[ 'default' ] === undefined ) - elementDefinition[ 'default' ] = ''; - - var _ = CKEDITOR.tools.extend( initPrivateObject.call( this, elementDefinition ), { definition: elementDefinition, buttons: [] } ); - - if ( elementDefinition.validate ) - this.validate = elementDefinition.validate; - - /** @ignore */ - var innerHTML = function() { - _.frameId = CKEDITOR.tools.getNextId() + '_fileInput'; - - var html = [ - '' + - '' ); - - return html.join( '' ); - }; - - // IE BUG: Parent container does not resize to contain the iframe automatically. - dialog.on( 'load', function() { - var iframe = CKEDITOR.document.getById( _.frameId ), - contentDiv = iframe.getParent(); - contentDiv.addClass( 'cke_dialog_ui_input_file' ); - } ); - - CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML ); - }, - - /** - * A button for submitting the file in a file upload input. - * - * @class CKEDITOR.ui.dialog.fileButton - * @extends CKEDITOR.ui.dialog.button - * @constructor Creates a fileButton class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `for` (Required) The file input's page and element Id - * to associate to, in a 2-item array format: `[ 'page_id', 'element_id' ]`. - * * `validate` (Optional) The validation function. - * - * @param {Array} htmlList List of HTML code to output to. - */ - fileButton: function( dialog, elementDefinition, htmlList ) { - if ( arguments.length < 3 ) - return; - - var _ = initPrivateObject.call( this, elementDefinition ), - me = this; - - if ( elementDefinition.validate ) - this.validate = elementDefinition.validate; - - var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition ); - var onClick = myDefinition.onClick; - myDefinition.className = ( myDefinition.className ? myDefinition.className + ' ' : '' ) + 'cke_dialog_ui_button'; - myDefinition.onClick = function( evt ) { - var target = elementDefinition[ 'for' ]; // [ pageId, elementId ] - if ( !onClick || onClick.call( this, evt ) !== false ) { - dialog.getContentElement( target[ 0 ], target[ 1 ] ).submit(); - this.disable(); - } - }; - - dialog.on( 'load', function() { - dialog.getContentElement( elementDefinition[ 'for' ][ 0 ], elementDefinition[ 'for' ][ 1 ] )._.buttons.push( me ); - } ); - - CKEDITOR.ui.dialog.button.call( this, dialog, myDefinition, htmlList ); - }, - - html: ( function() { - var myHtmlRe = /^\s*<[\w:]+\s+([^>]*)?>/, - theirHtmlRe = /^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/, - emptyTagRe = /\/$/; - /** - * A dialog element made from raw HTML code. - * - * @class CKEDITOR.ui.dialog.html - * @extends CKEDITOR.ui.dialog.uiElement - * @constructor Creates a html class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition Element definition. - * Accepted fields: - * - * * `html` (Required) HTML code of this element. - * - * @param {Array} htmlList List of HTML code to be added to the dialog's content area. - */ - return function( dialog, elementDefinition, htmlList ) { - if ( arguments.length < 3 ) - return; - - var myHtmlList = [], - myHtml, - theirHtml = elementDefinition.html, - myMatch, theirMatch; - - // If the HTML input doesn't contain any tags at the beginning, add a tag around it. - if ( theirHtml.charAt( 0 ) != '<' ) - theirHtml = '' + theirHtml + ''; - - // Look for focus function in definition. - var focus = elementDefinition.focus; - if ( focus ) { - var oldFocus = this.focus; - this.focus = function() { - ( typeof focus == 'function' ? focus : oldFocus ).call( this ); - this.fire( 'focus' ); - }; - if ( elementDefinition.isFocusable ) { - var oldIsFocusable = this.isFocusable; - this.isFocusable = oldIsFocusable; - } - this.keyboardFocusable = true; - } - - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, myHtmlList, 'span', null, null, '' ); - - // Append the attributes created by the uiElement call to the real HTML. - myHtml = myHtmlList.join( '' ); - myMatch = myHtml.match( myHtmlRe ); - theirMatch = theirHtml.match( theirHtmlRe ) || [ '', '', '' ]; - - if ( emptyTagRe.test( theirMatch[ 1 ] ) ) { - theirMatch[ 1 ] = theirMatch[ 1 ].slice( 0, -1 ); - theirMatch[ 2 ] = '/' + theirMatch[ 2 ]; - } - - htmlList.push( [ theirMatch[ 1 ], ' ', myMatch[ 1 ] || '', theirMatch[ 2 ] ].join( '' ) ); - }; - } )(), - - /** - * Form fieldset for grouping dialog UI elements. - * - * @class CKEDITOR.ui.dialog.fieldset - * @extends CKEDITOR.ui.dialog.uiElement - * @constructor Creates a fieldset class instance. - * @param {CKEDITOR.dialog} dialog Parent dialog object. - * @param {Array} childObjList - * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container. - * @param {Array} childHtmlList Array of HTML code that correspond to the HTML output of all the - * objects in childObjList. - * @param {Array} htmlList Array of HTML code that this element will output to. - * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition - * The element definition. Accepted fields: - * - * * `label` (Optional) The legend of the this fieldset. - * * `children` (Required) An array of dialog field definitions which will be grouped inside this fieldset. - * - */ - fieldset: function( dialog, childObjList, childHtmlList, htmlList, elementDefinition ) { - var legendLabel = elementDefinition.label; - /** @ignore */ - var innerHTML = function() { - var html = []; - legendLabel && html.push( '' + legendLabel + '' ); - for ( var i = 0; i < childHtmlList.length; i++ ) - html.push( childHtmlList[ i ] ); - return html.join( '' ); - }; - - this._ = { children: childObjList }; - CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'fieldset', null, null, innerHTML ); - } - - }, true ); - - CKEDITOR.ui.dialog.html.prototype = new CKEDITOR.ui.dialog.uiElement; - - /** @class CKEDITOR.ui.dialog.labeledElement */ - CKEDITOR.ui.dialog.labeledElement.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement, { - /** - * Sets the label text of the element. - * - * @param {String} label The new label text. - * @returns {CKEDITOR.ui.dialog.labeledElement} The current labeled element. - */ - setLabel: function( label ) { - var node = CKEDITOR.document.getById( this._.labelId ); - if ( node.getChildCount() < 1 ) - ( new CKEDITOR.dom.text( label, CKEDITOR.document ) ).appendTo( node ); - else - node.getChild( 0 ).$.nodeValue = label; - return this; - }, - - /** - * Retrieves the current label text of the elment. - * - * @returns {String} The current label text. - */ - getLabel: function() { - var node = CKEDITOR.document.getById( this._.labelId ); - if ( !node || node.getChildCount() < 1 ) - return ''; - else - return node.getChild( 0 ).getText(); - }, - - /** - * Defines the onChange event for UI element definitions. - * @property {Object} - */ - eventProcessors: commonEventProcessors - }, true ); - - /** @class CKEDITOR.ui.dialog.button */ - CKEDITOR.ui.dialog.button.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement, { - /** - * Simulates a click to the button. - * - * @returns {Object} Return value of the `click` event. - */ - click: function() { - if ( !this._.disabled ) - return this.fire( 'click', { dialog: this._.dialog } ); - return false; - }, - - /** - * Enables the button. - */ - enable: function() { - this._.disabled = false; - var element = this.getElement(); - element && element.removeClass( 'cke_disabled' ); - }, - - /** - * Disables the button. - */ - disable: function() { - this._.disabled = true; - this.getElement().addClass( 'cke_disabled' ); - }, - - /** - * @todo - */ - isVisible: function() { - return this.getElement().getFirst().isVisible(); - }, - - /** - * @todo - */ - isEnabled: function() { - return !this._.disabled; - }, - - /** - * Defines the onChange event and onClick for button element definitions. - * - * @property {Object} - */ - eventProcessors: CKEDITOR.tools.extend( {}, CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors, { - onClick: function( dialog, func ) { - this.on( 'click', function() { - func.apply( this, arguments ); - } ); - } - }, true ), - - /** - * Handler for the element's access key up event. Simulates a click to - * the button. - */ - accessKeyUp: function() { - this.click(); - }, - - /** - * Handler for the element's access key down event. Simulates a mouse - * down to the button. - */ - accessKeyDown: function() { - this.focus(); - }, - - keyboardFocusable: true - }, true ); - - /** @class CKEDITOR.ui.dialog.textInput */ - CKEDITOR.ui.dialog.textInput.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.labeledElement, { - /** - * Gets the text input DOM element under this UI object. - * - * @returns {CKEDITOR.dom.element} The DOM element of the text input. - */ - getInputElement: function() { - return CKEDITOR.document.getById( this._.inputId ); - }, - - /** - * Puts focus into the text input. - */ - focus: function() { - var me = this.selectParentTab(); - - // GECKO BUG: setTimeout() is needed to workaround invisible selections. - setTimeout( function() { - var element = me.getInputElement(); - element && element.$.focus(); - }, 0 ); - }, - - /** - * Selects all the text in the text input. - */ - select: function() { - var me = this.selectParentTab(); - - // GECKO BUG: setTimeout() is needed to workaround invisible selections. - setTimeout( function() { - var e = me.getInputElement(); - if ( e ) { - e.$.focus(); - e.$.select(); - } - }, 0 ); - }, - - /** - * Handler for the text input's access key up event. Makes a `select()` - * call to the text input. - */ - accessKeyUp: function() { - this.select(); - }, - - /** - * Sets the value of this text input object. - * - * uiElement.setValue( 'Blamo' ); - * - * @param {Object} value The new value. - * @returns {CKEDITOR.ui.dialog.textInput} The current UI element. - */ - setValue: function( value ) { - !value && ( value = '' ); - return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply( this, arguments ); - }, - - keyboardFocusable: true - }, commonPrototype, true ); - - CKEDITOR.ui.dialog.textarea.prototype = new CKEDITOR.ui.dialog.textInput(); - - /** @class CKEDITOR.ui.dialog.select */ - CKEDITOR.ui.dialog.select.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.labeledElement, { - /** - * Gets the DOM element of the select box. - * - * @returns {CKEDITOR.dom.element} The `` element of this file input. - * - * @returns {CKEDITOR.dom.element} The file input element. - */ - getInputElement: function() { - var frameDocument = CKEDITOR.document.getById( this._.frameId ).getFrameDocument(); - return frameDocument.$.forms.length > 0 ? new CKEDITOR.dom.element( frameDocument.$.forms[ 0 ].elements[ 0 ] ) : this.getElement(); - }, - - /** - * Uploads the file in the file input. - * - * @returns {CKEDITOR.ui.dialog.file} This object. - */ - submit: function() { - this.getInputElement().getParent().$.submit(); - return this; - }, - - /** - * Get the action assigned to the form. - * - * @returns {String} The value of the action. - */ - getAction: function() { - return this.getInputElement().getParent().$.action; - }, - - /** - * The events must be applied on the inner input element, and - * that must be done when the iframe & form has been loaded. - */ - registerEvents: function( definition ) { - var regex = /^on([A-Z]\w+)/, - match; - - var registerDomEvent = function( uiElement, dialog, eventName, func ) { - uiElement.on( 'formLoaded', function() { - uiElement.getInputElement().on( eventName, func, uiElement ); - } ); - }; - - for ( var i in definition ) { - if ( !( match = i.match( regex ) ) ) - continue; - - if ( this.eventProcessors[ i ] ) - this.eventProcessors[ i ].call( this, this._.dialog, definition[ i ] ); - else - registerDomEvent( this, this._.dialog, match[ 1 ].toLowerCase(), definition[ i ] ); - } - - return this; - }, - - /** - * Redraws the file input and resets the file path in the file input. - * The redraw logic is necessary because non-IE browsers tend to clear - * the `' ); - - var frameDocTpl = CKEDITOR.addTemplate( 'panel-frame-inner', '' + - '' + - '{css}' + - '' + - '<\/html>' ); - - /** @class CKEDITOR.ui.panel */ - CKEDITOR.ui.panel.prototype = { - /** - * Renders the combo. - * - * @param {CKEDITOR.editor} editor The editor instance which this button is - * to be used by. - * @param {Array} [output] The output array to which append the HTML relative - * to this button. - */ - render: function( editor, output ) { - this.getHolderElement = function() { - var holder = this._.holder; - - if ( !holder ) { - if ( this.isFramed ) { - var iframe = this.document.getById( this.id + '_frame' ), - parentDiv = iframe.getParent(), - doc = iframe.getFrameDocument(); - - // Make it scrollable on iOS. (#8308) - CKEDITOR.env.iOS && parentDiv.setStyles( { - 'overflow': 'scroll', - '-webkit-overflow-scrolling': 'touch' - } ); - - var onLoad = CKEDITOR.tools.addFunction( CKEDITOR.tools.bind( function( ev ) { - this.isLoaded = true; - if ( this.onLoad ) - this.onLoad(); - }, this ) ); - - doc.write( frameDocTpl.output( CKEDITOR.tools.extend( { - css: CKEDITOR.tools.buildStyleHtml( this.css ), - onload: 'window.parent.CKEDITOR.tools.callFunction(' + onLoad + ');' - }, data ) ) ); - - var win = doc.getWindow(); - - // Register the CKEDITOR global. - win.$.CKEDITOR = CKEDITOR; - - // Arrow keys for scrolling is only preventable with 'keypress' event in Opera (#4534). - doc.on( 'key' + ( CKEDITOR.env.opera ? 'press' : 'down' ), function( evt ) { - var keystroke = evt.data.getKeystroke(), - dir = this.document.getById( this.id ).getAttribute( 'dir' ); - - // Delegate key processing to block. - if ( this._.onKeyDown && this._.onKeyDown( keystroke ) === false ) { - evt.data.preventDefault(); - return; - } - - // ESC/ARROW-LEFT(ltr) OR ARROW-RIGHT(rtl) - if ( keystroke == 27 || keystroke == ( dir == 'rtl' ? 39 : 37 ) ) { - if ( this.onEscape && this.onEscape( keystroke ) === false ) - evt.data.preventDefault(); - } - }, this ); - - holder = doc.getBody(); - holder.unselectable(); - CKEDITOR.env.air && CKEDITOR.tools.callFunction( onLoad ); - } else - holder = this.document.getById( this.id ); - - this._.holder = holder; - } - - return holder; - }; - - var data = { - editorId: editor.id, - id: this.id, - langCode: editor.langCode, - dir: editor.lang.dir, - cls: this.className, - frame: '', - env: CKEDITOR.env.cssClass, - 'z-index': editor.config.baseFloatZIndex + 1 - }; - - if ( this.isFramed ) { - // With IE, the custom domain has to be taken care at first, - // for other browers, the 'src' attribute should be left empty to - // trigger iframe's 'load' event. - var src = - CKEDITOR.env.air ? 'javascript:void(0)' : - CKEDITOR.env.ie ? 'javascript:void(function(){' + encodeURIComponent( - 'document.open();' + - // In IE, the document domain must be set any time we call document.open(). - '(' + CKEDITOR.tools.fixDomain + ')();' + - 'document.close();' - ) + '}())' : - ''; - - data.frame = frameTpl.output( { - id: this.id + '_frame', - src: src - } ); - } - - var html = panelTpl.output( data ); - - if ( output ) - output.push( html ); - - return html; - }, - - /** - * @todo - */ - addBlock: function( name, block ) { - block = this._.blocks[ name ] = block instanceof CKEDITOR.ui.panel.block ? block : new CKEDITOR.ui.panel.block( this.getHolderElement(), block ); - - if ( !this._.currentBlock ) - this.showBlock( name ); - - return block; - }, - - /** - * @todo - */ - getBlock: function( name ) { - return this._.blocks[ name ]; - }, - - /** - * @todo - */ - showBlock: function( name ) { - var blocks = this._.blocks, - block = blocks[ name ], - current = this._.currentBlock; - - // ARIA role works better in IE on the body element, while on the iframe - // for FF. (#8864) - var holder = !this.forceIFrame || CKEDITOR.env.ie ? this._.holder : this.document.getById( this.id + '_frame' ); - - if ( current ) - current.hide(); - - this._.currentBlock = block; - - CKEDITOR.fire( 'ariaWidget', holder ); - - // Reset the focus index, so it will always go into the first one. - block._.focusIndex = -1; - - this._.onKeyDown = block.onKeyDown && CKEDITOR.tools.bind( block.onKeyDown, block ); - - block.show(); - - return block; - }, - - /** - * @todo - */ - destroy: function() { - this.element && this.element.remove(); - } - }; - - /** - * @class - * - * @todo class and all methods - */ - CKEDITOR.ui.panel.block = CKEDITOR.tools.createClass( { - /** - * Creates a block class instances. - * - * @constructor - * @todo - */ - $: function( blockHolder, blockDefinition ) { - this.element = blockHolder.append( blockHolder.getDocument().createElement( 'div', { - attributes: { - 'tabindex': -1, - 'class': 'cke_panel_block' - }, - styles: { - display: 'none' - } - } ) ); - - // Copy all definition properties to this object. - if ( blockDefinition ) - CKEDITOR.tools.extend( this, blockDefinition ); - - // Set the a11y attributes of this element ... - this.element.setAttributes( { - 'role': this.attributes.role || 'presentation', - 'aria-label': this.attributes[ 'aria-label' ], - 'title': this.attributes.title || this.attributes[ 'aria-label' ] - } ); - - this.keys = {}; - - this._.focusIndex = -1; - - // Disable context menu for panels. - this.element.disableContextMenu(); - }, - - _: { - - /** - * Mark the item specified by the index as current activated. - */ - markItem: function( index ) { - if ( index == -1 ) - return; - var links = this.element.getElementsByTag( 'a' ); - var item = links.getItem( this._.focusIndex = index ); - - // Safari need focus on the iframe window first(#3389), but we need - // lock the blur to avoid hiding the panel. - if ( CKEDITOR.env.webkit || CKEDITOR.env.opera ) - item.getDocument().getWindow().focus(); - item.focus(); - - this.onMark && this.onMark( item ); - } - }, - - proto: { - show: function() { - this.element.setStyle( 'display', '' ); - }, - - hide: function() { - if ( !this.onHide || this.onHide.call( this ) !== true ) - this.element.setStyle( 'display', 'none' ); - }, - - onKeyDown: function( keystroke, noCycle ) { - var keyAction = this.keys[ keystroke ]; - switch ( keyAction ) { - // Move forward. - case 'next': - var index = this._.focusIndex, - links = this.element.getElementsByTag( 'a' ), - link; - - while ( ( link = links.getItem( ++index ) ) ) { - // Move the focus only if the element is marked with - // the _cke_focus and it it's visible (check if it has - // width). - if ( link.getAttribute( '_cke_focus' ) && link.$.offsetWidth ) { - this._.focusIndex = index; - link.focus(); - break; - } - } - - // If no link was found, cycle and restart from the top. (#11125) - if ( !link && !noCycle ) { - this._.focusIndex = -1; - return this.onKeyDown( keystroke, 1 ); - } - - return false; - - // Move backward. - case 'prev': - index = this._.focusIndex; - links = this.element.getElementsByTag( 'a' ); - - while ( index > 0 && ( link = links.getItem( --index ) ) ) { - // Move the focus only if the element is marked with - // the _cke_focus and it it's visible (check if it has - // width). - if ( link.getAttribute( '_cke_focus' ) && link.$.offsetWidth ) { - this._.focusIndex = index; - link.focus(); - break; - } - - // Make sure link is null when the loop ends and nothing was - // found (#11125). - link = null; - } - - // If no link was found, cycle and restart from the bottom. (#11125) - if ( !link && !noCycle ) { - this._.focusIndex = links.count(); - return this.onKeyDown( keystroke, 1 ); - } - - return false; - - case 'click': - case 'mouseup': - index = this._.focusIndex; - link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index ); - - if ( link ) - link.$[ keyAction ] ? link.$[ keyAction ]() : link.$[ 'on' + keyAction ](); - - return false; - } - - return true; - } - } - } ); - -} )(); - -/** - * Fired when a panel is added to the document. - * - * @event ariaWidget - * @member CKEDITOR - * @param {Object} data The element wrapping the panel. - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/panelbutton/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/panelbutton/plugin.js deleted file mode 100644 index 6698ffe0319..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/panelbutton/plugin.js +++ /dev/null @@ -1,138 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.add( 'panelbutton', { - requires: 'button', - onLoad: function() { - function clickFn( editor ) { - var _ = this._; - - if ( _.state == CKEDITOR.TRISTATE_DISABLED ) - return; - - this.createPanel( editor ); - - if ( _.on ) { - _.panel.hide(); - return; - } - - _.panel.showBlock( this._.id, this.document.getById( this._.id ), 4 ); - } - - /** - * @class - * @extends CKEDITOR.ui.button - * @todo class and methods - */ - CKEDITOR.ui.panelButton = CKEDITOR.tools.createClass( { - base: CKEDITOR.ui.button, - - /** - * Creates a panelButton class instance. - * - * @constructor - */ - $: function( definition ) { - // We don't want the panel definition in this object. - var panelDefinition = definition.panel || {}; - delete definition.panel; - - this.base( definition ); - - this.document = ( panelDefinition.parent && panelDefinition.parent.getDocument() ) || CKEDITOR.document; - - panelDefinition.block = { - attributes: panelDefinition.attributes - }; - panelDefinition.toolbarRelated = true; - - this.hasArrow = true; - - this.click = clickFn; - - this._ = { - panelDefinition: panelDefinition - }; - }, - - statics: { - handler: { - create: function( definition ) { - return new CKEDITOR.ui.panelButton( definition ); - } - } - }, - - proto: { - createPanel: function( editor ) { - var _ = this._; - - if ( _.panel ) - return; - - var panelDefinition = this._.panelDefinition, - panelBlockDefinition = this._.panelDefinition.block, - panelParentElement = panelDefinition.parent || CKEDITOR.document.getBody(), - panel = this._.panel = new CKEDITOR.ui.floatPanel( editor, panelParentElement, panelDefinition ), - block = panel.addBlock( _.id, panelBlockDefinition ), - me = this; - - panel.onShow = function() { - if ( me.className ) - this.element.addClass( me.className + '_panel' ); - - me.setState( CKEDITOR.TRISTATE_ON ); - - _.on = 1; - - me.editorFocus && editor.focus(); - - if ( me.onOpen ) - me.onOpen(); - }; - - panel.onHide = function( preventOnClose ) { - if ( me.className ) - this.element.getFirst().removeClass( me.className + '_panel' ); - - me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED ); - - _.on = 0; - - if ( !preventOnClose && me.onClose ) - me.onClose(); - }; - - panel.onEscape = function() { - panel.hide( 1 ); - me.document.getById( _.id ).focus(); - }; - - if ( this.onBlock ) - this.onBlock( panel, block ); - - block.onHide = function() { - _.on = 0; - me.setState( CKEDITOR.TRISTATE_OFF ); - }; - } - } - } ); - - }, - beforeInit: function( editor ) { - editor.ui.addHandler( CKEDITOR.UI_PANELBUTTON, CKEDITOR.ui.panelButton.handler ); - } -} ); - -/** - * Button UI element. - * - * @readonly - * @property {String} [='panelbutton'] - * @member CKEDITOR - */ -CKEDITOR.UI_PANELBUTTON = 'panelbutton'; diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/filter/default.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/filter/default.js deleted file mode 100644 index 66ec929b12b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/filter/default.js +++ /dev/null @@ -1,1210 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -( function() { - var fragmentPrototype = CKEDITOR.htmlParser.fragment.prototype, - elementPrototype = CKEDITOR.htmlParser.element.prototype; - - fragmentPrototype.onlyChild = elementPrototype.onlyChild = function() { - var children = this.children, - count = children.length, - firstChild = ( count == 1 ) && children[ 0 ]; - return firstChild || null; - }; - - elementPrototype.removeAnyChildWithName = function( tagName ) { - var children = this.children, - childs = [], - child; - - for ( var i = 0; i < children.length; i++ ) { - child = children[ i ]; - if ( !child.name ) - continue; - - if ( child.name == tagName ) { - childs.push( child ); - children.splice( i--, 1 ); - } - childs = childs.concat( child.removeAnyChildWithName( tagName ) ); - } - return childs; - }; - - elementPrototype.getAncestor = function( tagNameRegex ) { - var parent = this.parent; - while ( parent && !( parent.name && parent.name.match( tagNameRegex ) ) ) - parent = parent.parent; - return parent; - }; - - fragmentPrototype.firstChild = elementPrototype.firstChild = function( evaluator ) { - var child; - - for ( var i = 0; i < this.children.length; i++ ) { - child = this.children[ i ]; - if ( evaluator( child ) ) - return child; - else if ( child.name ) { - child = child.firstChild( evaluator ); - if ( child ) - return child; - } - } - - return null; - }; - - // Adding a (set) of styles to the element's 'style' attributes. - elementPrototype.addStyle = function( name, value, isPrepend ) { - var styleText, - addingStyleText = ''; - // name/value pair. - if ( typeof value == 'string' ) - addingStyleText += name + ':' + value + ';'; - else { - // style literal. - if ( typeof name == 'object' ) { - for ( var style in name ) { - if ( name.hasOwnProperty( style ) ) - addingStyleText += style + ':' + name[ style ] + ';'; - } - } - // raw style text form. - else - addingStyleText += name; - - isPrepend = value; - } - - if ( !this.attributes ) - this.attributes = {}; - - styleText = this.attributes.style || ''; - - styleText = ( isPrepend ? [ addingStyleText, styleText ] : [ styleText, addingStyleText ] ).join( ';' ); - - this.attributes.style = styleText.replace( /^;|;(?=;)/, '' ); - }; - - // Retrieve a style property value of the element. - elementPrototype.getStyle = function( name ) { - var styles = this.attributes.style; - if ( styles ) { - styles = CKEDITOR.tools.parseCssText( styles, 1 ); - return styles[ name ]; - } - }; - - /** - * Return the DTD-valid parent tag names of the specified one. - * - * @member CKEDITOR.dtd - * @param {String} tagName - * @returns {Object} - */ - CKEDITOR.dtd.parentOf = function( tagName ) { - var result = {}; - for ( var tag in this ) { - if ( tag.indexOf( '$' ) == -1 && this[ tag ][ tagName ] ) - result[ tag ] = 1; - } - return result; - }; - - // 1. move consistent list item styles up to list root. - // 2. clear out unnecessary list item numbering. - function postProcessList( list ) { - var children = list.children, - child, attrs, - count = list.children.length, - match, mergeStyle, - styleTypeRegexp = /list-style-type:(.*?)(?:;|$)/, - stylesFilter = CKEDITOR.plugins.pastefromword.filters.stylesFilter; - - attrs = list.attributes; - if ( styleTypeRegexp.exec( attrs.style ) ) - return; - - for ( var i = 0; i < count; i++ ) { - child = children[ i ]; - - if ( child.attributes.value && Number( child.attributes.value ) == i + 1 ) - delete child.attributes.value; - - match = styleTypeRegexp.exec( child.attributes.style ); - - if ( match ) { - if ( match[ 1 ] == mergeStyle || !mergeStyle ) - mergeStyle = match[ 1 ]; - else { - mergeStyle = null; - break; - } - } - } - - if ( mergeStyle ) { - for ( i = 0; i < count; i++ ) { - attrs = children[ i ].attributes; - attrs.style && ( attrs.style = stylesFilter( [ [ 'list-style-type' ] ] )( attrs.style ) || '' ); - } - - list.addStyle( 'list-style-type', mergeStyle ); - } - } - - var cssLengthRelativeUnit = /^([.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i; - var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/; // e.g. 0px 0pt 0px - var romanLiternalPattern = '^m{0,4}(cm|cd|d?c{0,3})(xc|xl|l?x{0,3})(ix|iv|v?i{0,3})$', - lowerRomanLiteralRegex = new RegExp( romanLiternalPattern ), - upperRomanLiteralRegex = new RegExp( romanLiternalPattern.toUpperCase() ); - - var orderedPatterns = { 'decimal': /\d+/, 'lower-roman': lowerRomanLiteralRegex, 'upper-roman': upperRomanLiteralRegex, 'lower-alpha': /^[a-z]+$/, 'upper-alpha': /^[A-Z]+$/ }, - unorderedPatterns = { 'disc': /[l\u00B7\u2002]/, 'circle': /[\u006F\u00D8]/, 'square': /[\u006E\u25C6]/ }, - listMarkerPatterns = { 'ol': orderedPatterns, 'ul': unorderedPatterns }, - romans = [ [ 1000, 'M' ], [ 900, 'CM' ], [ 500, 'D' ], [ 400, 'CD' ], [ 100, 'C' ], [ 90, 'XC' ], [ 50, 'L' ], [ 40, 'XL' ], [ 10, 'X' ], [ 9, 'IX' ], [ 5, 'V' ], [ 4, 'IV' ], [ 1, 'I' ] ], - alpahbets = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - - // Convert roman numbering back to decimal. - function fromRoman( str ) { - str = str.toUpperCase(); - var l = romans.length, - retVal = 0; - for ( var i = 0; i < l; ++i ) { - for ( var j = romans[ i ], k = j[ 1 ].length; str.substr( 0, k ) == j[ 1 ]; str = str.substr( k ) ) - retVal += j[ 0 ]; - } - return retVal; - } - - // Convert alphabet numbering back to decimal. - function fromAlphabet( str ) { - str = str.toUpperCase(); - var l = alpahbets.length, - retVal = 1; - for ( var x = 1; str.length > 0; x *= l ) { - retVal += alpahbets.indexOf( str.charAt( str.length - 1 ) ) * x; - str = str.substr( 0, str.length - 1 ); - } - return retVal; - } - - var listBaseIndent = 0, - previousListItemMargin = null, - previousListId; - - var plugin = ( CKEDITOR.plugins.pastefromword = { - utils: { - // Create a which indicate an list item type. - createListBulletMarker: function( bullet, bulletText ) { - var marker = new CKEDITOR.htmlParser.element( 'cke:listbullet' ); - marker.attributes = { 'cke:listsymbol': bullet[ 0 ] }; - marker.add( new CKEDITOR.htmlParser.text( bulletText ) ); - return marker; - }, - - isListBulletIndicator: function( element ) { - var styleText = element.attributes && element.attributes.style; - if ( /mso-list\s*:\s*Ignore/i.test( styleText ) ) - return true; - }, - - isContainingOnlySpaces: function( element ) { - var text; - return ( ( text = element.onlyChild() ) && ( /^(:?\s| )+$/ ).test( text.value ) ); - }, - - resolveList: function( element ) { - // indicate a list item. - var attrs = element.attributes, - listMarker; - - if ( ( listMarker = element.removeAnyChildWithName( 'cke:listbullet' ) ) && listMarker.length && ( listMarker = listMarker[ 0 ] ) ) { - element.name = 'cke:li'; - - if ( attrs.style ) { - attrs.style = plugin.filters.stylesFilter( [ - // Text-indent is not representing list item level any more. - [ 'text-indent' ], - [ 'line-height' ], - // First attempt is to resolve indent level from on a constant margin increment. - [ ( /^margin(:?-left)?$/ ), null, function( margin ) { - // Deal with component/short-hand form. - var values = margin.split( ' ' ); - margin = CKEDITOR.tools.convertToPx( values[ 3 ] || values[ 1 ] || values[ 0 ] ); - - // Figure out the indent unit by checking the first time of incrementation. - if ( !listBaseIndent && previousListItemMargin !== null && margin > previousListItemMargin ) - listBaseIndent = margin - previousListItemMargin; - - previousListItemMargin = margin; - - attrs[ 'cke:indent' ] = listBaseIndent && ( Math.ceil( margin / listBaseIndent ) + 1 ) || 1; - } ], - // The best situation: "mso-list:l0 level1 lfo2" tells the belonged list root, list item indentation, etc. - [ ( /^mso-list$/ ), null, function( val ) { - val = val.split( ' ' ); - var listId = Number( val[ 0 ].match( /\d+/ ) ), - indent = Number( val[ 1 ].match( /\d+/ ) ); - - if ( indent == 1 ) { - listId !== previousListId && ( attrs[ 'cke:reset' ] = 1 ); - previousListId = listId; - } - attrs[ 'cke:indent' ] = indent; - } ] - ] )( attrs.style, element ) || ''; - } - - // First level list item might be presented without a margin. - - - // In case all above doesn't apply. - if ( !attrs[ 'cke:indent' ] ) { - previousListItemMargin = 0; - attrs[ 'cke:indent' ] = 1; - } - - // Inherit attributes from bullet. - CKEDITOR.tools.extend( attrs, listMarker.attributes ); - return true; - } - // Current list disconnected. - else - previousListId = previousListItemMargin = listBaseIndent = null; - - return false; - }, - - // Providing a shorthand style then retrieve one or more style component values. - getStyleComponents: ( function() { - var calculator = CKEDITOR.dom.element.createFromHtml( '
', CKEDITOR.document ); - CKEDITOR.document.getBody().append( calculator ); - - return function( name, styleValue, fetchList ) { - calculator.setStyle( name, styleValue ); - var styles = {}, - count = fetchList.length; - for ( var i = 0; i < count; i++ ) - styles[ fetchList[ i ] ] = calculator.getStyle( fetchList[ i ] ); - - return styles; - }; - } )(), - - listDtdParents: CKEDITOR.dtd.parentOf( 'ol' ) - }, - - filters: { - // Transform a normal list into flat list items only presentation. - // E.g.
  • level1
    1. level2
    • => - // level1 - // level2 - flattenList: function( element, level ) { - level = typeof level == 'number' ? level : 1; - - var attrs = element.attributes, - listStyleType; - - // All list items are of the same type. - switch ( attrs.type ) { - case 'a': - listStyleType = 'lower-alpha'; - break; - case '1': - listStyleType = 'decimal'; - break; - // TODO: Support more list style type from MS-Word. - } - - var children = element.children, - child; - - for ( var i = 0; i < children.length; i++ ) { - child = children[ i ]; - - if ( child.name in CKEDITOR.dtd.$listItem ) { - var attributes = child.attributes, - listItemChildren = child.children, - count = listItemChildren.length, - last = listItemChildren[ count - 1 ]; - - // Move out nested list. - if ( last.name in CKEDITOR.dtd.$list ) { - element.add( last, i + 1 ); - - // Remove the parent list item if it's just a holder. - if ( !--listItemChildren.length ) - children.splice( i--, 1 ); - } - - child.name = 'cke:li'; - - // Inherit numbering from list root on the first list item. - attrs.start && !i && ( attributes.value = attrs.start ); - - plugin.filters.stylesFilter( [ - [ 'tab-stops', null, function( val ) { - var margin = val.split( ' ' )[ 1 ].match( cssLengthRelativeUnit ); - margin && ( previousListItemMargin = CKEDITOR.tools.convertToPx( margin[ 0 ] ) ); - } ], - ( level == 1 ? [ 'mso-list', null, function( val ) { - val = val.split( ' ' ); - var listId = Number( val[ 0 ].match( /\d+/ ) ); - listId !== previousListId && ( attributes[ 'cke:reset' ] = 1 ); - previousListId = listId; - } ] : null ) - ] )( attributes.style ); - - attributes[ 'cke:indent' ] = level; - attributes[ 'cke:listtype' ] = element.name; - attributes[ 'cke:list-style-type' ] = listStyleType; - } - // Flatten sub list. - else if ( child.name in CKEDITOR.dtd.$list ) { - // Absorb sub list children. - arguments.callee.apply( this, [ child, level + 1 ] ); - children = children.slice( 0, i ).concat( child.children ).concat( children.slice( i + 1 ) ); - element.children = []; - for ( var j = 0, num = children.length; j < num; j++ ) - element.add( children[ j ] ); - - children = element.children; - } - } - - delete element.name; - - // We're loosing tag name here, signalize this element as a list. - attrs[ 'cke:list' ] = 1; - }, - - // Try to collect all list items among the children and establish one - // or more HTML list structures for them. - // @param element - assembleList: function( element ) { - var children = element.children, - child, listItem, // The current processing cke:li element. - listItemAttrs, listItemIndent, // Indent level of current list item. - lastIndent, lastListItem, // The previous one just been added to the list. - list, // Current staging list and it's parent list if any. - openedLists = [], - previousListStyleType, previousListType; - - // Properties of the list item are to be resolved from the list bullet. - var bullet, listType, listStyleType, itemNumeric; - - for ( var i = 0; i < children.length; i++ ) { - child = children[ i ]; - - if ( 'cke:li' == child.name ) { - child.name = 'li'; - listItem = child; - listItemAttrs = listItem.attributes; - bullet = listItemAttrs[ 'cke:listsymbol' ]; - bullet = bullet && bullet.match( /^(?:[(]?)([^\s]+?)([.)]?)$/ ); - listType = listStyleType = itemNumeric = null; - - if ( listItemAttrs[ 'cke:ignored' ] ) { - children.splice( i--, 1 ); - continue; - } - - - // This's from a new list root. - listItemAttrs[ 'cke:reset' ] && ( list = lastIndent = lastListItem = null ); - - // List item indent level might come from a real list indentation or - // been resolved from a pseudo list item's margin value, even get - // no indentation at all. - listItemIndent = Number( listItemAttrs[ 'cke:indent' ] ); - - // We're moving out of the current list, cleaning up. - if ( listItemIndent != lastIndent ) - previousListType = previousListStyleType = null; - - // List type and item style are already resolved. - if ( !bullet ) { - listType = listItemAttrs[ 'cke:listtype' ] || 'ol'; - listStyleType = listItemAttrs[ 'cke:list-style-type' ]; - } else { - // Probably share the same list style type with previous list item, - // give it priority to avoid ambiguous between C(Alpha) and C.(Roman). - if ( previousListType && listMarkerPatterns[ previousListType ][ previousListStyleType ].test( bullet[ 1 ] ) ) { - listType = previousListType; - listStyleType = previousListStyleType; - } else { - for ( var type in listMarkerPatterns ) { - for ( var style in listMarkerPatterns[ type ] ) { - if ( listMarkerPatterns[ type ][ style ].test( bullet[ 1 ] ) ) { - // Small numbering has higher priority, when dealing with ambiguous - // between C(Alpha) and C.(Roman). - if ( type == 'ol' && ( /alpha|roman/ ).test( style ) ) { - var num = /roman/.test( style ) ? fromRoman( bullet[ 1 ] ) : fromAlphabet( bullet[ 1 ] ); - if ( !itemNumeric || num < itemNumeric ) { - itemNumeric = num; - listType = type; - listStyleType = style; - } - } else { - listType = type; - listStyleType = style; - break; - } - } - } - } - } - - // Simply use decimal/disc for the rest forms of unrepresentable - // numerals, e.g. Chinese..., but as long as there a second part - // included, it has a bigger chance of being a order list ;) - !listType && ( listType = bullet[ 2 ] ? 'ol' : 'ul' ); - } - - previousListType = listType; - previousListStyleType = listStyleType || ( listType == 'ol' ? 'decimal' : 'disc' ); - if ( listStyleType && listStyleType != ( listType == 'ol' ? 'decimal' : 'disc' ) ) - listItem.addStyle( 'list-style-type', listStyleType ); - - // Figure out start numbering. - if ( listType == 'ol' && bullet ) { - switch ( listStyleType ) { - case 'decimal': - itemNumeric = Number( bullet[ 1 ] ); - break; - case 'lower-roman': - case 'upper-roman': - itemNumeric = fromRoman( bullet[ 1 ] ); - break; - case 'lower-alpha': - case 'upper-alpha': - itemNumeric = fromAlphabet( bullet[ 1 ] ); - break; - } - - // Always create the numbering, swipe out unnecessary ones later. - listItem.attributes.value = itemNumeric; - } - - // Start the list construction. - if ( !list ) { - openedLists.push( list = new CKEDITOR.htmlParser.element( listType ) ); - list.add( listItem ); - children[ i ] = list; - } else { - if ( listItemIndent > lastIndent ) { - openedLists.push( list = new CKEDITOR.htmlParser.element( listType ) ); - list.add( listItem ); - lastListItem.add( list ); - } else if ( listItemIndent < lastIndent ) { - // There might be a negative gap between two list levels. (#4944) - var diff = lastIndent - listItemIndent, - parent; - while ( diff-- && ( parent = list.parent ) ) - list = parent.parent; - - list.add( listItem ); - } else - list.add( listItem ); - - children.splice( i--, 1 ); - } - - lastListItem = listItem; - lastIndent = listItemIndent; - } else if ( list ) - list = lastIndent = lastListItem = null; - } - - for ( i = 0; i < openedLists.length; i++ ) - postProcessList( openedLists[ i ] ); - - list = lastIndent = lastListItem = previousListId = previousListItemMargin = listBaseIndent = null; - }, - - // A simple filter which always rejecting. - falsyFilter: function( value ) { - return false; - }, - - // A filter dedicated on the 'style' attribute filtering, e.g. dropping/replacing style properties. - // @param styles {Array} in form of [ styleNameRegexp, styleValueRegexp, - // newStyleValue/newStyleGenerator, newStyleName ] where only the first - // parameter is mandatory. - // @param whitelist {Boolean} Whether the {@param styles} will be considered as a white-list. - stylesFilter: function( styles, whitelist ) { - return function( styleText, element ) { - var rules = []; - // html-encoded quote might be introduced by 'font-family' - // from MS-Word which confused the following regexp. e.g. - //'font-family: "Lucida, Console"' - ( styleText || '' ).replace( /"/g, '"' ).replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g, function( match, name, value ) { - name = name.toLowerCase(); - name == 'font-family' && ( value = value.replace( /["']/g, '' ) ); - - var namePattern, valuePattern, newValue, newName; - for ( var i = 0; i < styles.length; i++ ) { - if ( styles[ i ] ) { - namePattern = styles[ i ][ 0 ]; - valuePattern = styles[ i ][ 1 ]; - newValue = styles[ i ][ 2 ]; - newName = styles[ i ][ 3 ]; - - if ( name.match( namePattern ) && ( !valuePattern || value.match( valuePattern ) ) ) { - name = newName || name; - whitelist && ( newValue = newValue || value ); - - if ( typeof newValue == 'function' ) - newValue = newValue( value, element, name ); - - // Return an couple indicate both name and value - // changed. - if ( newValue && newValue.push ) - name = newValue[ 0 ], newValue = newValue[ 1 ]; - - if ( typeof newValue == 'string' ) - rules.push( [ name, newValue ] ); - return; - } - } - } - - !whitelist && rules.push( [ name, value ] ); - - } ); - - for ( var i = 0; i < rules.length; i++ ) - rules[ i ] = rules[ i ].join( ':' ); - return rules.length ? ( rules.join( ';' ) + ';' ) : false; - }; - }, - - // Migrate the element by decorate styles on it. - // @param styleDefinition - // @param variables - elementMigrateFilter: function( styleDefinition, variables ) { - return styleDefinition ? function( element ) { - var styleDef = variables ? new CKEDITOR.style( styleDefinition, variables )._.definition : styleDefinition; - element.name = styleDef.element; - CKEDITOR.tools.extend( element.attributes, CKEDITOR.tools.clone( styleDef.attributes ) ); - element.addStyle( CKEDITOR.style.getStyleText( styleDef ) ); - } : function() {}; - }, - - // Migrate styles by creating a new nested stylish element. - // @param styleDefinition - styleMigrateFilter: function( styleDefinition, variableName ) { - - var elementMigrateFilter = this.elementMigrateFilter; - return styleDefinition ? function( value, element ) { - // Build an stylish element first. - var styleElement = new CKEDITOR.htmlParser.element( null ), - variables = {}; - - variables[ variableName ] = value; - elementMigrateFilter( styleDefinition, variables )( styleElement ); - // Place the new element inside the existing span. - styleElement.children = element.children; - element.children = [ styleElement ]; - - // #10285 - later on styleElement will replace element if element won't have any attributes. - // However, in some cases styleElement is identical to element and therefore should not be filtered - // to avoid inf loop. Unfortunately calling element.filterChildren() does not prevent from that (#10327). - // However, we can assume that we don't need to filter styleElement at all, so it is safe to replace - // its filter method. - styleElement.filter = function() {}; - styleElement.parent = element; - } : function() {}; - }, - - // A filter which remove cke-namespaced-attribute on - // all none-cke-namespaced elements. - // @param value - // @param element - bogusAttrFilter: function( value, element ) { - if ( element.name.indexOf( 'cke:' ) == -1 ) - return false; - }, - - // A filter which will be used to apply inline css style according the stylesheet - // definition rules, is generated lazily when filtering. - applyStyleFilter: null - - }, - - getRules: function( editor, filter ) { - var dtd = CKEDITOR.dtd, - blockLike = CKEDITOR.tools.extend( {}, dtd.$block, dtd.$listItem, dtd.$tableContent ), - config = editor.config, - filters = this.filters, - falsyFilter = filters.falsyFilter, - stylesFilter = filters.stylesFilter, - elementMigrateFilter = filters.elementMigrateFilter, - styleMigrateFilter = CKEDITOR.tools.bind( this.filters.styleMigrateFilter, this.filters ), - createListBulletMarker = this.utils.createListBulletMarker, - flattenList = filters.flattenList, - assembleList = filters.assembleList, - isListBulletIndicator = this.utils.isListBulletIndicator, - containsNothingButSpaces = this.utils.isContainingOnlySpaces, - resolveListItem = this.utils.resolveList, - convertToPx = function( value ) { - value = CKEDITOR.tools.convertToPx( value ); - return isNaN( value ) ? value : value + 'px'; - }, - getStyleComponents = this.utils.getStyleComponents, - listDtdParents = this.utils.listDtdParents, - removeFontStyles = config.pasteFromWordRemoveFontStyles !== false, - removeStyles = config.pasteFromWordRemoveStyles !== false; - - return { - - elementNames: [ - // Remove script, meta and link elements. - [ ( /meta|link|script/ ), '' ] - ], - - root: function( element ) { - element.filterChildren( filter ); - assembleList( element ); - }, - - elements: { - '^': function( element ) { - // Transform CSS style declaration to inline style. - var applyStyleFilter; - if ( CKEDITOR.env.gecko && ( applyStyleFilter = filters.applyStyleFilter ) ) - applyStyleFilter( element ); - }, - - $: function( element ) { - var tagName = element.name || '', - attrs = element.attributes; - - // Convert length unit of width/height on blocks to - // a more editor-friendly way (px). - if ( tagName in blockLike && attrs.style ) - attrs.style = stylesFilter( [ [ ( /^(:?width|height)$/ ), null, convertToPx ] ] )( attrs.style ) || ''; - - // Processing headings. - if ( tagName.match( /h\d/ ) ) { - element.filterChildren( filter ); - // Is the heading actually a list item? - if ( resolveListItem( element ) ) - return; - - // Adapt heading styles to editor's convention. - elementMigrateFilter( config[ 'format_' + tagName ] )( element ); - } - // Remove inline elements which contain only empty spaces. - else if ( tagName in dtd.$inline ) { - element.filterChildren( filter ); - if ( containsNothingButSpaces( element ) ) - delete element.name; - } - // Remove element with ms-office namespace, - // with it's content preserved, e.g. 'o:p'. - else if ( tagName.indexOf( ':' ) != -1 && tagName.indexOf( 'cke' ) == -1 ) { - element.filterChildren( filter ); - - // Restore image real link from vml. - if ( tagName == 'v:imagedata' ) { - var href = element.attributes[ 'o:href' ]; - if ( href ) - element.attributes.src = href; - element.name = 'img'; - return; - } - delete element.name; - } - - // Assembling list items into a whole list. - if ( tagName in listDtdParents ) { - element.filterChildren( filter ); - assembleList( element ); - } - }, - - // We'll drop any style sheet, but Firefox conclude - // certain styles in a single style element, which are - // required to be changed into inline ones. - 'style': function( element ) { - if ( CKEDITOR.env.gecko ) { - // Grab only the style definition section. - var styleDefSection = element.onlyChild().value.match( /\/\* Style Definitions \*\/([\s\S]*?)\/\*/ ), - styleDefText = styleDefSection && styleDefSection[ 1 ], - rules = {}; // Storing the parsed result. - - if ( styleDefText ) { - styleDefText - // Remove line-breaks. - .replace( /[\n\r]/g, '' ) - // Extract selectors and style properties. - .replace( /(.+?)\{(.+?)\}/g, function( rule, selectors, styleBlock ) { - selectors = selectors.split( ',' ); - var length = selectors.length, - selector; - for ( var i = 0; i < length; i++ ) { - // Assume MS-Word mostly generate only simple - // selector( [Type selector][Class selector]). - CKEDITOR.tools.trim( selectors[ i ] ).replace( /^(\w+)(\.[\w-]+)?$/g, function( match, tagName, className ) { - tagName = tagName || '*'; - className = className.substring( 1, className.length ); - - // Reject MS-Word Normal styles. - if ( className.match( /MsoNormal/ ) ) - return; - - if ( !rules[ tagName ] ) - rules[ tagName ] = {}; - if ( className ) - rules[ tagName ][ className ] = styleBlock; - else - rules[ tagName ] = styleBlock; - } ); - } - } ); - - filters.applyStyleFilter = function( element ) { - var name = rules[ '*' ] ? '*' : element.name, - className = element.attributes && element.attributes[ 'class' ], - style; - if ( name in rules ) { - style = rules[ name ]; - if ( typeof style == 'object' ) - style = style[ className ]; - // Maintain style rules priorities. - style && element.addStyle( style, true ); - } - }; - } - } - return false; - }, - - 'p': function( element ) { - // A a fall-back approach to resolve list item in browsers - // that doesn't include "mso-list:Ignore" on list bullets, - // note it's not perfect as not all list style (e.g. "heading list") is shipped - // with this pattern. (#6662) - if ( ( /MsoListParagraph/i ).exec( element.attributes[ 'class' ] ) || element.getStyle( 'mso-list' ) ) { - var bulletText = element.firstChild( function( node ) { - return node.type == CKEDITOR.NODE_TEXT && !containsNothingButSpaces( node.parent ); - } ); - - var bullet = bulletText && bulletText.parent; - if ( bullet ) - bullet.addStyle( 'mso-list', 'Ignore' ); - - } - - element.filterChildren( filter ); - - // Is the paragraph actually a list item? - if ( resolveListItem( element ) ) - return; - - // Adapt paragraph formatting to editor's convention - // according to enter-mode. - if ( config.enterMode == CKEDITOR.ENTER_BR ) { - // We suffer from attribute/style lost in this situation. - delete element.name; - element.add( new CKEDITOR.htmlParser.element( 'br' ) ); - } else - elementMigrateFilter( config[ 'format_' + ( config.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ] )( element ); - }, - - 'div': function( element ) { - // Aligned table with no text surrounded is represented by a wrapper div, from which - // table cells inherit as text-align styles, which is wrong. - // Instead we use a clear-float div after the table to properly achieve the same layout. - var singleChild = element.onlyChild(); - if ( singleChild && singleChild.name == 'table' ) { - var attrs = element.attributes; - singleChild.attributes = CKEDITOR.tools.extend( singleChild.attributes, attrs ); - attrs.style && singleChild.addStyle( attrs.style ); - - var clearFloatDiv = new CKEDITOR.htmlParser.element( 'div' ); - clearFloatDiv.addStyle( 'clear', 'both' ); - element.add( clearFloatDiv ); - delete element.name; - } - }, - - 'td': function( element ) { - // 'td' in 'thead' is actually
. - if ( element.getAncestor( 'thead' ) ) - element.name = 'th'; - }, - - // MS-Word sometimes present list as a mixing of normal list - // and pseudo-list, normalize the previous ones into pseudo form. - 'ol': flattenList, - 'ul': flattenList, - 'dl': flattenList, - - 'font': function( element ) { - // Drop the font tag if it comes from list bullet text. - if ( isListBulletIndicator( element.parent ) ) { - delete element.name; - return; - } - - element.filterChildren( filter ); - - var attrs = element.attributes, - styleText = attrs.style, - parent = element.parent; - - if ( 'font' == parent.name ) // Merge nested tags. - { - CKEDITOR.tools.extend( parent.attributes, element.attributes ); - styleText && parent.addStyle( styleText ); - delete element.name; - } - // Convert the merged into a span with all attributes preserved. - else { - styleText = styleText || ''; - // IE's having those deprecated attributes, normalize them. - if ( attrs.color ) { - attrs.color != '#000000' && ( styleText += 'color:' + attrs.color + ';' ); - delete attrs.color; - } - if ( attrs.face ) { - styleText += 'font-family:' + attrs.face + ';'; - delete attrs.face; - } - // TODO: Mapping size in ranges of xx-small, - // x-small, small, medium, large, x-large, xx-large. - if ( attrs.size ) { - styleText += 'font-size:' + - ( attrs.size > 3 ? 'large' : ( attrs.size < 3 ? 'small' : 'medium' ) ) + ';'; - delete attrs.size; - } - - element.name = 'span'; - element.addStyle( styleText ); - } - }, - - 'span': function( element ) { - // Remove the span if it comes from list bullet text. - if ( isListBulletIndicator( element.parent ) ) - return false; - - element.filterChildren( filter ); - if ( containsNothingButSpaces( element ) ) { - delete element.name; - return null; - } - - // List item bullet type is supposed to be indicated by - // the text of a span with style 'mso-list : Ignore' or an image. - if ( isListBulletIndicator( element ) ) { - var listSymbolNode = element.firstChild( function( node ) { - return node.value || node.name == 'img'; - } ); - - var listSymbol = listSymbolNode && ( listSymbolNode.value || 'l.' ), - listType = listSymbol && listSymbol.match( /^(?:[(]?)([^\s]+?)([.)]?)$/ ); - - if ( listType ) { - var marker = createListBulletMarker( listType, listSymbol ); - // Some non-existed list items might be carried by an inconsequential list, indicate by "mso-hide:all/display:none", - // those are to be removed later, now mark it with "cke:ignored". - var ancestor = element.getAncestor( 'span' ); - if ( ancestor && ( / mso-hide:\s*all|display:\s*none / ).test( ancestor.attributes.style ) ) - marker.attributes[ 'cke:ignored' ] = 1; - return marker; - } - } - - // Update the src attribute of image element with href. - var children = element.children, - attrs = element.attributes, - styleText = attrs && attrs.style, - firstChild = children && children[ 0 ]; - - // Assume MS-Word mostly carry font related styles on , - // adapting them to editor's convention. - if ( styleText ) { - attrs.style = stylesFilter( [ - // Drop 'inline-height' style which make lines overlapping. - [ 'line-height' ], - [ ( /^font-family$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'font_style' ], 'family' ) : null ], - [ ( /^font-size$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'fontSize_style' ], 'size' ) : null ], - [ ( /^color$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'colorButton_foreStyle' ], 'color' ) : null ], - [ ( /^background-color$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'colorButton_backStyle' ], 'color' ) : null ] - ] )( styleText, element ) || ''; - } - - if ( !attrs.style ) - delete attrs.style; - - if ( CKEDITOR.tools.isEmpty( attrs ) ) - delete element.name; - - return null; - }, - - // Migrate basic style formats to editor configured ones. - b: elementMigrateFilter( config[ 'coreStyles_bold' ] ), - i: elementMigrateFilter( config[ 'coreStyles_italic' ] ), - u: elementMigrateFilter( config[ 'coreStyles_underline' ] ), - s: elementMigrateFilter( config[ 'coreStyles_strike' ] ), - sup: elementMigrateFilter( config[ 'coreStyles_superscript' ] ), - sub: elementMigrateFilter( config[ 'coreStyles_subscript' ] ), - - // Remove full paths from links to anchors. - a: function( element ) { - var attrs = element.attributes; - if ( attrs.href && attrs.href.match( /^file:\/\/\/[\S]+#/i ) ) - attrs.href = attrs.href.replace( /^file:\/\/\/[^#]+/i, '' ); - }, - - 'cke:listbullet': function( element ) { - if ( element.getAncestor( /h\d/ ) && !config.pasteFromWordNumberedHeadingToList ) - delete element.name; - } - }, - - attributeNames: [ - // Remove onmouseover and onmouseout events (from MS Word comments effect) - [ ( /^onmouse(:?out|over)/ ), '' ], - // Onload on image element. - [ ( /^onload$/ ), '' ], - // Remove office and vml attribute from elements. - [ ( /(?:v|o):\w+/ ), '' ], - // Remove lang/language attributes. - [ ( /^lang/ ), '' ] - ], - - attributes: { - 'style': stylesFilter( removeStyles ? - // Provide a white-list of styles that we preserve, those should - // be the ones that could later be altered with editor tools. - [ - // Leave list-style-type - [ ( /^list-style-type$/ ), null ], - - // Preserve margin-left/right which used as default indent style in the editor. - [ ( /^margin$|^margin-(?!bottom|top)/ ), null, function( value, element, name ) { - if ( element.name in { p: 1, div: 1 } ) { - var indentStyleName = config.contentsLangDirection == 'ltr' ? 'margin-left' : 'margin-right'; - - // Extract component value from 'margin' shorthand. - if ( name == 'margin' ) - value = getStyleComponents( name, value, [ indentStyleName ] )[ indentStyleName ]; - else if ( name != indentStyleName ) - return null; - - if ( value && !emptyMarginRegex.test( value ) ) - return [ indentStyleName, value ]; - } - - return null; - } ], - - // Preserve clear float style. - [ ( /^clear$/ ) ], - - [ ( /^border.*|margin.*|vertical-align|float$/ ), null, function( value, element ) { - if ( element.name == 'img' ) - return value; - } ], - - [ ( /^width|height$/ ), null, function( value, element ) { - if ( element.name in { table: 1, td: 1, th: 1, img: 1 } ) - return value; - } ] - ] : - // Otherwise provide a black-list of styles that we remove. - [ - [ ( /^mso-/ ) ], - // Fixing color values. - [ ( /-color$/ ), null, function( value ) { - if ( value == 'transparent' ) - return false; - if ( CKEDITOR.env.gecko ) - return value.replace( /-moz-use-text-color/g, 'transparent' ); - } ], - // Remove empty margin values, e.g. 0.00001pt 0em 0pt - [ ( /^margin$/ ), emptyMarginRegex ], - [ 'text-indent', '0cm' ], - [ 'page-break-before' ], - [ 'tab-stops' ], - [ 'display', 'none' ], - removeFontStyles ? [ ( /font-?/ ) ] : null - ], removeStyles ), - - // Prefer width styles over 'width' attributes. - 'width': function( value, element ) { - if ( element.name in dtd.$tableContent ) - return false; - }, - // Prefer border styles over table 'border' attributes. - 'border': function( value, element ) { - if ( element.name in dtd.$tableContent ) - return false; - }, - - // Only Firefox carry style sheet from MS-Word, which - // will be applied by us manually. For other browsers - // the css className is useless. - 'class': falsyFilter, - - // MS-Word always generate 'background-color' along with 'bgcolor', - // simply drop the deprecated attributes. - 'bgcolor': falsyFilter, - - // Deprecate 'valign' attribute in favor of 'vertical-align'. - 'valign': removeStyles ? falsyFilter : function( value, element ) { - element.addStyle( 'vertical-align', value ); - return false; - } - }, - - // Fore none-IE, some useful data might be buried under these IE-conditional - // comments where RegExp were the right approach to dig them out where usual approach - // is transform it into a fake element node which hold the desired data. - comment: !CKEDITOR.env.ie ? function( value, node ) { - var imageInfo = value.match( // ), - listInfo = value.match( /^\[if !supportLists\]([\s\S]*?)\[endif\]$/ ); - - // Seek for list bullet indicator. - if ( listInfo ) { - // Bullet symbol could be either text or an image. - var listSymbol = listInfo[ 1 ] || ( imageInfo && 'l.' ), - listType = listSymbol && listSymbol.match( />(?:[(]?)([^\s]+?)([.)]?) element in conditional comments for Firefox. - if ( CKEDITOR.env.gecko && imageInfo ) { - var img = CKEDITOR.htmlParser.fragment.fromHtml( imageInfo[ 0 ] ).children[ 0 ], - previousComment = node.previous, - // Try to dig the real image link from vml markup from previous comment text. - imgSrcInfo = previousComment && previousComment.value.match( /]*o:href=['"](.*?)['"]/ ), - imgSrc = imgSrcInfo && imgSrcInfo[ 1 ]; - - // Is there a real 'src' url to be used? - imgSrc && ( img.attributes.src = imgSrc ); - return img; - } - - return false; - } : falsyFilter - }; - } - } ); - - // The paste processor here is just a reduced copy of html data processor. - var pasteProcessor = function() { - this.dataFilter = new CKEDITOR.htmlParser.filter(); - }; - - pasteProcessor.prototype = { - toHtml: function( data ) { - var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data ), - writer = new CKEDITOR.htmlParser.basicWriter(); - - fragment.writeHtml( writer, this.dataFilter ); - return writer.getHtml( true ); - } - }; - - CKEDITOR.cleanWord = function( data, editor ) { - // Firefox will be confused by those downlevel-revealed IE conditional - // comments, fixing them first( convert it to upperlevel-revealed one ). - // e.g. ... - if ( CKEDITOR.env.gecko ) - data = data.replace( /(([\S\s]*?))/gi, '$1$2$3' ); - - // #9456 - Webkit doesn't wrap list number with span, which is crucial for filter to recognize list. - // - //

- // - // 3.       - // Test3 - //

- // - // Transform to: - // - //

- // - // - // 3.       - // - // Test3 - //

- if ( CKEDITOR.env.webkit ) - data = data.replace( /(class="MsoListParagraph[^>]+>)([^<]+)()/gi, '$1$2$3' ); - - var dataProcessor = new pasteProcessor(), - dataFilter = dataProcessor.dataFilter; - - // These rules will have higher priorities than default ones. - dataFilter.addRules( CKEDITOR.plugins.pastefromword.getRules( editor, dataFilter ) ); - - // Allow extending data filter rules. - editor.fire( 'beforeCleanWord', { filter: dataFilter } ); - - try { - data = dataProcessor.toHtml( data ); - } catch ( e ) { - alert( editor.lang.pastefromword.error ); - } - - // Below post processing those things that are unable to delivered by filter rules. - - // Remove 'cke' namespaced attribute used in filter rules as marker. - data = data.replace( /cke:.*?".*?"/g, '' ); - - // Remove empty style attribute. - data = data.replace( /style=""/g, '' ); - - // Remove the dummy spans ( having no inline style ). - data = data.replace( //g, '' ); - - return data; - }; -} )(); - -/** - * Whether to ignore all font related formatting styles, including: - * - * * font size; - * * font family; - * * font foreground/background color. - * - * config.pasteFromWordRemoveFontStyles = false; - * - * @since 3.1 - * @cfg {Boolean} [pasteFromWordRemoveFontStyles=true] - * @member CKEDITOR.config - */ - -/** - * Whether to transform MS Word outline numbered headings into lists. - * - * config.pasteFromWordNumberedHeadingToList = true; - * - * @since 3.1 - * @cfg {Boolean} [pasteFromWordNumberedHeadingToList=false] - * @member CKEDITOR.config - */ - -/** - * Whether to remove element styles that can't be managed with the editor. Note - * that this doesn't handle the font specific styles, which depends on the - * {@link #pasteFromWordRemoveFontStyles} setting instead. - * - * config.pasteFromWordRemoveStyles = false; - * - * @since 3.1 - * @cfg {Boolean} [pasteFromWordRemoveStyles=true] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/hidpi/pastefromword-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/hidpi/pastefromword-rtl.png deleted file mode 100644 index 142bd569526..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/hidpi/pastefromword-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/hidpi/pastefromword.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/hidpi/pastefromword.png deleted file mode 100644 index ac043cddb89..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/hidpi/pastefromword.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/pastefromword-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/pastefromword-rtl.png deleted file mode 100644 index 7b69c5550c3..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/pastefromword-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/pastefromword.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/pastefromword.png deleted file mode 100644 index 61a0ae43f58..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/icons/pastefromword.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/af.js deleted file mode 100644 index 8bc74995ab4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/af.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'af', { - confirmCleanup: 'Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?', - error: 'Die geplakte teks kon nie skoongemaak word nie, weens \'n interne fout', - title: 'Plak vanuit Word', - toolbar: 'Plak vanuit Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ar.js deleted file mode 100644 index b76b67310a9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ar.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ar', { - confirmCleanup: 'يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟', - error: 'لم يتم مسح المعلومات الملصقة لخلل داخلي', - title: 'لصق من وورد', - toolbar: 'لصق من وورد' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bg.js deleted file mode 100644 index 4e3242615c6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bg.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'bg', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Вмъкни от MS Word', - toolbar: 'Вмъкни от MS Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bn.js deleted file mode 100644 index b08873c394c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bn.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'bn', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'পেস্ট (শব্দ)', - toolbar: 'পেস্ট (শব্দ)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bs.js deleted file mode 100644 index b97009ff974..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/bs.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'bs', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Zalijepi iz Word-a', - toolbar: 'Zalijepi iz Word-a' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ca.js deleted file mode 100644 index 4691df182ca..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ca.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ca', { - confirmCleanup: 'El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?', - error: 'No ha estat possible netejar les dades enganxades degut a un error intern', - title: 'Enganxa des del Word', - toolbar: 'Enganxa des del Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/cs.js deleted file mode 100644 index c88d752cfe5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/cs.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'cs', { - confirmCleanup: 'Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?', - error: 'Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.', - title: 'Vložit z Wordu', - toolbar: 'Vložit z Wordu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/cy.js deleted file mode 100644 index ccb22d92ddc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/cy.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'cy', { - confirmCleanup: 'Mae\'r testun rydych chi am ludo wedi\'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?', - error: 'Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol', - title: 'Gludo o Word', - toolbar: 'Gludo o Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/da.js deleted file mode 100644 index cb9cf93a48e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/da.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'da', { - confirmCleanup: 'Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?', - error: 'Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl', - title: 'Indsæt fra Word', - toolbar: 'Indsæt fra Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/de.js deleted file mode 100644 index 79edb2ecb95..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/de.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'de', { - confirmCleanup: 'Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?', - error: 'Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen', - title: 'Aus MS-Word einfügen', - toolbar: 'Aus MS-Word einfügen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/el.js deleted file mode 100644 index 456acc8f61c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/el.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'el', { - confirmCleanup: 'Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;', - error: 'Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος', - title: 'Επικόλληση από το Word', - toolbar: 'Επικόλληση από το Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-au.js deleted file mode 100644 index 6f67a542be8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-au.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'en-au', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Paste from Word', - toolbar: 'Paste from Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-ca.js deleted file mode 100644 index a3a528aeb5c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-ca.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'en-ca', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Paste from Word', - toolbar: 'Paste from Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-gb.js deleted file mode 100644 index 3648d257bf5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en-gb.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'en-gb', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', - error: 'It was not possible to clean up the pasted data due to an internal error', - title: 'Paste from Word', - toolbar: 'Paste from Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en.js deleted file mode 100644 index d484c6a4aa8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/en.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'en', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', - error: 'It was not possible to clean up the pasted data due to an internal error', - title: 'Paste from Word', - toolbar: 'Paste from Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/eo.js deleted file mode 100644 index e1a588fac22..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/eo.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'eo', { - confirmCleanup: 'La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?', - error: 'Ne eblis purigi la intergluitajn datenojn pro interna eraro', - title: 'Interglui el Word', - toolbar: 'Interglui el Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/es.js deleted file mode 100644 index e7220a9ee7f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/es.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'es', { - confirmCleanup: 'El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?', - error: 'No ha sido posible limpiar los datos debido a un error interno', - title: 'Pegar desde Word', - toolbar: 'Pegar desde Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/et.js deleted file mode 100644 index c2f694e76a9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/et.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'et', { - confirmCleanup: 'Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?', - error: 'Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik', - title: 'Asetamine Wordist', - toolbar: 'Asetamine Wordist' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/eu.js deleted file mode 100644 index 769d0f66ec4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/eu.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'eu', { - confirmCleanup: 'Itsatsi nahi duzun testua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?', - error: 'Barneko errore bat dela eta ezin izan da testua garbitu', - title: 'Itsatsi Word-etik', - toolbar: 'Itsatsi Word-etik' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fa.js deleted file mode 100644 index 6893a0141db..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fa.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'fa', { - confirmCleanup: 'متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟', - error: 'به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.', - title: 'چسباندن از Word', - toolbar: 'چسباندن از Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fi.js deleted file mode 100644 index 994988a5b26..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fi.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'fi', { - confirmCleanup: 'Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)', - error: 'Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia', - title: 'Liitä Word-dokumentista', - toolbar: 'Liitä Word-dokumentista' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fo.js deleted file mode 100644 index 6ae4a08d6b4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fo.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'fo', { - confirmCleanup: 'Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?', - error: 'Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil', - title: 'Innrita frá Word', - toolbar: 'Innrita frá Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fr-ca.js deleted file mode 100644 index 4e0b2c32f62..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fr-ca.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'fr-ca', { - confirmCleanup: 'Le texte que vous tentez de coller semble provenir de Word. Désirez vous le nettoyer avant de coller?', - error: 'Il n\'a pas été possible de nettoyer les données collées du à une erreur interne', - title: 'Coller de Word', - toolbar: 'Coller de Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fr.js deleted file mode 100644 index 92e5b9f2c27..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/fr.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'fr', { - confirmCleanup: 'Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?', - error: 'Il n\'a pas été possible de nettoyer les données collées à la suite d\'une erreur interne.', - title: 'Coller depuis Word', - toolbar: 'Coller depuis Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/gl.js deleted file mode 100644 index e0402c94711..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/gl.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'gl', { - confirmCleanup: 'O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?', - error: 'Non foi posíbel depurar os datos pegados por mor dun erro interno', - title: 'Pegar desde Word', - toolbar: 'Pegar desde Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/gu.js deleted file mode 100644 index bbc9830c2c3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/gu.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'gu', { - confirmCleanup: 'તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?', - error: 'પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.', - title: 'પેસ્ટ (વડૅ ટેક્સ્ટ)', - toolbar: 'પેસ્ટ (વડૅ ટેક્સ્ટ)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/he.js deleted file mode 100644 index f7249692539..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/he.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'he', { - confirmCleanup: 'נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?', - error: 'לא ניתן היה לנקות את המידע בשל תקלה פנימית.', - title: 'הדבקה מ-Word', - toolbar: 'הדבקה מ-Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hi.js deleted file mode 100644 index 138f8420986..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hi.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'hi', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'पेस्ट (वर्ड से)', - toolbar: 'पेस्ट (वर्ड से)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hr.js deleted file mode 100644 index 4b9909790e4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hr.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'hr', { - confirmCleanup: 'Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?', - error: 'Nije moguće očistiti podatke za ljepljenje zbog interne greške', - title: 'Zalijepi iz Worda', - toolbar: 'Zalijepi iz Worda' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hu.js deleted file mode 100644 index 91d62d2770d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/hu.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'hu', { - confirmCleanup: 'Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)', - error: 'Egy belső hiba miatt nem sikerült megtisztítani a szöveget', - title: 'Beillesztés Word-ből', - toolbar: 'Beillesztés Word-ből' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/id.js deleted file mode 100644 index f55f762e653..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/id.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'id', { - confirmCleanup: 'Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?', - error: 'Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal', - title: 'Tempel dari Word', - toolbar: 'Tempel dari Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/is.js deleted file mode 100644 index 0e506040ddd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/is.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'is', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Líma úr Word', - toolbar: 'Líma úr Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/it.js deleted file mode 100644 index f3d59e0210e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/it.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'it', { - confirmCleanup: 'Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?', - error: 'Non è stato possibile eliminare il testo incollato a causa di un errore interno.', - title: 'Incolla da Word', - toolbar: 'Incolla da Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ja.js deleted file mode 100644 index 051375db221..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ja.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ja', { - confirmCleanup: '貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？', - error: '内部エラーにより貼り付けたデータをクリアできませんでした', - title: 'ワード文章から貼り付け', - toolbar: 'ワード文章から貼り付け' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ka.js deleted file mode 100644 index 0f84dc0661a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ka.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ka', { - confirmCleanup: 'ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?', - error: 'შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა', - title: 'ვორდიდან ჩასმა', - toolbar: 'ვორდიდან ჩასმა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/km.js deleted file mode 100644 index a3f6c200c49..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/km.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'km', { - confirmCleanup: 'អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?', - error: 'ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់', - title: 'បិទ​ភ្ជាប់​ពី Word', - toolbar: 'បិទ​ភ្ជាប់​ពី Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ko.js deleted file mode 100644 index fa47e8fcde5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ko.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ko', { - confirmCleanup: '붙여 넣기 할 텍스트는 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 MS Word 포멧을 삭제 하시겠습니까?', - error: '내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.', - title: 'MS Word 형식에서 붙여넣기', - toolbar: 'MS Word 형식에서 붙여넣기' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ku.js deleted file mode 100644 index a32b856cfe9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ku.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ku', { - confirmCleanup: 'ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟', - error: 'هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی', - title: 'لکاندنی لەلایەن Word', - toolbar: 'لکاندنی لەڕێی Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/lt.js deleted file mode 100644 index 3acd2a0a940..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/lt.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'lt', { - confirmCleanup: 'Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?', - error: 'Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto', - title: 'Įdėti iš Word', - toolbar: 'Įdėti iš Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/lv.js deleted file mode 100644 index 3ebbcaf5b1f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/lv.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'lv', { - confirmCleanup: 'Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?', - error: 'Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.', - title: 'Ievietot no Worda', - toolbar: 'Ievietot no Worda' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/mk.js deleted file mode 100644 index c0e68ffedcc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/mk.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'mk', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Paste from Word', // MISSING - toolbar: 'Paste from Word' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/mn.js deleted file mode 100644 index c444adc61e4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/mn.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'mn', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Word-оос буулгах', - toolbar: 'Word-оос буулгах' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ms.js deleted file mode 100644 index 6b41567693b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ms.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ms', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Tampal dari Word', - toolbar: 'Tampal dari Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/nb.js deleted file mode 100644 index ec74628bfb4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/nb.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'nb', { - confirmCleanup: 'Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?', - error: 'Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil', - title: 'Lim inn fra Word', - toolbar: 'Lim inn fra Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/nl.js deleted file mode 100644 index 2845e6886b8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/nl.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'nl', { - confirmCleanup: 'De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?', - error: 'Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout', - title: 'Plakken vanuit Word', - toolbar: 'Plakken vanuit Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/no.js deleted file mode 100644 index 4dc5f7e1450..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/no.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'no', { - confirmCleanup: 'Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?', - error: 'Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil', - title: 'Lim inn fra Word', - toolbar: 'Lim inn fra Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pl.js deleted file mode 100644 index 7bfdca4d599..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pl.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'pl', { - confirmCleanup: 'Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?', - error: 'Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.', - title: 'Wklej z programu MS Word', - toolbar: 'Wklej z programu MS Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pt-br.js deleted file mode 100644 index 04bf4933917..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pt-br.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'pt-br', { - confirmCleanup: 'O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?', - error: 'Não foi possível limpar os dados colados devido a um erro interno', - title: 'Colar do Word', - toolbar: 'Colar do Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pt.js deleted file mode 100644 index 120fd58669c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/pt.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'pt', { - confirmCleanup: 'O texto que pretende colar parece ter sido copiado do Word. Deseja limpá-lo antes de colar?', - error: 'Não foi possivel limpar a informação colada decido a um erro interno.', - title: 'Colar do Word', - toolbar: 'Colar do Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ro.js deleted file mode 100644 index 6fdcaee78bd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ro.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ro', { - confirmCleanup: 'Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?', - error: 'Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne', - title: 'Adaugă din Word', - toolbar: 'Adaugă din Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ru.js deleted file mode 100644 index 75ac456082d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ru.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ru', { - confirmCleanup: 'Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?', - error: 'Невозможно очистить вставленные данные из-за внутренней ошибки', - title: 'Вставить из Word', - toolbar: 'Вставить из Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/si.js deleted file mode 100644 index 7d4074edb59..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/si.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'si', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'වචන වලින් අලවන්න', - toolbar: 'වචන වලින් අලවන්න' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sk.js deleted file mode 100644 index 4d295d0818d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sk.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'sk', { - confirmCleanup: 'Vkladaný text vyzerá byť skopírovaný z Wordu. Chcete ho automaticky vyčistiť pred vkladaním?', - error: 'Nebolo možné vyčistiť vložené dáta kvôli internej chybe', - title: 'Vložiť z Wordu', - toolbar: 'Vložiť z Wordu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sl.js deleted file mode 100644 index 970ae9cc9ea..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sl.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'sl', { - confirmCleanup: 'Besedilo, ki ga želite prilepiti je kopirano iz Word-a. Ali ga želite očistiti, preden ga prilepite?', - error: 'Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake', - title: 'Prilepi iz Worda', - toolbar: 'Prilepi iz Worda' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sq.js deleted file mode 100644 index 6112fb45677..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sq.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'sq', { - confirmCleanup: 'Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?', - error: 'Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm', - title: 'Hidhe nga Word-i', - toolbar: 'Hidhe nga Word-i' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sr-latn.js deleted file mode 100644 index 3161dabb68e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sr-latn.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'sr-latn', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Zalepi iz Worda', - toolbar: 'Zalepi iz Worda' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sr.js deleted file mode 100644 index fb444b9c065..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sr.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'sr', { - confirmCleanup: 'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?', // MISSING - error: 'It was not possible to clean up the pasted data due to an internal error', // MISSING - title: 'Залепи из Worda', - toolbar: 'Залепи из Worda' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sv.js deleted file mode 100644 index 89ea3d6a74d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/sv.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'sv', { - confirmCleanup: 'Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?', - error: 'Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel', - title: 'Klistra in från Word', - toolbar: 'Klistra in från Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/th.js deleted file mode 100644 index d15e8d5c893..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/th.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'th', { - confirmCleanup: 'ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?', - error: 'ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ', - title: 'วางสำเนาจากตัวอักษรเวิร์ด', - toolbar: 'วางสำเนาจากตัวอักษรเวิร์ด' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/tr.js deleted file mode 100644 index 2af6518db55..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/tr.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'tr', { - confirmCleanup: 'Yapıştırmaya çalıştığınız metin Word\'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?', - error: 'Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir', - title: 'Word\'den Yapıştır', - toolbar: 'Word\'den Yapıştır' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ug.js deleted file mode 100644 index da221441f97..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/ug.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'ug', { - confirmCleanup: 'سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟', - error: 'ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ', - title: 'MS Word تىن چاپلا', - toolbar: 'MS Word تىن چاپلا' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/uk.js deleted file mode 100644 index a73d07c3fba..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/uk.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'uk', { - confirmCleanup: 'Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?', - error: 'Неможливо очистити форматування через внутрішню помилку.', - title: 'Вставити з Word', - toolbar: 'Вставити з Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/vi.js deleted file mode 100644 index bde635463fd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/vi.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'vi', { - confirmCleanup: 'Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?', - error: 'Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ', - title: 'Dán với định dạng Word', - toolbar: 'Dán với định dạng Word' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/zh-cn.js deleted file mode 100644 index 653cb18da3a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/zh-cn.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'zh-cn', { - confirmCleanup: '您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？', - error: '由于内部错误无法清理要粘贴的数据', - title: '从 MS Word 粘贴', - toolbar: '从 MS Word 粘贴' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/zh.js deleted file mode 100644 index 53274b58a6a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/lang/zh.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastefromword', 'zh', { - confirmCleanup: '您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？', - error: '由於發生內部錯誤，無法清除清除 Word 的格式。', - title: '自 Word 貼上', - toolbar: '自 Word 貼上' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/plugin.js deleted file mode 100644 index 169ad65a719..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastefromword/plugin.js +++ /dev/null @@ -1,145 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -( function() { - CKEDITOR.plugins.add( 'pastefromword', { - requires: 'clipboard', - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'pastefromword,pastefromword-rtl', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - var commandName = 'pastefromword', - // Flag indicate this command is actually been asked instead of a generic pasting. - forceFromWord = 0, - path = this.path; - - editor.addCommand( commandName, { - // Snapshots are done manually by editable.insertXXX methods. - canUndo: false, - async: true, - - exec: function( editor ) { - var cmd = this; - - forceFromWord = 1; - // Force html mode for incomming paste events sequence. - editor.once( 'beforePaste', forceHtmlMode ); - - editor.getClipboardData( { title: editor.lang.pastefromword.title }, function( data ) { - // Do not use editor#paste, because it would start from beforePaste event. - data && editor.fire( 'paste', { type: 'html', dataValue: data.dataValue } ); - - editor.fire( 'afterCommandExec', { - name: commandName, - command: cmd, - returnValue: !!data - } ); - } ); - } - } ); - - // Register the toolbar button. - editor.ui.addButton && editor.ui.addButton( 'PasteFromWord', { - label: editor.lang.pastefromword.toolbar, - command: commandName, - toolbar: 'clipboard,50' - } ); - - editor.on( 'pasteState', function( evt ) { - editor.getCommand( commandName ).setState( evt.data ); - } ); - - // Features bring by this command beside the normal process: - // 1. No more bothering of user about the clean-up. - // 2. Perform the clean-up even if content is not from MS-Word. - // (e.g. from a MS-Word similar application.) - // 3. Listen with high priority (3), so clean up is done before content - // type sniffing (priority = 6). - editor.on( 'paste', function( evt ) { - var data = evt.data, - mswordHtml = data.dataValue; - - // MS-WORD format sniffing. - if ( mswordHtml && ( forceFromWord || ( /(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/ ).test( mswordHtml ) ) ) { - // If filter rules aren't loaded then cancel 'paste' event, - // load them and when they'll get loaded fire new paste event - // for which data will be filtered in second execution of - // this listener. - var isLazyLoad = loadFilterRules( editor, path, function() { - // Event continuation with the original data. - if ( isLazyLoad ) - editor.fire( 'paste', data ); - else if ( !editor.config.pasteFromWordPromptCleanup || ( forceFromWord || confirm( editor.lang.pastefromword.confirmCleanup ) ) ) - data.dataValue = CKEDITOR.cleanWord( mswordHtml, editor ); - - } ); - - // The cleanup rules are to be loaded, we should just cancel - // this event. - isLazyLoad && evt.cancel(); - } - }, null, null, 3 ); - - function resetFromWord( evt ) { - evt && evt.removeListener(); - editor.removeListener( 'beforePaste', forceHtmlMode ); - forceFromWord && setTimeout( function() { - forceFromWord = 0; - }, 0 ); - } - } - - } ); - - function loadFilterRules( editor, path, callback ) { - var isLoaded = CKEDITOR.cleanWord; - - if ( isLoaded ) - callback(); - else { - var filterFilePath = CKEDITOR.getUrl( editor.config.pasteFromWordCleanupFile || ( path + 'filter/default.js' ) ); - - // Load with busy indicator. - CKEDITOR.scriptLoader.load( filterFilePath, callback, null, true ); - } - - return !isLoaded; - } - - function forceHtmlMode( evt ) { - evt.data.type = 'html'; - } -} )(); - - -/** - * Whether to prompt the user about the clean up of content being pasted from MS Word. - * - * config.pasteFromWordPromptCleanup = true; - * - * @since 3.1 - * @cfg {Boolean} [pasteFromWordPromptCleanup=false] - * @member CKEDITOR.config - */ - -/** - * The file that provides the MS Word cleanup function for pasting operations. - * - * **Note:** This is a global configuration shared by all editor instances present - * in the page. - * - * // Load from 'pastefromword' plugin 'filter' sub folder (custom.js file) using path relative to CKEditor installation folder. - * CKEDITOR.config.pasteFromWordCleanupFile = 'plugins/pastefromword/filter/custom.js'; - * - * // Load from 'pastefromword' plugin 'filter' sub folder (custom.js file) using full path (including CKEditor installation folder). - * CKEDITOR.config.pasteFromWordCleanupFile = '/ckeditor/plugins/pastefromword/filter/custom.js'; - * - * // Load custom.js file from 'customFilerts' folder (located in server's root) using full URL. - * CKEDITOR.config.pasteFromWordCleanupFile = 'http://my.example.com/customFilerts/custom.js'; - * - * @since 3.1 - * @cfg {String} [pasteFromWordCleanupFile= + 'filter/default.js'] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/hidpi/pastetext-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/hidpi/pastetext-rtl.png deleted file mode 100644 index 35354a5f8d9..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/hidpi/pastetext-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/hidpi/pastetext.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/hidpi/pastetext.png deleted file mode 100644 index f82900fa997..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/hidpi/pastetext.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/pastetext-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/pastetext-rtl.png deleted file mode 100644 index 9393b347f19..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/pastetext-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/pastetext.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/pastetext.png deleted file mode 100644 index 20816a4f460..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/icons/pastetext.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/af.js deleted file mode 100644 index a0031f4577a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/af.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'af', { - button: 'Plak as eenvoudige teks', - title: 'Plak as eenvoudige teks' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ar.js deleted file mode 100644 index be045b120ce..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ar.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ar', { - button: 'لصق كنص بسيط', - title: 'لصق كنص بسيط' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bg.js deleted file mode 100644 index 1873d317814..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bg.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'bg', { - button: 'Вмъкни като чист текст', - title: 'Вмъкни като чист текст' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bn.js deleted file mode 100644 index 0e217f9660b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bn.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'bn', { - button: 'সাদা টেক্সট হিসেবে পেস্ট কর', - title: 'সাদা টেক্সট হিসেবে পেস্ট কর' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bs.js deleted file mode 100644 index 02c842c2487..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/bs.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'bs', { - button: 'Zalijepi kao obièan tekst', - title: 'Zalijepi kao obièan tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ca.js deleted file mode 100644 index 4af8c0b5a18..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ca.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ca', { - button: 'Enganxa com a text no formatat', - title: 'Enganxa com a text no formatat' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/cs.js deleted file mode 100644 index e679e39273d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/cs.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'cs', { - button: 'Vložit jako čistý text', - title: 'Vložit jako čistý text' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/cy.js deleted file mode 100644 index 0a43afab9f1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/cy.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'cy', { - button: 'Gludo fel testun plaen', - title: 'Gludo fel Testun Plaen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/da.js deleted file mode 100644 index ca9b276047f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/da.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'da', { - button: 'Indsæt som ikke-formateret tekst', - title: 'Indsæt som ikke-formateret tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/de.js deleted file mode 100644 index e8cfa181f8b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/de.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'de', { - button: 'Als Text einfügen', - title: 'Als Text einfügen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/el.js deleted file mode 100644 index 2cad2123cb4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/el.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'el', { - button: 'Επικόλληση ως απλό κείμενο', - title: 'Επικόλληση ως απλό κείμενο' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-au.js deleted file mode 100644 index 937c84eb674..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-au.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'en-au', { - button: 'Paste as plain text', - title: 'Paste as Plain Text' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-ca.js deleted file mode 100644 index 3a2faf569ae..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-ca.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'en-ca', { - button: 'Paste as plain text', - title: 'Paste as Plain Text' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-gb.js deleted file mode 100644 index 99cea29807d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en-gb.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'en-gb', { - button: 'Paste as plain text', - title: 'Paste as Plain Text' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en.js deleted file mode 100644 index b853dc25706..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/en.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'en', { - button: 'Paste as plain text', - title: 'Paste as Plain Text' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/eo.js deleted file mode 100644 index 4792440d668..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/eo.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'eo', { - button: 'Interglui kiel platan tekston', - title: 'Interglui kiel platan tekston' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/es.js deleted file mode 100644 index 5fd80f62b64..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/es.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'es', { - button: 'Pegar como Texto Plano', - title: 'Pegar como Texto Plano' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/et.js deleted file mode 100644 index 9d43d9f2b0c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/et.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'et', { - button: 'Asetamine tavalise tekstina', - title: 'Asetamine tavalise tekstina' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/eu.js deleted file mode 100644 index c4d57612ee8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/eu.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'eu', { - button: 'Testu Arrunta bezala Itsatsi', - title: 'Testu Arrunta bezala Itsatsi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fa.js deleted file mode 100644 index 3e31061a8e2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fa.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'fa', { - button: 'چسباندن به عنوان متن ساده', - title: 'چسباندن به عنوان متن ساده' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fi.js deleted file mode 100644 index 3fe2c709bf3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fi.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'fi', { - button: 'Liitä tekstinä', - title: 'Liitä tekstinä' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fo.js deleted file mode 100644 index 7b394dd824c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fo.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'fo', { - button: 'Innrita som reinan tekst', - title: 'Innrita som reinan tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fr-ca.js deleted file mode 100644 index 60626a96697..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fr-ca.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'fr-ca', { - button: 'Coller comme texte', - title: 'Coller comme texte' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fr.js deleted file mode 100644 index c554ecb1b56..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/fr.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'fr', { - button: 'Coller comme texte sans mise en forme', - title: 'Coller comme texte sans mise en forme' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/gl.js deleted file mode 100644 index 01523b3157d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/gl.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'gl', { - button: 'Pegar como texto simple', - title: 'Pegar como texto simple' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/gu.js deleted file mode 100644 index 4a464fc3575..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/gu.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'gu', { - button: 'પેસ્ટ (ટેક્સ્ટ)', - title: 'પેસ્ટ (ટેક્સ્ટ)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/he.js deleted file mode 100644 index 767616be1d7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/he.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'he', { - button: 'הדבקה כטקסט פשוט', - title: 'הדבקה כטקסט פשוט' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hi.js deleted file mode 100644 index 78bf6eceac5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hi.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'hi', { - button: 'पेस्ट (सादा टॅक्स्ट)', - title: 'पेस्ट (सादा टॅक्स्ट)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hr.js deleted file mode 100644 index 003470000d4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hr.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'hr', { - button: 'Zalijepi kao čisti tekst', - title: 'Zalijepi kao čisti tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hu.js deleted file mode 100644 index f689a3c3765..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/hu.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'hu', { - button: 'Beillesztés formázatlan szövegként', - title: 'Beillesztés formázatlan szövegként' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/id.js deleted file mode 100644 index 6976336fe1d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/id.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'id', { - button: 'Tempel sebagai teks polos', - title: 'Tempel sebagai Teks Polos' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/is.js deleted file mode 100644 index 99562a4e350..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/is.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'is', { - button: 'Líma sem ósniðinn texta', - title: 'Líma sem ósniðinn texta' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/it.js deleted file mode 100644 index 2ae5140a381..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/it.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'it', { - button: 'Incolla come testo semplice', - title: 'Incolla come testo semplice' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ja.js deleted file mode 100644 index 52f32556813..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ja.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ja', { - button: 'プレーンテキストとして貼り付け', - title: 'プレーンテキストとして貼り付け' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ka.js deleted file mode 100644 index 761a2191f1d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ka.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ka', { - button: 'მხოლოდ ტექსტის ჩასმა', - title: 'მხოლოდ ტექსტის ჩასმა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/km.js deleted file mode 100644 index f77ed641290..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/km.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'km', { - button: 'បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា', - title: 'បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ko.js deleted file mode 100644 index 4cdfeb65c38..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ko.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ko', { - button: '텍스트로 붙여넣기', - title: '텍스트로 붙여넣기' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ku.js deleted file mode 100644 index d5570678e0a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ku.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ku', { - button: 'لکاندنی وەك دەقی ڕوون', - title: 'لکاندنی وەك دەقی ڕوون' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/lt.js deleted file mode 100644 index c7ed2c56c87..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/lt.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'lt', { - button: 'Įdėti kaip gryną tekstą', - title: 'Įdėti kaip gryną tekstą' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/lv.js deleted file mode 100644 index f86582b3ddd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/lv.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'lv', { - button: 'Ievietot kā vienkāršu tekstu', - title: 'Ievietot kā vienkāršu tekstu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/mk.js deleted file mode 100644 index ddf45ca6608..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/mk.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'mk', { - button: 'Paste as plain text', // MISSING - title: 'Paste as Plain Text' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/mn.js deleted file mode 100644 index 9b4fbcd918f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/mn.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'mn', { - button: 'Энгийн бичвэрээр буулгах', - title: 'Энгийн бичвэрээр буулгах' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ms.js deleted file mode 100644 index b1c7c22ab95..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ms.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ms', { - button: 'Tampal sebagai text biasa', - title: 'Tampal sebagai text biasa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/nb.js deleted file mode 100644 index f727779d6c1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/nb.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'nb', { - button: 'Lim inn som ren tekst', - title: 'Lim inn som ren tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/nl.js deleted file mode 100644 index e0c99fd8e84..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/nl.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'nl', { - button: 'Plakken als platte tekst', - title: 'Plakken als platte tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/no.js deleted file mode 100644 index 533d8fd8b67..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/no.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'no', { - button: 'Lim inn som ren tekst', - title: 'Lim inn som ren tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pl.js deleted file mode 100644 index 91670d4e3ec..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pl.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'pl', { - button: 'Wklej jako czysty tekst', - title: 'Wklej jako czysty tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pt-br.js deleted file mode 100644 index 863c07d82cf..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pt-br.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'pt-br', { - button: 'Colar como Texto sem Formatação', - title: 'Colar como Texto sem Formatação' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pt.js deleted file mode 100644 index 9fab63ec778..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/pt.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'pt', { - button: 'Colar como Texto Simples', - title: 'Colar como Texto Simples' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ro.js deleted file mode 100644 index f88013d885f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ro.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ro', { - button: 'Adaugă ca text simplu (Plain Text)', - title: 'Adaugă ca text simplu (Plain Text)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ru.js deleted file mode 100644 index 83457889407..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ru.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ru', { - button: 'Вставить только текст', - title: 'Вставить только текст' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/si.js deleted file mode 100644 index 9ee9c8bd8d0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/si.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'si', { - button: 'සාමාන්‍ය අක්ෂර ලෙස අලවන්න', - title: 'සාමාන්‍ය අක්ෂර ලෙස අලවන්න' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sk.js deleted file mode 100644 index 31d15d0c522..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sk.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'sk', { - button: 'Vložiť ako čistý text', - title: 'Vložiť ako čistý text' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sl.js deleted file mode 100644 index 41240862861..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sl.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'sl', { - button: 'Prilepi kot golo besedilo', - title: 'Prilepi kot golo besedilo' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sq.js deleted file mode 100644 index dca7461bc72..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sq.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'sq', { - button: 'Hidhe si tekst të thjeshtë', - title: 'Hidhe si Tekst të Thjeshtë' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sr-latn.js deleted file mode 100644 index e86bd1af05e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sr-latn.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'sr-latn', { - button: 'Zalepi kao čist tekst', - title: 'Zalepi kao čist tekst' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sr.js deleted file mode 100644 index 4667bd25aaa..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sr.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'sr', { - button: 'Залепи као чист текст', - title: 'Залепи као чист текст' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sv.js deleted file mode 100644 index 9b85b254bc8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/sv.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'sv', { - button: 'Klistra in som vanlig text', - title: 'Klistra in som vanlig text' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/th.js deleted file mode 100644 index 0051e0c374b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/th.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'th', { - button: 'วางแบบตัวอักษรธรรมดา', - title: 'วางแบบตัวอักษรธรรมดา' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/tr.js deleted file mode 100644 index bc9802021ae..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/tr.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'tr', { - button: 'Düz Metin Olarak Yapıştır', - title: 'Düz Metin Olarak Yapıştır' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ug.js deleted file mode 100644 index 64f676a7643..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/ug.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'ug', { - button: 'پىچىمى يوق تېكىست سۈپىتىدە چاپلا', - title: 'پىچىمى يوق تېكىست سۈپىتىدە چاپلا' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/uk.js deleted file mode 100644 index 7767c23f742..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/uk.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'uk', { - button: 'Вставити тільки текст', - title: 'Вставити тільки текст' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/vi.js deleted file mode 100644 index 65a8308b76a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/vi.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'vi', { - button: 'Dán theo định dạng văn bản thuần', - title: 'Dán theo định dạng văn bản thuần' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/zh-cn.js deleted file mode 100644 index d70b88475a7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/zh-cn.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'zh-cn', { - button: '粘贴为无格式文本', - title: '粘贴为无格式文本' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/zh.js deleted file mode 100644 index b8811d7a9c6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/lang/zh.js +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'pastetext', 'zh', { - button: '貼成純文字', - title: '貼成純文字' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/plugin.js deleted file mode 100644 index a9f4bde93b4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/pastetext/plugin.js +++ /dev/null @@ -1,76 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview Paste as plain text plugin. - */ - -( function() { - // The pastetext command definition. - var pasteTextCmd = { - // Snapshots are done manually by editable.insertXXX methods. - canUndo: false, - async: true, - - exec: function( editor ) { - editor.getClipboardData( { title: editor.lang.pastetext.title }, function( data ) { - // Do not use editor#paste, because it would start from beforePaste event. - data && editor.fire( 'paste', { type: 'text', dataValue: data.dataValue } ); - - editor.fire( 'afterCommandExec', { - name: 'pastetext', - command: pasteTextCmd, - returnValue: !!data - } ); - } ); - } - }; - - // Register the plugin. - CKEDITOR.plugins.add( 'pastetext', { - requires: 'clipboard', - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'pastetext,pastetext-rtl', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - var commandName = 'pastetext'; - - editor.addCommand( commandName, pasteTextCmd ); - - editor.ui.addButton && editor.ui.addButton( 'PasteText', { - label: editor.lang.pastetext.button, - command: commandName, - toolbar: 'clipboard,40' - } ); - - if ( editor.config.forcePasteAsPlainText ) { - editor.on( 'beforePaste', function( evt ) { - // Do NOT overwrite if HTML format is explicitly requested. - // This allows pastefromword dominates over pastetext. - if ( evt.data.type != 'html' ) - evt.data.type = 'text'; - } ); - } - - editor.on( 'pasteState', function( evt ) { - editor.getCommand( commandName ).setState( evt.data ); - } ); - } - } ); -} )(); - - -/** - * Whether to force all pasting operations to insert on plain text into the - * editor, loosing any formatting information possibly available in the source - * text. - * - * **Note:** paste from word (dialog) is not affected by this configuration. - * - * config.forcePasteAsPlainText = true; - * - * @cfg {Boolean} [forcePasteAsPlainText=false] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/popup/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/popup/plugin.js deleted file mode 100644 index 7657ede2c96..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/popup/plugin.js +++ /dev/null @@ -1,65 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.add( 'popup' ); - -CKEDITOR.tools.extend( CKEDITOR.editor.prototype, { - /** - * Opens Browser in a popup. The `width` and `height` parameters accept - * numbers (pixels) or percent (of screen size) values. - * - * @member CKEDITOR.editor - * @param {String} url The url of the external file browser. - * @param {Number/String} [width='80%'] Popup window width. - * @param {Number/String} [height='70%'] Popup window height. - * @param {String} [options='location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes'] - * Popup window features. - */ - popup: function( url, width, height, options ) { - width = width || '80%'; - height = height || '70%'; - - if ( typeof width == 'string' && width.length > 1 && width.substr( width.length - 1, 1 ) == '%' ) - width = parseInt( window.screen.width * parseInt( width, 10 ) / 100, 10 ); - - if ( typeof height == 'string' && height.length > 1 && height.substr( height.length - 1, 1 ) == '%' ) - height = parseInt( window.screen.height * parseInt( height, 10 ) / 100, 10 ); - - if ( width < 640 ) - width = 640; - - if ( height < 420 ) - height = 420; - - var top = parseInt( ( window.screen.height - height ) / 2, 10 ), - left = parseInt( ( window.screen.width - width ) / 2, 10 ); - - options = ( options || 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes' ) + ',width=' + width + - ',height=' + height + - ',top=' + top + - ',left=' + left; - - var popupWindow = window.open( '', null, options, true ); - - // Blocked by a popup blocker. - if ( !popupWindow ) - return false; - - try { - // Chrome is problematic with moveTo/resizeTo, but it's not really needed here (#8855). - var ua = navigator.userAgent.toLowerCase(); - if ( ua.indexOf( ' chrome/' ) == -1 ) { - popupWindow.moveTo( left, top ); - popupWindow.resizeTo( width, height ); - } - popupWindow.focus(); - popupWindow.location.href = url; - } catch ( e ) { - popupWindow = window.open( url, null, options, true ); - } - - return true; - } -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/hidpi/preview-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/hidpi/preview-rtl.png deleted file mode 100644 index cd64e19a87a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/hidpi/preview-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/hidpi/preview.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/hidpi/preview.png deleted file mode 100644 index 402db20e277..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/hidpi/preview.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/preview-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/preview-rtl.png deleted file mode 100644 index 1c9d97874ca..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/preview-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/preview.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/preview.png deleted file mode 100644 index 162b44b845a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/icons/preview.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/af.js deleted file mode 100644 index f4b3d3305a5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'af', { - preview: 'Voorbeeld' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ar.js deleted file mode 100644 index 867fa02b679..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ar', { - preview: 'معاينة الصفحة' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bg.js deleted file mode 100644 index 62c8dc7ce4a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'bg', { - preview: 'Преглед' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bn.js deleted file mode 100644 index 70271c60824..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'bn', { - preview: 'প্রিভিউ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bs.js deleted file mode 100644 index 1348729fa18..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'bs', { - preview: 'Prikaži' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ca.js deleted file mode 100644 index 2680eb3db98..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ca', { - preview: 'Visualització prèvia' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/cs.js deleted file mode 100644 index ea626dd4da3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'cs', { - preview: 'Náhled' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/cy.js deleted file mode 100644 index 6bd4eac5170..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'cy', { - preview: 'Rhagolwg' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/da.js deleted file mode 100644 index bd785c00240..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'da', { - preview: 'Vis eksempel' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/de.js deleted file mode 100644 index 8ba8be7453b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'de', { - preview: 'Vorschau' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/el.js deleted file mode 100644 index 8621b9b12f7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'el', { - preview: 'Προεπισκόπιση' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-au.js deleted file mode 100644 index 5f5e91c9cc3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'en-au', { - preview: 'Preview' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-ca.js deleted file mode 100644 index 2227b5579c1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'en-ca', { - preview: 'Preview' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-gb.js deleted file mode 100644 index aca84ca52f7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'en-gb', { - preview: 'Preview' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en.js deleted file mode 100644 index 93063b547bc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'en', { - preview: 'Preview' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/eo.js deleted file mode 100644 index 3b8c10afd2c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'eo', { - preview: 'Vidigi Aspekton' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/es.js deleted file mode 100644 index 3a210c176dd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'es', { - preview: 'Vista Previa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/et.js deleted file mode 100644 index 5075f03610d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'et', { - preview: 'Eelvaade' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/eu.js deleted file mode 100644 index edaf049a836..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'eu', { - preview: 'Aurrebista' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fa.js deleted file mode 100644 index aeebf192317..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'fa', { - preview: 'پیشنمایش' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fi.js deleted file mode 100644 index e5dacd9c251..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'fi', { - preview: 'Esikatsele' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fo.js deleted file mode 100644 index 6aea652b390..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'fo', { - preview: 'Frumsýning' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fr-ca.js deleted file mode 100644 index 22569e09a7a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'fr-ca', { - preview: 'Prévisualiser' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fr.js deleted file mode 100644 index da3f58e8c8d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'fr', { - preview: 'Aperçu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/gl.js deleted file mode 100644 index 14247141456..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'gl', { - preview: 'Vista previa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/gu.js deleted file mode 100644 index 4b25f0f5c7a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'gu', { - preview: 'પૂર્વદર્શન' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/he.js deleted file mode 100644 index 0c6998b8f5d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'he', { - preview: 'תצוגה מקדימה' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hi.js deleted file mode 100644 index e9cbee95633..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'hi', { - preview: 'प्रीव्यू' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hr.js deleted file mode 100644 index ad04d674e22..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'hr', { - preview: 'Pregledaj' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hu.js deleted file mode 100644 index bdc63a1b05c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'hu', { - preview: 'Előnézet' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/id.js deleted file mode 100644 index b342777ebcb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'id', { - preview: 'Pratinjau' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/is.js deleted file mode 100644 index d0089427c8b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'is', { - preview: 'Forskoða' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/it.js deleted file mode 100644 index f5d01cbca19..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'it', { - preview: 'Anteprima' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ja.js deleted file mode 100644 index d7ccf2c0770..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ja', { - preview: 'プレビュー' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ka.js deleted file mode 100644 index 69842f125b9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ka', { - preview: 'გადახედვა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/km.js deleted file mode 100644 index 221adccd0e3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'km', { - preview: 'មើល​ជា​មុន' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ko.js deleted file mode 100644 index 21532606f4b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ko', { - preview: '미리보기' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ku.js deleted file mode 100644 index 7fb85abc8fe..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ku', { - preview: 'پێشبینین' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/lt.js deleted file mode 100644 index da129eb20a0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'lt', { - preview: 'Peržiūra' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/lv.js deleted file mode 100644 index 20866253e03..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'lv', { - preview: 'Priekšskatīt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/mk.js deleted file mode 100644 index 2835d592afe..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'mk', { - preview: 'Preview' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/mn.js deleted file mode 100644 index f6c73052a12..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'mn', { - preview: 'Уридчлан харах' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ms.js deleted file mode 100644 index e478dab1d7d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ms', { - preview: 'Prebiu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/nb.js deleted file mode 100644 index c8c48c3833d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'nb', { - preview: 'Forhåndsvis' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/nl.js deleted file mode 100644 index b16350e2aa7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'nl', { - preview: 'Voorbeeld' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/no.js deleted file mode 100644 index 0ab22d9c735..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'no', { - preview: 'Forhåndsvis' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pl.js deleted file mode 100644 index 071a0348ba3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'pl', { - preview: 'Podgląd' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pt-br.js deleted file mode 100644 index 40b22b4f0d2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'pt-br', { - preview: 'Visualizar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pt.js deleted file mode 100644 index 57ca859d3c0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'pt', { - preview: 'Pré-visualizar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ro.js deleted file mode 100644 index ecbf1890dcc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ro', { - preview: 'Previzualizare' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ru.js deleted file mode 100644 index 2da475efbac..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ru', { - preview: 'Предварительный просмотр' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/si.js deleted file mode 100644 index b1a58527fe1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'si', { - preview: 'නැවත ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sk.js deleted file mode 100644 index 6f94275b27a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'sk', { - preview: 'Náhľad' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sl.js deleted file mode 100644 index 7f8ee9a5c7f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'sl', { - preview: 'Predogled' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sq.js deleted file mode 100644 index a98d1c4b43c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'sq', { - preview: 'Parashiko' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sr-latn.js deleted file mode 100644 index 46e4f259e42..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'sr-latn', { - preview: 'Izgled stranice' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sr.js deleted file mode 100644 index 3be54551ec4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'sr', { - preview: 'Изглед странице' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sv.js deleted file mode 100644 index 4602f090d59..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'sv', { - preview: 'Förhandsgranska' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/th.js deleted file mode 100644 index 70e7ae490a9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'th', { - preview: 'ดูหน้าเอกสารตัวอย่าง' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/tr.js deleted file mode 100644 index 8b0872ab824..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'tr', { - preview: 'Ön İzleme' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ug.js deleted file mode 100644 index 9336cda119b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'ug', { - preview: 'ئالدىن كۆزەت' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/uk.js deleted file mode 100644 index 27df09cb8f8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'uk', { - preview: 'Попередній перегляд' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/vi.js deleted file mode 100644 index 148f8fba93f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'vi', { - preview: 'Xem trước' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/zh-cn.js deleted file mode 100644 index 329642fc3c1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'zh-cn', { - preview: '预览' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/zh.js deleted file mode 100644 index 769858c8182..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'preview', 'zh', { - preview: '預覽' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/plugin.js deleted file mode 100644 index f86a6bbfc0e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/plugin.js +++ /dev/null @@ -1,141 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview Preview plugin. - */ - -( function() { - var pluginPath; - - var previewCmd = { modes: { wysiwyg: 1, source: 1 }, - canUndo: false, - readOnly: 1, - exec: function( editor ) { - var sHTML, - config = editor.config, - baseTag = config.baseHref ? '' : '', - eventData; - - if ( config.fullPage ) - sHTML = editor.getData().replace( //, '$&' + baseTag ).replace( /[^>]*(?=<\/title>)/, '$& — ' + editor.lang.preview.preview ); - else { - var bodyHtml = '' + - '' + - baseTag + - '' + editor.lang.preview.preview + '' + - CKEDITOR.tools.buildStyleHtml( editor.config.contentsCss ) + - '' + bodyHtml + - editor.getData() + - ''; - } - - var iWidth = 640, - // 800 * 0.8, - iHeight = 420, - // 600 * 0.7, - iLeft = 80; // (800 - 0.8 * 800) /2 = 800 * 0.1. - try { - var screen = window.screen; - iWidth = Math.round( screen.width * 0.8 ); - iHeight = Math.round( screen.height * 0.7 ); - iLeft = Math.round( screen.width * 0.1 ); - } catch ( e ) {} - - // (#9907) Allow data manipulation before preview is displayed. - // Also don't open the preview window when event cancelled. - if ( editor.fire( 'contentPreview', eventData = { dataValue: sHTML } ) === false ) - return false; - - var sOpenUrl = '', - ieLocation; - - if ( CKEDITOR.env.ie ) { - window._cke_htmlToLoad = eventData.dataValue; - ieLocation = 'javascript:void( (function(){' + - 'document.open();' + - // Support for custom document.domain. - // Strip comments and replace parent with window.opener in the function body. - ( '(' + CKEDITOR.tools.fixDomain + ')();' ).replace( /\/\/.*?\n/g, '' ).replace( /parent\./g, 'window.opener.' ) + - 'document.write( window.opener._cke_htmlToLoad );' + - 'document.close();' + - 'window.opener._cke_htmlToLoad = null;' + - '})() )'; - // For IE we should use window.location rather than setting url in window.open. (#11146) - sOpenUrl = ''; - } - - // With Firefox only, we need to open a special preview page, so - // anchors will work properly on it. (#9047) - if ( CKEDITOR.env.gecko ) { - window._cke_htmlToLoad = eventData.dataValue; - sOpenUrl = pluginPath + 'preview.html'; - } - - var oWindow = window.open( sOpenUrl, null, 'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=' + - iWidth + ',height=' + iHeight + ',left=' + iLeft ); - - if ( CKEDITOR.env.ie ) - oWindow.location = ieLocation; - - if ( !CKEDITOR.env.ie && !CKEDITOR.env.gecko ) { - var doc = oWindow.document; - doc.open(); - doc.write( eventData.dataValue ); - doc.close(); - } - - return true; - } - }; - - var pluginName = 'preview'; - - // Register a plugin named "preview". - CKEDITOR.plugins.add( pluginName, { - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'preview,preview-rtl', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - - // Preview is not used for the inline creator. - if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_INLINE ) - return; - - pluginPath = this.path; - - editor.addCommand( pluginName, previewCmd ); - editor.ui.addButton && editor.ui.addButton( 'Preview', { - label: editor.lang.preview.preview, - command: pluginName, - toolbar: 'document,40' - } ); - } - } ); -} )(); - -/** - * Event fired when executing `preview` command, which allows additional data manipulation. - * With this event, the raw HTML content of the preview window to be displayed can be altered - * or modified. - * - * @event contentPreview - * @member CKEDITOR - * @param {CKEDITOR.editor} editor This editor instance. - * @param data - * @param {String} data.dataValue The data that will go to the preview. - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/preview.html b/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/preview.html deleted file mode 100644 index 5745b7abaa6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/preview/preview.html +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/icons/hidpi/print.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/icons/hidpi/print.png deleted file mode 100644 index 4b72460dd4f..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/icons/hidpi/print.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/icons/print.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/icons/print.png deleted file mode 100644 index 06f797dc728..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/icons/print.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/af.js deleted file mode 100644 index d3c820c9068..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'af', { - toolbar: 'Druk' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ar.js deleted file mode 100644 index 69159198ee4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ar', { - toolbar: 'طباعة' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bg.js deleted file mode 100644 index f0ebff456d6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'bg', { - toolbar: 'Печат' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bn.js deleted file mode 100644 index 4673c949f6f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'bn', { - toolbar: 'প্রিন্ট' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bs.js deleted file mode 100644 index bf5da0685e3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'bs', { - toolbar: 'Štampaj' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ca.js deleted file mode 100644 index fd5736fa696..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ca', { - toolbar: 'Imprimeix' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/cs.js deleted file mode 100644 index 2ed58ee6bf2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'cs', { - toolbar: 'Tisk' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/cy.js deleted file mode 100644 index ec4d3c399c2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'cy', { - toolbar: 'Argraffu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/da.js deleted file mode 100644 index a0b182d3dc5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'da', { - toolbar: 'Udskriv' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/de.js deleted file mode 100644 index b8baaca6475..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'de', { - toolbar: 'Drucken' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/el.js deleted file mode 100644 index 54fa596e94c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'el', { - toolbar: 'Εκτύπωση' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-au.js deleted file mode 100644 index 6c71cf077e2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'en-au', { - toolbar: 'Print' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-ca.js deleted file mode 100644 index 4228e13b715..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'en-ca', { - toolbar: 'Print' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-gb.js deleted file mode 100644 index fbb20334605..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'en-gb', { - toolbar: 'Print' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en.js deleted file mode 100644 index b4e01b29b47..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'en', { - toolbar: 'Print' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/eo.js deleted file mode 100644 index 8248d3d5e7e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'eo', { - toolbar: 'Presi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/es.js deleted file mode 100644 index 026a2984c40..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'es', { - toolbar: 'Imprimir' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/et.js deleted file mode 100644 index a686d4fb33e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'et', { - toolbar: 'Printimine' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/eu.js deleted file mode 100644 index 7b84786daa2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'eu', { - toolbar: 'Inprimatu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fa.js deleted file mode 100644 index 7badbb3c605..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'fa', { - toolbar: 'چاپ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fi.js deleted file mode 100644 index 91ac4603644..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'fi', { - toolbar: 'Tulosta' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fo.js deleted file mode 100644 index 90c3c48ae77..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'fo', { - toolbar: 'Prenta' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fr-ca.js deleted file mode 100644 index 8d653c21140..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'fr-ca', { - toolbar: 'Imprimer' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fr.js deleted file mode 100644 index 36c9b83639c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'fr', { - toolbar: 'Imprimer' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/gl.js deleted file mode 100644 index ef7fccc0a79..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'gl', { - toolbar: 'Imprimir' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/gu.js deleted file mode 100644 index 31f629f97a6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'gu', { - toolbar: 'પ્રિન્ટ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/he.js deleted file mode 100644 index bf93418752c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'he', { - toolbar: 'הדפסה' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hi.js deleted file mode 100644 index e4522ea73a6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'hi', { - toolbar: 'प्रिन्ट' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hr.js deleted file mode 100644 index e18c1337a28..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'hr', { - toolbar: 'Ispiši' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hu.js deleted file mode 100644 index 5a9bce5c049..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'hu', { - toolbar: 'Nyomtatás' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/id.js deleted file mode 100644 index eb2ac75d548..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'id', { - toolbar: 'Cetak' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/is.js deleted file mode 100644 index 5e49f0b2a77..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'is', { - toolbar: 'Prenta' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/it.js deleted file mode 100644 index 1df4ab12739..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'it', { - toolbar: 'Stampa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ja.js deleted file mode 100644 index fee31735c88..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ja', { - toolbar: '印刷' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ka.js deleted file mode 100644 index 916163919d5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ka', { - toolbar: 'ბეჭდვა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/km.js deleted file mode 100644 index b2d93705ad0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'km', { - toolbar: 'បោះពុម្ព' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ko.js deleted file mode 100644 index 95b845e7236..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ko', { - toolbar: '인쇄하기' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ku.js deleted file mode 100644 index 076a369253f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ku', { - toolbar: 'چاپکردن' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/lt.js deleted file mode 100644 index dd8bb405145..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'lt', { - toolbar: 'Spausdinti' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/lv.js deleted file mode 100644 index e8f81744f9b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'lv', { - toolbar: 'Drukāt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/mk.js deleted file mode 100644 index bfd94843968..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'mk', { - toolbar: 'Print' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/mn.js deleted file mode 100644 index 7e2dc60fbf9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'mn', { - toolbar: 'Хэвлэх' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ms.js deleted file mode 100644 index 0aa07dbbabc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ms', { - toolbar: 'Cetak' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/nb.js deleted file mode 100644 index 66c2e22f700..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'nb', { - toolbar: 'Skriv ut' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/nl.js deleted file mode 100644 index 4a5eaf445db..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'nl', { - toolbar: 'Afdrukken' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/no.js deleted file mode 100644 index ecac2983810..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'no', { - toolbar: 'Skriv ut' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pl.js deleted file mode 100644 index 86b5857efee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'pl', { - toolbar: 'Drukuj' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pt-br.js deleted file mode 100644 index 51ef5967eed..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'pt-br', { - toolbar: 'Imprimir' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pt.js deleted file mode 100644 index e10f38922be..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'pt', { - toolbar: 'Imprimir' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ro.js deleted file mode 100644 index bac3032a273..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ro', { - toolbar: 'Printează' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ru.js deleted file mode 100644 index df3948401c8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ru', { - toolbar: 'Печать' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/si.js deleted file mode 100644 index a0a0f4b5c34..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'si', { - toolbar: 'මුද්‍රණය කරන්න' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sk.js deleted file mode 100644 index 5dfdc2ce492..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'sk', { - toolbar: 'Tlač' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sl.js deleted file mode 100644 index 473cc636b2c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'sl', { - toolbar: 'Natisni' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sq.js deleted file mode 100644 index 2729d949e53..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'sq', { - toolbar: 'Shtype' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sr-latn.js deleted file mode 100644 index 8376cf29ccc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'sr-latn', { - toolbar: 'Štampa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sr.js deleted file mode 100644 index a5ba4ad30be..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'sr', { - toolbar: 'Штампа' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sv.js deleted file mode 100644 index 193069ef824..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'sv', { - toolbar: 'Skriv ut' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/th.js deleted file mode 100644 index f24f7d293a5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'th', { - toolbar: 'สั่งพิมพ์' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/tr.js deleted file mode 100644 index 5c804105176..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'tr', { - toolbar: 'Yazdır' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ug.js deleted file mode 100644 index db85fab461a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'ug', { - toolbar: 'باس ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/uk.js deleted file mode 100644 index 64957a35c6e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'uk', { - toolbar: 'Друк' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/vi.js deleted file mode 100644 index 8f03df93dd5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'vi', { - toolbar: 'In' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/zh-cn.js deleted file mode 100644 index 620452a799e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'zh-cn', { - toolbar: '打印' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/zh.js deleted file mode 100644 index 7628b1f6de0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'print', 'zh', { - toolbar: '列印' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/plugin.js deleted file mode 100644 index e77808ec145..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/print/plugin.js +++ /dev/null @@ -1,45 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview Print Plugin - */ - -CKEDITOR.plugins.add( 'print', { - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'print,', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - // Print plugin isn't available in inline mode yet. - if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_INLINE ) - return; - - var pluginName = 'print'; - - // Register the command. - var command = editor.addCommand( pluginName, CKEDITOR.plugins.print ); - - // Register the toolbar button. - editor.ui.addButton && editor.ui.addButton( 'Print', { - label: editor.lang.print.toolbar, - command: pluginName, - toolbar: 'document,50' - } ); - } -} ); - -CKEDITOR.plugins.print = { - exec: function( editor ) { - if ( CKEDITOR.env.opera ) - return; - else if ( CKEDITOR.env.gecko ) - editor.window.$.print(); - else - editor.document.$.execCommand( "Print" ); - }, - canUndo: false, - readOnly: 1, - modes: { wysiwyg: !( CKEDITOR.env.opera ) } // It is imposible to print the inner document in Opera. -}; diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/icons/hidpi/removeformat.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/icons/hidpi/removeformat.png deleted file mode 100644 index 910b0a3c8f5..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/icons/hidpi/removeformat.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/icons/removeformat.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/icons/removeformat.png deleted file mode 100644 index 1bc9b38601a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/icons/removeformat.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/af.js deleted file mode 100644 index af433e6a600..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'af', { - toolbar: 'Verwyder opmaak' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ar.js deleted file mode 100644 index 8895c0f454e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ar', { - toolbar: 'إزالة التنسيقات' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bg.js deleted file mode 100644 index b53cb875567..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'bg', { - toolbar: 'Премахване на форматирането' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bn.js deleted file mode 100644 index c18984124ab..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'bn', { - toolbar: 'ফরমেট সরাও' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bs.js deleted file mode 100644 index 333e6269e9b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'bs', { - toolbar: 'Poništi format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ca.js deleted file mode 100644 index b079ef48e72..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ca', { - toolbar: 'Elimina Format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/cs.js deleted file mode 100644 index e9ce318d592..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'cs', { - toolbar: 'Odstranit formátování' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/cy.js deleted file mode 100644 index 46337bbbaa5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'cy', { - toolbar: 'Tynnu Fformat' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/da.js deleted file mode 100644 index 8ad3e26bbc0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'da', { - toolbar: 'Fjern formatering' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/de.js deleted file mode 100644 index 1b44705a05c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'de', { - toolbar: 'Formatierungen entfernen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/el.js deleted file mode 100644 index f53565b84f6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'el', { - toolbar: 'Εκκαθάριση Μορφοποίησης' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-au.js deleted file mode 100644 index 8af1299ee8f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'en-au', { - toolbar: 'Remove Format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-ca.js deleted file mode 100644 index 10b8b92168c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'en-ca', { - toolbar: 'Remove Format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-gb.js deleted file mode 100644 index b7989952e80..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'en-gb', { - toolbar: 'Remove Format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en.js deleted file mode 100644 index a41396214b3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'en', { - toolbar: 'Remove Format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/eo.js deleted file mode 100644 index e40d303ae7a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'eo', { - toolbar: 'Forigi Formaton' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/es.js deleted file mode 100644 index dca483a6089..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'es', { - toolbar: 'Eliminar Formato' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/et.js deleted file mode 100644 index 137b2627af4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'et', { - toolbar: 'Vormingu eemaldamine' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/eu.js deleted file mode 100644 index 0db92808a7c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'eu', { - toolbar: 'Kendu Formatua' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fa.js deleted file mode 100644 index 31378a4dffd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'fa', { - toolbar: 'برداشتن فرمت' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fi.js deleted file mode 100644 index e2760e2f7db..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'fi', { - toolbar: 'Poista muotoilu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fo.js deleted file mode 100644 index 19b84b1ed82..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'fo', { - toolbar: 'Strika sniðgeving' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fr-ca.js deleted file mode 100644 index 4343a0e61ff..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'fr-ca', { - toolbar: 'Supprimer le formatage' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fr.js deleted file mode 100644 index 8fb45d52032..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'fr', { - toolbar: 'Supprimer la mise en forme' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/gl.js deleted file mode 100644 index 4abf0ab563f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'gl', { - toolbar: 'Retirar o formato' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/gu.js deleted file mode 100644 index a19dc35e057..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'gu', { - toolbar: 'ફૉર્મટ કાઢવું' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/he.js deleted file mode 100644 index 3658b058cb1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'he', { - toolbar: 'הסרת העיצוב' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hi.js deleted file mode 100644 index 3c23586a3f1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'hi', { - toolbar: 'फ़ॉर्मैट हटायें' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hr.js deleted file mode 100644 index a452ac718d6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'hr', { - toolbar: 'Ukloni formatiranje' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hu.js deleted file mode 100644 index b3d0833ee72..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'hu', { - toolbar: 'Formázás eltávolítása' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/id.js deleted file mode 100644 index fc7e0cf2e42..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'id', { - toolbar: 'Hapus Format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/is.js deleted file mode 100644 index 24bd7096175..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'is', { - toolbar: 'Fjarlægja snið' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/it.js deleted file mode 100644 index fefb9d2dee1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'it', { - toolbar: 'Elimina formattazione' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ja.js deleted file mode 100644 index e1fa1693266..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ja', { - toolbar: '書式を解除' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ka.js deleted file mode 100644 index fe7081c318e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ka', { - toolbar: 'ფორმატირების მოხსნა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/km.js deleted file mode 100644 index 1b889d04bbd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'km', { - toolbar: 'ជម្រះ​ទ្រង់​ទ្រាយ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ko.js deleted file mode 100644 index e6338cbb711..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ko', { - toolbar: '포맷 지우기' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ku.js deleted file mode 100644 index 12f562ae5db..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ku', { - toolbar: 'لابردنی داڕشتەکە' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/lt.js deleted file mode 100644 index 156ad64879f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'lt', { - toolbar: 'Panaikinti formatą' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/lv.js deleted file mode 100644 index 3511ee81774..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'lv', { - toolbar: 'Noņemt stilus' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/mk.js deleted file mode 100644 index 62804036480..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'mk', { - toolbar: 'Remove Format' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/mn.js deleted file mode 100644 index 1402bca12c8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'mn', { - toolbar: 'Параргафын загварыг авч хаях' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ms.js deleted file mode 100644 index cc872b3d06a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ms', { - toolbar: 'Buang Format' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/nb.js deleted file mode 100644 index d42e07e86c8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'nb', { - toolbar: 'Fjern formatering' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/nl.js deleted file mode 100644 index 223c6833ed3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'nl', { - toolbar: 'Opmaak verwijderen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/no.js deleted file mode 100644 index f6b6004c0ee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'no', { - toolbar: 'Fjern formatering' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pl.js deleted file mode 100644 index 52de13ef8e2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'pl', { - toolbar: 'Usuń formatowanie' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pt-br.js deleted file mode 100644 index 5d26f506bbd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'pt-br', { - toolbar: 'Remover Formatação' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pt.js deleted file mode 100644 index e0f48babc15..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'pt', { - toolbar: 'Eliminar Formato' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ro.js deleted file mode 100644 index e8e2408ad95..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ro', { - toolbar: 'Înlătură formatarea' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ru.js deleted file mode 100644 index a2b4665dd47..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ru', { - toolbar: 'Убрать форматирование' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/si.js deleted file mode 100644 index 26a33d21c03..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'si', { - toolbar: 'සැකසීම වෙනස් කරන්න' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sk.js deleted file mode 100644 index 198c5519154..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'sk', { - toolbar: 'Odstrániť formátovanie' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sl.js deleted file mode 100644 index 92b3a302b4c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'sl', { - toolbar: 'Odstrani oblikovanje' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sq.js deleted file mode 100644 index 9c23fed4afc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'sq', { - toolbar: 'Largo Formatin' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sr-latn.js deleted file mode 100644 index 1b379978682..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'sr-latn', { - toolbar: 'Ukloni formatiranje' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sr.js deleted file mode 100644 index d6ddbd90386..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'sr', { - toolbar: 'Уклони форматирање' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sv.js deleted file mode 100644 index 186fc760002..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'sv', { - toolbar: 'Radera formatering' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/th.js deleted file mode 100644 index 6fea757b4ab..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'th', { - toolbar: 'ล้างรูปแบบ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/tr.js deleted file mode 100644 index d6017af6c6e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'tr', { - toolbar: 'Biçimi Kaldır' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ug.js deleted file mode 100644 index 19e13c378ca..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'ug', { - toolbar: 'پىچىمنى چىقىرىۋەت' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/uk.js deleted file mode 100644 index b742d5319c7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'uk', { - toolbar: 'Очистити форматування' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/vi.js deleted file mode 100644 index 669315d2437..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'vi', { - toolbar: 'Xoá định dạng' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/zh-cn.js deleted file mode 100644 index 45e134cf5ff..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'zh-cn', { - toolbar: '清除格式' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/zh.js deleted file mode 100644 index e3c05d51be8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'removeformat', 'zh', { - toolbar: '移除格式' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/plugin.js deleted file mode 100644 index 6b36850d18c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/removeformat/plugin.js +++ /dev/null @@ -1,174 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.add( 'removeformat', { - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'removeformat', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - editor.addCommand( 'removeFormat', CKEDITOR.plugins.removeformat.commands.removeformat ); - editor.ui.addButton && editor.ui.addButton( 'RemoveFormat', { - label: editor.lang.removeformat.toolbar, - command: 'removeFormat', - toolbar: 'cleanup,10' - } ); - } -} ); - -CKEDITOR.plugins.removeformat = { - commands: { - removeformat: { - exec: function( editor ) { - var tagsRegex = editor._.removeFormatRegex || ( editor._.removeFormatRegex = new RegExp( '^(?:' + editor.config.removeFormatTags.replace( /,/g, '|' ) + ')$', 'i' ) ); - - var removeAttributes = editor._.removeAttributes || ( editor._.removeAttributes = editor.config.removeFormatAttributes.split( ',' ) ); - - var filter = CKEDITOR.plugins.removeformat.filter; - var ranges = editor.getSelection().getRanges( 1 ), - iterator = ranges.createIterator(), - range; - - while ( ( range = iterator.getNextRange() ) ) { - if ( !range.collapsed ) - range.enlarge( CKEDITOR.ENLARGE_ELEMENT ); - - // Bookmark the range so we can re-select it after processing. - var bookmark = range.createBookmark(), - // The style will be applied within the bookmark boundaries. - startNode = bookmark.startNode, - endNode = bookmark.endNode, - currentNode; - - // We need to check the selection boundaries (bookmark spans) to break - // the code in a way that we can properly remove partially selected nodes. - // For example, removing a style from - // This is [some text to show the] problem - // ... where [ and ] represent the selection, must result: - // This is [some text to show the] problem - // The strategy is simple, we just break the partial nodes before the - // removal logic, having something that could be represented this way: - // This is [some text to show the] problem - - var breakParent = function( node ) { - // Let's start checking the start boundary. - var path = editor.elementPath( node ), - pathElements = path.elements; - - for ( var i = 1, pathElement; pathElement = pathElements[ i ]; i++ ) { - if ( pathElement.equals( path.block ) || pathElement.equals( path.blockLimit ) ) - break; - - // If this element can be removed (even partially). - if ( tagsRegex.test( pathElement.getName() ) && filter( editor, pathElement ) ) - node.breakParent( pathElement ); - } - }; - - breakParent( startNode ); - if ( endNode ) { - breakParent( endNode ); - - // Navigate through all nodes between the bookmarks. - currentNode = startNode.getNextSourceNode( true, CKEDITOR.NODE_ELEMENT ); - - while ( currentNode ) { - // If we have reached the end of the selection, stop looping. - if ( currentNode.equals( endNode ) ) - break; - - // Cache the next node to be processed. Do it now, because - // currentNode may be removed. - var nextNode = currentNode.getNextSourceNode( false, CKEDITOR.NODE_ELEMENT ); - - // This node must not be a fake element. - if ( !( currentNode.getName() == 'img' && currentNode.data( 'cke-realelement' ) ) && filter( editor, currentNode ) ) { - // Remove elements nodes that match with this style rules. - if ( tagsRegex.test( currentNode.getName() ) ) - currentNode.remove( 1 ); - else { - currentNode.removeAttributes( removeAttributes ); - editor.fire( 'removeFormatCleanup', currentNode ); - } - } - - currentNode = nextNode; - } - } - - range.moveToBookmark( bookmark ); - } - - // The selection path may not changed, but we should force a selection - // change event to refresh command states, due to the above attribution change. (#9238) - editor.forceNextSelectionCheck(); - editor.getSelection().selectRanges( ranges ); - } - } - }, - - // Perform the remove format filters on the passed element. - // @param {CKEDITOR.editor} editor - // @param {CKEDITOR.dom.element} element - filter: function( editor, element ) { - // If editor#addRemoveFotmatFilter hasn't been executed yet value is not initialized. - var filters = editor._.removeFormatFilters || []; - for ( var i = 0; i < filters.length; i++ ) { - if ( filters[ i ]( element ) === false ) - return false; - } - return true; - } -}; - -/** - * Add to a collection of functions to decide whether a specific - * element should be considered as formatting element and thus - * could be removed during `removeFormat` command. - * - * **Note:** Only available with the existence of `removeformat` plugin. - * - * // Don't remove empty span. - * editor.addRemoveFormatFilter( function( element ) { - * return !( element.is( 'span' ) && CKEDITOR.tools.isEmpty( element.getAttributes() ) ); - * } ); - * - * @since 3.3 - * @member CKEDITOR.editor - * @param {Function} func The function to be called, which will be passed a {CKEDITOR.dom.element} element to test. - */ -CKEDITOR.editor.prototype.addRemoveFormatFilter = function( func ) { - if ( !this._.removeFormatFilters ) - this._.removeFormatFilters = []; - - this._.removeFormatFilters.push( func ); -}; - -/** - * A comma separated list of elements to be removed when executing the `remove - * format` command. Note that only inline elements are allowed. - * - * @cfg - * @member CKEDITOR.config - */ -CKEDITOR.config.removeFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var'; - -/** - * A comma separated list of elements attributes to be removed when executing - * the `remove format` command. - * - * @cfg - * @member CKEDITOR.config - */ -CKEDITOR.config.removeFormatAttributes = 'class,style,lang,width,height,align,hspace,valign'; - -/** - * Fired after an element was cleaned by the removeFormat plugin. - * - * @event removeFormatCleanup - * @member CKEDITOR.editor - * @param {CKEDITOR.editor} editor This editor instance. - * @param data - * @param {CKEDITOR.dom.element} data.element The element that was cleaned up. - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/resize/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/resize/plugin.js deleted file mode 100644 index 7ff173e730b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/resize/plugin.js +++ /dev/null @@ -1,169 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.add( 'resize', { - init: function( editor ) { - var config = editor.config; - var spaceId = editor.ui.spaceId( 'resizer' ); - - // Resize in the same direction of chrome, - // which is identical to dir of editor element. (#6614) - var resizeDir = editor.element ? editor.element.getDirection( 1 ) : 'ltr'; - - !config.resize_dir && ( config.resize_dir = 'vertical' ); - ( config.resize_maxWidth == undefined ) && ( config.resize_maxWidth = 3000 ); - ( config.resize_maxHeight == undefined ) && ( config.resize_maxHeight = 3000 ); - ( config.resize_minWidth == undefined ) && ( config.resize_minWidth = 750 ); - ( config.resize_minHeight == undefined ) && ( config.resize_minHeight = 250 ); - - if ( config.resize_enabled !== false ) { - var container = null, - origin, startSize, - resizeHorizontal = ( config.resize_dir == 'both' || config.resize_dir == 'horizontal' ) && ( config.resize_minWidth != config.resize_maxWidth ), - resizeVertical = ( config.resize_dir == 'both' || config.resize_dir == 'vertical' ) && ( config.resize_minHeight != config.resize_maxHeight ); - - function dragHandler( evt ) { - var dx = evt.data.$.screenX - origin.x, - dy = evt.data.$.screenY - origin.y, - width = startSize.width, - height = startSize.height, - internalWidth = width + dx * ( resizeDir == 'rtl' ? -1 : 1 ), - internalHeight = height + dy; - - if ( resizeHorizontal ) - width = Math.max( config.resize_minWidth, Math.min( internalWidth, config.resize_maxWidth ) ); - - if ( resizeVertical ) - height = Math.max( config.resize_minHeight, Math.min( internalHeight, config.resize_maxHeight ) ); - - // DO NOT impose fixed size with single direction resize. (#6308) - editor.resize( resizeHorizontal ? width : null, height ); - } - - function dragEndHandler( evt ) { - CKEDITOR.document.removeListener( 'mousemove', dragHandler ); - CKEDITOR.document.removeListener( 'mouseup', dragEndHandler ); - - if ( editor.document ) { - editor.document.removeListener( 'mousemove', dragHandler ); - editor.document.removeListener( 'mouseup', dragEndHandler ); - } - } - - var mouseDownFn = CKEDITOR.tools.addFunction( function( $event ) { - if ( !container ) - container = editor.getResizable(); - - startSize = { width: container.$.offsetWidth || 0, height: container.$.offsetHeight || 0 }; - origin = { x: $event.screenX, y: $event.screenY }; - - config.resize_minWidth > startSize.width && ( config.resize_minWidth = startSize.width ); - config.resize_minHeight > startSize.height && ( config.resize_minHeight = startSize.height ); - - CKEDITOR.document.on( 'mousemove', dragHandler ); - CKEDITOR.document.on( 'mouseup', dragEndHandler ); - - if ( editor.document ) { - editor.document.on( 'mousemove', dragHandler ); - editor.document.on( 'mouseup', dragEndHandler ); - } - - $event.preventDefault && $event.preventDefault(); - } ); - - editor.on( 'destroy', function() { - CKEDITOR.tools.removeFunction( mouseDownFn ); - } ); - - editor.on( 'uiSpace', function( event ) { - if ( event.data.space == 'bottom' ) { - var direction = ''; - if ( resizeHorizontal && !resizeVertical ) - direction = ' cke_resizer_horizontal'; - if ( !resizeHorizontal && resizeVertical ) - direction = ' cke_resizer_vertical'; - - var resizerHtml = - '' + - // BLACK LOWER RIGHT TRIANGLE (ltr) - // BLACK LOWER LEFT TRIANGLE (rtl) - ( resizeDir == 'ltr' ? '\u25E2' : '\u25E3' ) + - ''; - - // Always sticks the corner of botttom space. - resizeDir == 'ltr' && direction == 'ltr' ? event.data.html += resizerHtml : event.data.html = resizerHtml + event.data.html; - } - }, editor, null, 100 ); - - // Toggle the visibility of the resizer when an editor is being maximized or minimized. - editor.on( 'maximize', function( event ) { - editor.ui.space( 'resizer' )[ event.data == CKEDITOR.TRISTATE_ON ? 'hide' : 'show' ](); - } ); - } - } -} ); - -/** - * The minimum editor width, in pixels, when resizing the editor interface by using the resize handle. - * Note: It falls back to editor's actual width if it is smaller than the default value. - * - * config.resize_minWidth = 500; - * - * @cfg {Number} [resize_minWidth=750] - * @member CKEDITOR.config - */ - -/** - * The minimum editor height, in pixels, when resizing the editor interface by using the resize handle. - * Note: It falls back to editor's actual height if it is smaller than the default value. - * - * config.resize_minHeight = 600; - * - * @cfg {Number} [resize_minHeight=250] - * @member CKEDITOR.config - */ - -/** - * The maximum editor width, in pixels, when resizing the editor interface by using the resize handle. - * - * config.resize_maxWidth = 750; - * - * @cfg {Number} [resize_maxWidth=3000] - * @member CKEDITOR.config - */ - -/** - * The maximum editor height, in pixels, when resizing the editor interface by using the resize handle. - * - * config.resize_maxHeight = 600; - * - * @cfg {Number} [resize_maxHeight=3000] - * @member CKEDITOR.config - */ - -/** - * Whether to enable the resizing feature. If this feature is disabled, the resize handle will not be visible. - * - * config.resize_enabled = false; - * - * @cfg {Boolean} [resize_enabled=true] - * @member CKEDITOR.config - */ - -/** - * The dimensions for which the editor resizing is enabled. Possible values - * are `both`, `vertical`, and `horizontal`. - * - * config.resize_dir = 'both'; - * - * @since 3.3 - * @cfg {String} [resize_dir='vertical'] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/richcombo/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/richcombo/plugin.js deleted file mode 100644 index 49d0e9d647b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/richcombo/plugin.js +++ /dev/null @@ -1,440 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.add( 'richcombo', { - requires: 'floatpanel,listblock,button', - - beforeInit: function( editor ) { - editor.ui.addHandler( CKEDITOR.UI_RICHCOMBO, CKEDITOR.ui.richCombo.handler ); - } -} ); - -( function() { - var template = '' + - '{label}' + - '= 10900 && !CKEDITOR.env.hc ? '' : '" href="javascript:void(\'{titleJs}\')"' ) + - ' hidefocus="true"' + - ' role="button"' + - ' aria-labelledby="{id}_label"' + - ' aria-haspopup="true"'; - - // Some browsers don't cancel key events in the keydown but in the - // keypress. - // TODO: Check if really needed for Gecko+Mac. - if ( CKEDITOR.env.opera || ( CKEDITOR.env.gecko && CKEDITOR.env.mac ) ) - template += ' onkeypress="return false;"'; - - // With Firefox, we need to force the button to redraw, otherwise it - // will remain in the focus state. - if ( CKEDITOR.env.gecko ) - template += ' onblur="this.style.cssText = this.style.cssText;"'; - - template += - ' onkeydown="return CKEDITOR.tools.callFunction({keydownFn},event,this);"' + - ' onmousedown="return CKEDITOR.tools.callFunction({mousedownFn},event);" ' + - ' onfocus="return CKEDITOR.tools.callFunction({focusFn},event);" ' + - ( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) + // #188 - '="CKEDITOR.tools.callFunction({clickFn},this);return false;">' + - '{label}' + - '' + - '' + - // BLACK DOWN-POINTING TRIANGLE - ( CKEDITOR.env.hc ? '▼' : CKEDITOR.env.air ? ' ' : '' ) + - '' + - '' + - '' + - ''; - - var rcomboTpl = CKEDITOR.addTemplate( 'combo', template ); - - /** - * Button UI element. - * - * @readonly - * @property {String} [='richcombo'] - * @member CKEDITOR - */ - CKEDITOR.UI_RICHCOMBO = 'richcombo'; - - /** - * @class - * @todo - */ - CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass( { - $: function( definition ) { - // Copy all definition properties to this object. - CKEDITOR.tools.extend( this, definition, - // Set defaults. - { - // The combo won't participate in toolbar grouping. - canGroup: false, - title: definition.label, - modes: { wysiwyg: 1 }, - editorFocus: 1 - } ); - - // We don't want the panel definition in this object. - var panelDefinition = this.panel || {}; - delete this.panel; - - this.id = CKEDITOR.tools.getNextNumber(); - - this.document = ( panelDefinition.parent && panelDefinition.parent.getDocument() ) || CKEDITOR.document; - - panelDefinition.className = 'cke_combopanel'; - panelDefinition.block = { - multiSelect: panelDefinition.multiSelect, - attributes: panelDefinition.attributes - }; - panelDefinition.toolbarRelated = true; - - this._ = { - panelDefinition: panelDefinition, - items: {} - }; - }, - - proto: { - renderHtml: function( editor ) { - var output = []; - this.render( editor, output ); - return output.join( '' ); - }, - - /** - * Renders the combo. - * - * @param {CKEDITOR.editor} editor The editor instance which this button is - * to be used by. - * @param {Array} output The output array to which append the HTML relative - * to this button. - */ - render: function( editor, output ) { - var env = CKEDITOR.env; - - var id = 'cke_' + this.id; - var clickFn = CKEDITOR.tools.addFunction( function( el ) { - // Restore locked selection in Opera. - if ( selLocked ) { - editor.unlockSelection( 1 ); - selLocked = 0; - } - instance.execute( el ); - }, this ); - - var combo = this; - var instance = { - id: id, - combo: this, - focus: function() { - var element = CKEDITOR.document.getById( id ).getChild( 1 ); - element.focus(); - }, - execute: function( el ) { - var _ = combo._; - - if ( _.state == CKEDITOR.TRISTATE_DISABLED ) - return; - - combo.createPanel( editor ); - - if ( _.on ) { - _.panel.hide(); - return; - } - - combo.commit(); - var value = combo.getValue(); - if ( value ) - _.list.mark( value ); - else - _.list.unmarkAll(); - - _.panel.showBlock( combo.id, new CKEDITOR.dom.element( el ), 4 ); - }, - clickFn: clickFn - }; - - function updateState() { - var state = this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED; - - if ( editor.readOnly && !this.readOnly ) - state = CKEDITOR.TRISTATE_DISABLED; - - this.setState( state ); - this.setValue( '' ); - - // Let plugin to disable button. - if ( state != CKEDITOR.TRISTATE_DISABLED && this.refresh ) - this.refresh(); - } - - // Update status when activeFilter, mode or readOnly changes. - editor.on( 'activeFilterChange', updateState, this ); - editor.on( 'mode', updateState, this ); - // If this combo is sensitive to readOnly state, update it accordingly. - !this.readOnly && editor.on( 'readOnly', updateState, this ); - - var keyDownFn = CKEDITOR.tools.addFunction( function( ev, element ) { - ev = new CKEDITOR.dom.event( ev ); - - var keystroke = ev.getKeystroke(); - - // ARROW-DOWN - // This call is duplicated in plugins/toolbar/plugin.js in itemKeystroke(). - // Move focus to the first element after drop down was opened by the arrow down key. - if ( keystroke == 40 ) { - editor.once( 'panelShow', function( evt ) { - evt.data._.panel._.currentBlock.onKeyDown( 40 ); - } ); - } - - switch ( keystroke ) { - case 13: // ENTER - case 32: // SPACE - case 40: // ARROW-DOWN - // Show panel - CKEDITOR.tools.callFunction( clickFn, element ); - break; - default: - // Delegate the default behavior to toolbar button key handling. - instance.onkey( instance, keystroke ); - } - - // Avoid subsequent focus grab on editor document. - ev.preventDefault(); - } ); - - var focusFn = CKEDITOR.tools.addFunction( function() { - instance.onfocus && instance.onfocus(); - } ); - - var selLocked = 0; - var mouseDownFn = CKEDITOR.tools.addFunction( function() { - // Opera: lock to prevent loosing editable text selection when clicking on button. - if ( CKEDITOR.env.opera ) { - var edt = editor.editable(); - if ( edt.isInline() && edt.hasFocus ) { - editor.lockSelection(); - selLocked = 1; - } - } - } ); - - // For clean up - instance.keyDownFn = keyDownFn; - - var params = { - id: id, - name: this.name || this.command, - label: this.label, - title: this.title, - cls: this.className || '', - titleJs: env.gecko && env.version >= 10900 && !env.hc ? '' : ( this.title || '' ).replace( "'", '' ), - keydownFn: keyDownFn, - mousedownFn: mouseDownFn, - focusFn: focusFn, - clickFn: clickFn - }; - - rcomboTpl.output( params, output ); - - if ( this.onRender ) - this.onRender(); - - return instance; - }, - - createPanel: function( editor ) { - if ( this._.panel ) - return; - - var panelDefinition = this._.panelDefinition, - panelBlockDefinition = this._.panelDefinition.block, - panelParentElement = panelDefinition.parent || CKEDITOR.document.getBody(), - namedPanelCls = 'cke_combopanel__' + this.name, - panel = new CKEDITOR.ui.floatPanel( editor, panelParentElement, panelDefinition ), - list = panel.addListBlock( this.id, panelBlockDefinition ), - me = this; - - panel.onShow = function() { - this.element.addClass( namedPanelCls ); - - me.setState( CKEDITOR.TRISTATE_ON ); - - me._.on = 1; - - me.editorFocus && !editor.focusManager.hasFocus && editor.focus(); - - if ( me.onOpen ) - me.onOpen(); - - // The "panelShow" event is fired assinchronously, after the - // onShow method call. - editor.once( 'panelShow', function() { - list.focus( !list.multiSelect && me.getValue() ); - } ); - }; - - panel.onHide = function( preventOnClose ) { - this.element.removeClass( namedPanelCls ); - - me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED ); - - me._.on = 0; - - if ( !preventOnClose && me.onClose ) - me.onClose(); - }; - - panel.onEscape = function() { - // Hide drop-down with focus returned. - panel.hide( 1 ); - }; - - list.onClick = function( value, marked ) { - - if ( me.onClick ) - me.onClick.call( me, value, marked ); - - panel.hide(); - }; - - this._.panel = panel; - this._.list = list; - - panel.getBlock( this.id ).onHide = function() { - me._.on = 0; - me.setState( CKEDITOR.TRISTATE_OFF ); - }; - - if ( this.init ) - this.init(); - }, - - setValue: function( value, text ) { - this._.value = value; - - var textElement = this.document.getById( 'cke_' + this.id + '_text' ); - if ( textElement ) { - if ( !( value || text ) ) { - text = this.label; - textElement.addClass( 'cke_combo_inlinelabel' ); - } else - textElement.removeClass( 'cke_combo_inlinelabel' ); - - textElement.setText( typeof text != 'undefined' ? text : value ); - } - }, - - getValue: function() { - return this._.value || ''; - }, - - unmarkAll: function() { - this._.list.unmarkAll(); - }, - - mark: function( value ) { - this._.list.mark( value ); - }, - - hideItem: function( value ) { - this._.list.hideItem( value ); - }, - - hideGroup: function( groupTitle ) { - this._.list.hideGroup( groupTitle ); - }, - - showAll: function() { - this._.list.showAll(); - }, - - add: function( value, html, text ) { - this._.items[ value ] = text || value; - this._.list.add( value, html, text ); - }, - - startGroup: function( title ) { - this._.list.startGroup( title ); - }, - - commit: function() { - if ( !this._.committed ) { - this._.list.commit(); - this._.committed = 1; - CKEDITOR.ui.fire( 'ready', this ); - } - this._.committed = 1; - }, - - setState: function( state ) { - if ( this._.state == state ) - return; - - var el = this.document.getById( 'cke_' + this.id ); - el.setState( state, 'cke_combo' ); - - state == CKEDITOR.TRISTATE_DISABLED ? - el.setAttribute( 'aria-disabled', true ) : - el.removeAttribute( 'aria-disabled' ); - - this._.state = state; - }, - - getState: function() { - return this._.state; - }, - - enable: function() { - if ( this._.state == CKEDITOR.TRISTATE_DISABLED ) - this.setState( this._.lastState ); - }, - - disable: function() { - if ( this._.state != CKEDITOR.TRISTATE_DISABLED ) { - this._.lastState = this._.state; - this.setState( CKEDITOR.TRISTATE_DISABLED ); - } - } - }, - - /** - * Represents richCombo handler object. - * - * @class CKEDITOR.ui.richCombo.handler - * @singleton - * @extends CKEDITOR.ui.handlerDefinition - */ - statics: { - handler: { - /** - * Transforms a richCombo definition in a {@link CKEDITOR.ui.richCombo} instance. - * - * @param {Object} definition - * @returns {CKEDITOR.ui.richCombo} - */ - create: function( definition ) { - return new CKEDITOR.ui.richCombo( definition ); - } - } - } - } ); - - /** - * @param {String} name - * @param {Object} definition - * @member CKEDITOR.ui - * @todo - */ - CKEDITOR.ui.prototype.addRichCombo = function( name, definition ) { - this.add( name, CKEDITOR.UI_RICHCOMBO, definition ); - }; - -} )(); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/icons/hidpi/save.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/icons/hidpi/save.png deleted file mode 100644 index fc59f677aa3..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/icons/hidpi/save.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/icons/save.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/icons/save.png deleted file mode 100644 index 51b8f6ee11e..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/icons/save.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/af.js deleted file mode 100644 index 000d2db49fe..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'af', { - toolbar: 'Bewaar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ar.js deleted file mode 100644 index ef9575451fd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ar', { - toolbar: 'حفظ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bg.js deleted file mode 100644 index f2f70dfe995..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'bg', { - toolbar: 'Запис' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bn.js deleted file mode 100644 index 6c1e37661f0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'bn', { - toolbar: 'সংরক্ষন কর' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bs.js deleted file mode 100644 index 77595cb4612..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'bs', { - toolbar: 'Snimi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ca.js deleted file mode 100644 index 9ebab18fec2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ca', { - toolbar: 'Desa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/cs.js deleted file mode 100644 index ef4f393c89e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'cs', { - toolbar: 'Uložit' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/cy.js deleted file mode 100644 index 7b3cbf0e5de..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'cy', { - toolbar: 'Cadw' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/da.js deleted file mode 100644 index 56aaed49bcc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'da', { - toolbar: 'Gem' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/de.js deleted file mode 100644 index a9e48588330..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'de', { - toolbar: 'Speichern' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/el.js deleted file mode 100644 index 3b5b468df27..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'el', { - toolbar: 'Αποθήκευση' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-au.js deleted file mode 100644 index 84aa9703c5a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'en-au', { - toolbar: 'Save' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-ca.js deleted file mode 100644 index 602ef47d6c6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'en-ca', { - toolbar: 'Save' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-gb.js deleted file mode 100644 index 597f80ba938..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'en-gb', { - toolbar: 'Save' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en.js deleted file mode 100644 index 6ab1b9eec64..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'en', { - toolbar: 'Save' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/eo.js deleted file mode 100644 index 6795247973c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'eo', { - toolbar: 'Konservi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/es.js deleted file mode 100644 index 1a2a26ede62..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'es', { - toolbar: 'Guardar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/et.js deleted file mode 100644 index 71d31b9454e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'et', { - toolbar: 'Salvestamine' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/eu.js deleted file mode 100644 index 6b9deea8240..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'eu', { - toolbar: 'Gorde' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fa.js deleted file mode 100644 index e3946bd41bb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'fa', { - toolbar: 'ذخیره' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fi.js deleted file mode 100644 index a51c4cb13c4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'fi', { - toolbar: 'Tallenna' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fo.js deleted file mode 100644 index 6ded6ebdd56..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'fo', { - toolbar: 'Goym' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fr-ca.js deleted file mode 100644 index 06aae020123..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'fr-ca', { - toolbar: 'Sauvegarder' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fr.js deleted file mode 100644 index 756ef06268e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'fr', { - toolbar: 'Enregistrer' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/gl.js deleted file mode 100644 index 97aa7ee6642..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'gl', { - toolbar: 'Gardar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/gu.js deleted file mode 100644 index 69bc9145dc4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'gu', { - toolbar: 'સેવ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/he.js deleted file mode 100644 index 5312f96f739..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'he', { - toolbar: 'שמירה' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hi.js deleted file mode 100644 index 47b31b2244d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'hi', { - toolbar: 'सेव' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hr.js deleted file mode 100644 index 432d3b22284..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'hr', { - toolbar: 'Snimi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hu.js deleted file mode 100644 index bb9a797a01c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'hu', { - toolbar: 'Mentés' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/id.js deleted file mode 100644 index 294664c94c7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'id', { - toolbar: 'Simpan' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/is.js deleted file mode 100644 index d7b973aa0b3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'is', { - toolbar: 'Vista' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/it.js deleted file mode 100644 index 52724b989e9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'it', { - toolbar: 'Salva' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ja.js deleted file mode 100644 index a19f39bed85..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ja', { - toolbar: '保存' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ka.js deleted file mode 100644 index 12236f2cfe7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ka', { - toolbar: 'ჩაწერა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/km.js deleted file mode 100644 index 9f04a3e6152..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'km', { - toolbar: 'រក្សាទុក' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ko.js deleted file mode 100644 index 57a64332051..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ko', { - toolbar: '저장하기' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ku.js deleted file mode 100644 index d20ce581288..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ku', { - toolbar: 'پاشکەوتکردن' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/lt.js deleted file mode 100644 index 891b62d5e86..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'lt', { - toolbar: 'Išsaugoti' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/lv.js deleted file mode 100644 index a9c749561d4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'lv', { - toolbar: 'Saglabāt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/mk.js deleted file mode 100644 index be8f27d45ee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'mk', { - toolbar: 'Save' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/mn.js deleted file mode 100644 index 99003411a46..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'mn', { - toolbar: 'Хадгалах' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ms.js deleted file mode 100644 index 94034346660..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ms', { - toolbar: 'Simpan' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/nb.js deleted file mode 100644 index 983b598f72b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'nb', { - toolbar: 'Lagre' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/nl.js deleted file mode 100644 index 915ded9a2ea..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'nl', { - toolbar: 'Opslaan' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/no.js deleted file mode 100644 index 0d54a159bf6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'no', { - toolbar: 'Lagre' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pl.js deleted file mode 100644 index eefec2389bb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'pl', { - toolbar: 'Zapisz' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pt-br.js deleted file mode 100644 index 68934b8c09d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'pt-br', { - toolbar: 'Salvar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pt.js deleted file mode 100644 index ac2b9115c8f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'pt', { - toolbar: 'Guardar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ro.js deleted file mode 100644 index 7af85d5f8fb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ro', { - toolbar: 'Salvează' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ru.js deleted file mode 100644 index 4ced0182e8f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ru', { - toolbar: 'Сохранить' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/si.js deleted file mode 100644 index b14424b710c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'si', { - toolbar: 'ආරක්ෂා කරන්න' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sk.js deleted file mode 100644 index 7e3c4a9ea9f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'sk', { - toolbar: 'Uložiť' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sl.js deleted file mode 100644 index 48e08f3d66d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'sl', { - toolbar: 'Shrani' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sq.js deleted file mode 100644 index e612069f7aa..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'sq', { - toolbar: 'Ruaje' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sr-latn.js deleted file mode 100644 index 32e92ada523..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'sr-latn', { - toolbar: 'Sačuvaj' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sr.js deleted file mode 100644 index ad837915cab..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'sr', { - toolbar: 'Сачувај' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sv.js deleted file mode 100644 index c33cef115ce..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'sv', { - toolbar: 'Spara' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/th.js deleted file mode 100644 index e261cb49dc8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'th', { - toolbar: 'บันทึก' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/tr.js deleted file mode 100644 index 334dd0b49e1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'tr', { - toolbar: 'Kaydet' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ug.js deleted file mode 100644 index 7784426e556..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'ug', { - toolbar: 'ساقلا' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/uk.js deleted file mode 100644 index 372009206ab..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'uk', { - toolbar: 'Зберегти' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/vi.js deleted file mode 100644 index edbd188c539..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'vi', { - toolbar: 'Lưu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/zh-cn.js deleted file mode 100644 index 1312bba82c8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'zh-cn', { - toolbar: '保存' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/zh.js deleted file mode 100644 index d072f7992e4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'save', 'zh', { - toolbar: '儲存' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/plugin.js deleted file mode 100644 index 2bd2f0b52df..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/save/plugin.js +++ /dev/null @@ -1,65 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview The Save plugin. - */ - -( function() { - var saveCmd = { - readOnly: 1, - - exec: function( editor ) { - if ( editor.fire( 'save' ) ) { - var $form = editor.element.$.form; - - if ( $form ) { - try { - $form.submit(); - } catch ( e ) { - // If there's a button named "submit" then the form.submit - // function is masked and can't be called in IE/FF, so we - // call the click() method of that button. - if ( $form.submit.click ) - $form.submit.click(); - } - } - } - } - }; - - var pluginName = 'save'; - - // Register a plugin named "save". - CKEDITOR.plugins.add( pluginName, { - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'save', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - // Save plugin is for replace mode only. - if ( editor.elementMode != CKEDITOR.ELEMENT_MODE_REPLACE ) - return; - - var command = editor.addCommand( pluginName, saveCmd ); - command.modes = { wysiwyg: !!( editor.element.$.form ) }; - - editor.ui.addButton && editor.ui.addButton( 'Save', { - label: editor.lang.save.toolbar, - command: pluginName, - toolbar: 'document,10' - } ); - } - } ); -} )(); - -/** - * Fired when the user clicks the Save button on the editor toolbar. - * This event allows to overwrite the default Save button behavior. - * - * @since 4.2 - * @event save - * @member CKEDITOR.editor - * @param {CKEDITOR.editor} editor This editor instance. - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md deleted file mode 100644 index 610c807808b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md +++ /dev/null @@ -1,28 +0,0 @@ -Software License Agreement -========================== - -**CKEditor SCAYT Plugin** -Copyright © 2012, [CKSource](http://cksource.com) - Frederico Knabben. All rights reserved. - -Licensed under the terms of any of the following licenses at your choice: - -* GNU General Public License Version 2 or later (the "GPL"): - http://www.gnu.org/licenses/gpl.html - -* GNU Lesser General Public License Version 2.1 or later (the "LGPL"): - http://www.gnu.org/licenses/lgpl.html - -* Mozilla Public License Version 1.1 or later (the "MPL"): - http://www.mozilla.org/MPL/MPL-1.1.html - -You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice. - -Sources of Intellectual Property Included in this plugin --------------------------------------------------------- - -Where not otherwise indicated, all plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, the plugin will incorporate work done by developers outside of CKSource with their express permission. - -Trademarks ----------- - -CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders. diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/README.md b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/README.md deleted file mode 100644 index 3b1ad94cb57..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/README.md +++ /dev/null @@ -1,25 +0,0 @@ -CKEditor SCAYT Plugin -===================== - -This plugin brings Spell Check As You Type (SCAYT) into CKEditor. - -SCAYT is a "installation-less", using the web-services of [WebSpellChecker.net](http://www.webspellchecker.net/). It's an out of the box solution. - -Installation ------------- - -1. Clone/copy this repository contents in a new "plugins/scayt" folder in your CKEditor installation. -2. Enable the "scayt" plugin in the CKEditor configuration file (config.js): - - config.extraPlugins = 'scayt'; - -That's all. SCAYT will appear on the editor toolbar and will be ready to use. - -License -------- - -Licensed under the terms of any of the following licenses at your choice: [GPL](http://www.gnu.org/licenses/gpl.html), [LGPL](http://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html). - -See LICENSE.md for more information. - -Developed in cooperation with [WebSpellChecker.net](http://www.webspellchecker.net/). diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/dialogs/options.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/dialogs/options.js deleted file mode 100644 index 2dddc9ce414..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/dialogs/options.js +++ /dev/null @@ -1,473 +0,0 @@ -/** - * @license Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.html or http://ckeditor.com/license - */ - -CKEDITOR.dialog.add( 'scaytcheck', function( editor ) { - var firstLoad = true, - captions, - doc = CKEDITOR.document, - editorName = editor.name, - tags = CKEDITOR.plugins.scayt.getUiTabs( editor ), - i, - contents = [], - userDicActive = 0, - dic_buttons = [ - // [0] contains buttons for creating - "dic_create_" + editorName + ",dic_restore_" + editorName, - // [1] contains buton for manipulation - "dic_rename_" + editorName + ",dic_delete_" + editorName - ], - optionsIds = [ 'mixedCase', 'mixedWithDigits', 'allCaps', 'ignoreDomainNames' ]; - - // common operations - - function getBOMAllOptions() { - if ( typeof document.forms[ "optionsbar_" + editorName ] != "undefined" ) - return document.forms[ "optionsbar_" + editorName ][ "options" ]; - return []; - } - - function getBOMAllLangs() { - if ( typeof document.forms[ "languagesbar_" + editorName ] != "undefined" ) - return document.forms[ "languagesbar_" + editorName ][ "scayt_lang" ]; - return []; - } - - function setCheckedValue( radioObj, newValue ) { - if ( !radioObj ) - return; - var radioLength = radioObj.length; - if ( radioLength == undefined ) { - radioObj.checked = radioObj.value == newValue.toString(); - return; - } - for ( var i = 0; i < radioLength; i++ ) { - radioObj[ i ].checked = false; - if ( radioObj[ i ].value == newValue.toString() ) - radioObj[ i ].checked = true; - } - } - - var lang = editor.lang.scayt; - var tags_contents = [ - { - id: 'options', - label: lang.optionsTab, - elements: [ - { - type: 'html', - id: 'options', - html: '
' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - '
' - } - ] - }, - { - id: 'langs', - label: lang.languagesTab, - elements: [ - { - type: 'html', - id: 'langs', - html: '
' + - '
' + - '
' + - '
' + - '
' - } - ] - }, - { - id: 'dictionaries', - label: lang.dictionariesTab, - elements: [ - { - type: 'html', - style: '', - id: 'dictionaries', - html: '
' + - '
' + - '
' + - ' Dictionary name
' + - ' ' + - '
' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - ' ' + - ' ' + - '
' + - '
' + - '
' - } - ] - }, - { - id: 'about', - label: lang.aboutTab, - elements: [ - { - type: 'html', - id: 'about', - style: 'margin: 5px 5px;', - html: '
' - } - ] - } - ]; - - var dialogDefiniton = { - title: lang.title, - minWidth: 360, - minHeight: 220, - onShow: function() { - var dialog = this; - dialog.data = editor.fire( 'scaytDialog', {} ); - dialog.options = dialog.data.scayt_control.option(); - dialog.chosed_lang = dialog.sLang = dialog.data.scayt_control.sLang; - - if ( !dialog.data || !dialog.data.scayt || !dialog.data.scayt_control ) { - alert( 'Error loading application service' ); - dialog.hide(); - return; - } - - var stop = 0; - if ( firstLoad ) { - dialog.data.scayt.getCaption( editor.langCode || 'en', function( caps ) { - if ( stop++ > 0 ) // Once only - return; - captions = caps; - init_with_captions.apply( dialog ); - reload.apply( dialog ); - firstLoad = false; - }); - } else - reload.apply( dialog ); - - dialog.selectPage( dialog.data.tab ); - }, - onOk: function() { - var scayt_control = this.data.scayt_control; - scayt_control.option( this.options ); - // Setup language if it was changed. - var csLang = this.chosed_lang; - scayt_control.setLang( csLang ); - scayt_control.refresh(); - }, - onCancel: function() { - var o = getBOMAllOptions(); - for ( var i in o ) - o[ i ].checked = false; - - setCheckedValue( getBOMAllLangs(), "" ); - }, - contents: contents - }; - - var scayt_control = CKEDITOR.plugins.scayt.getScayt( editor ); - - for ( i = 0; i < tags.length; i++ ) { - if ( tags[ i ] == 1 ) - contents[ contents.length ] = tags_contents[ i ]; - } - if ( tags[ 2 ] == 1 ) - userDicActive = 1; - - var init_with_captions = function() { - var dialog = this, - lang_list = dialog.data.scayt.getLangList(), - buttonCaptions = [ 'dic_create', 'dic_delete', 'dic_rename', 'dic_restore' ], - buttonIds = [], - langList = [], - labels = optionsIds, - i; - - // Add buttons titles - if ( userDicActive ) { - for ( i = 0; i < buttonCaptions.length; i++ ) { - buttonIds[ i ] = buttonCaptions[ i ] + "_" + editorName; - doc.getById( buttonIds[ i ] ).setHtml( '' + captions[ 'button_' + buttonCaptions[ i ] ] + '' ); - } - doc.getById( 'dic_info_' + editorName ).setHtml( captions[ 'dic_info' ] ); - } - - // Fill options and dictionary labels. - if ( tags[ 0 ] == 1 ) { - for ( i in labels ) { - var labelCaption = 'label_' + labels[ i ], - labelId = labelCaption + '_' + editorName, - labelElement = doc.getById( labelId ); - - if ( 'undefined' != typeof labelElement && 'undefined' != typeof captions[ labelCaption ] && 'undefined' != typeof dialog.options[ labels[ i ] ] ) { - labelElement.setHtml( captions[ labelCaption ] ); - var labelParent = labelElement.getParent(); - labelParent.$.style.display = "block"; - } - } - } - - var about = '

' + - '

' + captions[ 'version' ] + window.scayt.getAboutInfo().version.toString() + '

' + - '

' + captions[ 'about_throwt_copy' ] + '

'; - - doc.getById( 'scayt_about_' + editorName ).setHtml( about ); - - // Create languages tab. - var createOption = function( option, list ) { - var label = doc.createElement( 'label' ); - label.setAttribute( 'for', 'cke_option' + option ); - label.setStyle('display', 'inline'); - label.setHtml( list[ option ] ); - - if ( dialog.sLang == option ) // Current. - dialog.chosed_lang = option; - - var div = doc.createElement( 'div' ); - var radio = CKEDITOR.dom.element.createFromHtml( '' ); - - radio.on( 'click', function() { - this.$.checked = true; - dialog.chosed_lang = option; - }); - - div.append( radio ); - div.append( label ); - - return { - lang: list[ option ], - code: option, - radio: div - }; - }; - - if ( tags[ 1 ] == 1 ) { - for ( i in lang_list.rtl ) - langList[ langList.length ] = createOption( i, lang_list.ltr ); - - for ( i in lang_list.ltr ) - langList[ langList.length ] = createOption( i, lang_list.ltr ); - - langList.sort( function( lang1, lang2 ) { - return ( lang2.lang > lang1.lang ) ? -1 : 1; - }); - - var fieldL = doc.getById( 'scayt_lcol_' + editorName ), - fieldR = doc.getById( 'scayt_rcol_' + editorName ); - for ( i = 0; i < langList.length; i++ ) { - var field = ( i < langList.length / 2 ) ? fieldL : fieldR; - field.append( langList[ i ].radio ); - } - } - - // user dictionary handlers - var dic = {}; - dic.dic_create = function( el, dic_name, dic_buttons ) { - // comma separated button's ids include repeats if exists - var all_buttons = dic_buttons[ 0 ] + ',' + dic_buttons[ 1 ]; - - var err_massage = captions[ "err_dic_create" ]; - var suc_massage = captions[ "succ_dic_create" ]; - - window.scayt.createUserDictionary( dic_name, function( arg ) { - hide_dic_buttons( all_buttons ); - display_dic_buttons( dic_buttons[ 1 ] ); - suc_massage = suc_massage.replace( "%s", arg.dname ); - dic_success_message( suc_massage ); - }, function( arg ) { - err_massage = err_massage.replace( "%s", arg.dname ); - dic_error_message( err_massage + "( " + ( arg.message || "" ) + ")" ); - }); - - }; - - dic.dic_rename = function( el, dic_name ) { - // - // try to rename dictionary - var err_massage = captions[ "err_dic_rename" ] || ""; - var suc_massage = captions[ "succ_dic_rename" ] || ""; - window.scayt.renameUserDictionary( dic_name, function( arg ) { - suc_massage = suc_massage.replace( "%s", arg.dname ); - set_dic_name( dic_name ); - dic_success_message( suc_massage ); - }, function( arg ) { - err_massage = err_massage.replace( "%s", arg.dname ); - set_dic_name( dic_name ); - dic_error_message( err_massage + "( " + ( arg.message || "" ) + " )" ); - }); - }; - - dic.dic_delete = function( el, dic_name, dic_buttons ) { - var all_buttons = dic_buttons[ 0 ] + ',' + dic_buttons[ 1 ]; - var err_massage = captions[ "err_dic_delete" ]; - var suc_massage = captions[ "succ_dic_delete" ]; - - // try to delete dictionary - window.scayt.deleteUserDictionary( function( arg ) { - suc_massage = suc_massage.replace( "%s", arg.dname ); - hide_dic_buttons( all_buttons ); - display_dic_buttons( dic_buttons[ 0 ] ); - set_dic_name( "" ); // empty input field - dic_success_message( suc_massage ); - }, function( arg ) { - err_massage = err_massage.replace( "%s", arg.dname ); - dic_error_message( err_massage ); - }); - }; - - dic.dic_restore = dialog.dic_restore || - function( el, dic_name, dic_buttons ) { - // try to restore existing dictionary - var all_buttons = dic_buttons[ 0 ] + ',' + dic_buttons[ 1 ]; - var err_massage = captions[ "err_dic_restore" ]; - var suc_massage = captions[ "succ_dic_restore" ]; - - window.scayt.restoreUserDictionary( dic_name, function( arg ) { - suc_massage = suc_massage.replace( "%s", arg.dname ); - hide_dic_buttons( all_buttons ); - display_dic_buttons( dic_buttons[ 1 ] ); - dic_success_message( suc_massage ); - }, function( arg ) { - err_massage = err_massage.replace( "%s", arg.dname ); - dic_error_message( err_massage ); - }); - }; - - function onDicButtonClick( ev ) { - var dic_name = doc.getById( 'dic_name_' + editorName ).getValue(); - if ( !dic_name ) { - dic_error_message( " Dictionary name should not be empty. " ); - return false; - } - try { - var el = ev.data.getTarget().getParent(); - var id = /(dic_\w+)_[\w\d]+/.exec( el.getId() )[ 1 ]; - dic[ id ].apply( null, [ el, dic_name, dic_buttons ] ); - } catch ( err ) { - dic_error_message( " Dictionary error. " ); - } - - return true; - } - - // ** bind event listeners - var arr_buttons = ( dic_buttons[ 0 ] + ',' + dic_buttons[ 1 ] ).split( ',' ), - l; - - for ( i = 0, l = arr_buttons.length; i < l; i += 1 ) { - var dic_button = doc.getById( arr_buttons[ i ] ); - if ( dic_button ) - dic_button.on( 'click', onDicButtonClick, this ); - } - }; - - var reload = function() { - var dialog = this; - // for enabled options tab - if ( tags[ 0 ] == 1 ) { - var opto = getBOMAllOptions(); - - // Animate options. - for ( var k = 0, l = opto.length; k < l; k++ ) { - - var i = opto[ k ].id; - var checkbox = doc.getById( i ); - - if ( checkbox ) { - opto[ k ].checked = false; - //alert (opto[k].removeAttribute) - if ( dialog.options[ i.split( "_" )[ 0 ] ] == 1 ) { - opto[ k ].checked = true; - } - - - // Bind events. Do it only once. - if ( firstLoad ) { - checkbox.on( 'click', function() { - dialog.options[ this.getId().split( "_" )[ 0 ] ] = this.$.checked ? 1 : 0; - }); - } - } - } - } - - //for enabled languages tab - if ( tags[ 1 ] == 1 ) { - var domLang = doc.getById( "cke_option" + dialog.sLang ); - setCheckedValue( domLang.$, dialog.sLang ); - } - - // * user dictionary - if ( userDicActive ) { - window.scayt.getNameUserDictionary( function( o ) { - var dic_name = o.dname; - hide_dic_buttons( dic_buttons[ 0 ] + ',' + dic_buttons[ 1 ] ); - if ( dic_name ) { - doc.getById( 'dic_name_' + editorName ).setValue( dic_name ); - display_dic_buttons( dic_buttons[ 1 ] ); - } else - display_dic_buttons( dic_buttons[ 0 ] ); - - }, function() { - doc.getById( 'dic_name_' + editorName ).setValue( "" ); - }); - dic_success_message( "" ); - } - - }; - - function dic_error_message( m ) { - doc.getById( 'dic_message_' + editorName ).setHtml( '' + m + '' ); - } - - function dic_success_message( m ) { - doc.getById( 'dic_message_' + editorName ).setHtml( '' + m + '' ); - } - - function display_dic_buttons( sIds ) { - sIds = String( sIds ); - var aIds = sIds.split( ',' ); - for ( var i = 0, l = aIds.length; i < l; i += 1 ) - doc.getById( aIds[ i ] ).$.style.display = "inline"; - } - - function hide_dic_buttons( sIds ) { - sIds = String( sIds ); - var aIds = sIds.split( ',' ); - for ( var i = 0, l = aIds.length; i < l; i += 1 ) - doc.getById( aIds[ i ] ).$.style.display = "none"; - } - - function set_dic_name( dic_name ) { - doc.getById( 'dic_name_' + editorName ).$.value = dic_name; - } - - return dialogDefiniton; -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/dialogs/toolbar.css b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/dialogs/toolbar.css deleted file mode 100644 index 861f43e3b47..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/dialogs/toolbar.css +++ /dev/null @@ -1,71 +0,0 @@ -a -{ - text-decoration:none; - padding: 2px 4px 4px 6px; - display : block; - border-width: 1px; - border-style: solid; - margin : 0px; -} - -a.cke_scayt_toogle:hover, -a.cke_scayt_toogle:focus, -a.cke_scayt_toogle:active -{ - border-color: #316ac5; - background-color: #dff1ff; - color : #000; - cursor: pointer; - margin : 0px; -} -a.cke_scayt_toogle { - color : #316ac5; - border-color: #fff; -} -.scayt_enabled a.cke_scayt_item { - color : #316ac5; - border-color: #fff; - margin : 0px; -} -.scayt_disabled a.cke_scayt_item { - color : gray; - border-color : #fff; -} -.scayt_enabled a.cke_scayt_item:hover, -.scayt_enabled a.cke_scayt_item:focus, -.scayt_enabled a.cke_scayt_item:active -{ - border-color: #316ac5; - background-color: #dff1ff; - color : #000; - cursor: pointer; -} -.scayt_disabled a.cke_scayt_item:hover, -.scayt_disabled a.cke_scayt_item:focus, -.scayt_disabled a.cke_scayt_item:active -{ - border-color: gray; - background-color: #dff1ff; - color : gray; - cursor: no-drop; -} -.cke_scayt_set_on, .cke_scayt_set_off -{ - display: none; -} -.scayt_enabled .cke_scayt_set_on -{ - display: none; -} -.scayt_disabled .cke_scayt_set_on -{ - display: inline; -} -.scayt_disabled .cke_scayt_set_off -{ - display: none; -} -.scayt_enabled .cke_scayt_set_off -{ - display: inline; -} diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/icons/hidpi/scayt.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/icons/hidpi/scayt.png deleted file mode 100644 index 58a9f4c1328..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/icons/hidpi/scayt.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/icons/scayt.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/icons/scayt.png deleted file mode 100644 index 2b50c5c65d0..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/icons/scayt.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/af.js deleted file mode 100644 index a224176e603..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/af.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'af', { - about: 'SCAYT info', - aboutTab: 'Info', - addWord: 'Voeg woord by', - allCaps: 'Ignoreer woorde in hoofletters', - dic_create: 'Skep', - dic_delete: 'Verwijder', - dic_field_name: 'Naam van woordeboek', - dic_info: 'Aanvanklik word die gebruikerswoordeboek in \'n koekie gestoor. Koekies is egter beperk in grootte. Wanneer die gebruikerswoordeboek te groot vir \'n koekie geword het, kan dit op ons bediener gestoor word. Om u persoonlike woordeboek op ons bediener te stoor, gee asb. \'n naam vir u woordeboek. Indien u alreeds \'n gestoorde woordeboek het, tik die naam en kliek op die Herstel knop.', - dic_rename: 'Hernoem', - dic_restore: 'Herstel', - dictionariesTab: 'Woordeboeke', - disable: 'SCAYT af', - emptyDic: 'Woordeboeknaam mag nie leeg wees nie.', - enable: 'SCAYT aan', - ignore: 'Ignoreer', - ignoreAll: 'Ignoreer alles', - ignoreDomainNames: 'Ignoreer domeinname', - langs: 'Tale', - languagesTab: 'Tale', - mixedCase: 'Ignoreer woorde met hoof- en kleinletters', - mixedWithDigits: 'Ignoreer woorde met syfers', - moreSuggestions: 'Meer voorstelle', - opera_title: 'Nie ondersteun deur Opera nie', - options: 'Opsies', - optionsTab: 'Opsies', - title: 'Speltoets terwyl u tik', - toggle: 'SCAYT wissel aan/af', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ar.js deleted file mode 100644 index 66e424b1ce3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ar.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ar', { - about: 'عن SCAYT', - aboutTab: 'عن', - addWord: 'إضافة كلمة', - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'قواميس', - disable: 'تعطيل SCAYT', - emptyDic: 'اسم القاموس يجب ألا يكون فارغاً.', - enable: 'تفعيل SCAYT', - ignore: 'تجاهل', - ignoreAll: 'تجاهل الكل', - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'لغات', - languagesTab: 'لغات', - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'المزيد من المقترحات', - opera_title: 'Not supported by Opera', // MISSING - options: 'خيارات', - optionsTab: 'خيارات', - title: 'تدقيق إملائي أثناء الكتابة', - toggle: 'تثبيت SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bg.js deleted file mode 100644 index 1529f42902d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bg.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'bg', { - about: 'About SCAYT', // MISSING - aboutTab: 'Относно', - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Нов', - dic_delete: 'Изтриване', - dic_field_name: 'Име на речнк', - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Преименуване', - dic_restore: 'Възтановяване', - dictionariesTab: 'Речници', - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Езици', - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Игнорирани думи и цифри', - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bn.js deleted file mode 100644 index 99f4f9986fe..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bn.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'bn', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bs.js deleted file mode 100644 index a479351f2b2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/bs.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'bs', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ca.js deleted file mode 100644 index e39e83c80fc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ca.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ca', { - about: 'Quant a l\'SCAYT', - aboutTab: 'Quant a', - addWord: 'Afegeix una paraula', - allCaps: 'Ignora paraules en majúscules', - dic_create: 'Crea', - dic_delete: 'Elimina', - dic_field_name: 'Nom del diccionari', - dic_info: 'Inicialment el diccionari d\'usuari s\'emmagatzema en una galeta. De totes maneres, les galetes tenen la mida limitada. Quan el diccionari creix massa, llavors el diccionari es pot emmagatzemar al nostre servidor. Per desar el vostre diccionari personal al nostre servidor heu d.\'especificar un nom pel diccionari. Si ja heu desat un diccionari, teclegeu si us plau el seu nom i cliqueu el botó de restauració.', - dic_rename: 'Canvia el nom', - dic_restore: 'Restaura', - dictionariesTab: 'Diccionaris', - disable: 'Deshabilita SCAYT', - emptyDic: 'El nom del diccionari no hauria d\'estar buit.', - enable: 'Habilitat l\'SCAYT', - ignore: 'Ignora', - ignoreAll: 'Ignora\'ls tots', - ignoreDomainNames: 'Ignora els noms de domini', - langs: 'Idiomes', - languagesTab: 'Idiomes', - mixedCase: 'Ignora paraules amb majúscules i minúscules', - mixedWithDigits: 'Ignora paraules amb números ', - moreSuggestions: 'Més suggerències', - opera_title: 'No és compatible amb l\'Opera', - options: 'Opcions', - optionsTab: 'Opcions', - title: 'Spell Check As You Type', - toggle: 'Commuta l\'SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/cs.js deleted file mode 100644 index d555d4aab19..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/cs.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'cs', { - about: 'O aplikaci SCAYT', - aboutTab: 'O aplikaci', - addWord: 'Přidat slovo', - allCaps: 'Ignorovat slova tvořená velkými písmeny', - dic_create: 'Vytvořit', - dic_delete: 'Smazat', - dic_field_name: 'Název slovníku', - dic_info: 'Zpočátku se uživatelský slovník ukládá do cookies ve vašem prohlížeči. Ovšem cookies mají omezenou velikost, takže když slovník dosáhne velikosti, kdy se již do cookies nevejde, může být uložen na našem serveru. Chcete-li uložit váš osobní slovník na našem serveru, je třeba slovník nejdříve pojmenovat. Máte-li již slovník pojmenován a uložen, zadejte jeho název a klepněte na tlačítko Obnovit.', - dic_rename: 'Přejmenovat', - dic_restore: 'Obnovit', - dictionariesTab: 'Slovníky', - disable: 'Vypnout SCAYT', - emptyDic: 'Název slovníku nesmí být prázdný.', - enable: 'Zapnout SCAYT', - ignore: 'Přeskočit', - ignoreAll: 'Přeskočit vše', - ignoreDomainNames: 'Ignorovat doménová jména', - langs: 'Jazyky', - languagesTab: 'Jazyky', - mixedCase: 'Ignorovat slova obsahující různou velikost písma', - mixedWithDigits: 'Ignorovat slova obsahující čísla', - moreSuggestions: 'Více návrhů', - opera_title: 'Toto Opera nepodporuje', - options: 'Nastavení', - optionsTab: 'Nastavení', - title: 'Kontrola pravopisu během psaní (SCAYT)', - toggle: 'Vypínač SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/cy.js deleted file mode 100644 index 86507db55d1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/cy.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'cy', { - about: 'Ynghylch SCAYT', - aboutTab: 'Ynghylch', - addWord: 'Ychwanegu Gair', - allCaps: 'Anwybyddu Geiriau Nodau Uwch i Gyd', - dic_create: 'Creu', - dic_delete: 'Dileu', - dic_field_name: 'Enw\'r geiriadur', - dic_info: 'Ar y cychwyn, caiff y Geiriadur ei storio mewn Cwci. Er, mae terfyn ar faint cwcis. Pan fydd Gweiriadur Defnyddiwr yn tyfu tu hwnt i gyfyngiadau maint Cwci, caiff y geiriadur ei storio ar ein gweinydd ni. er mwyn storio eich geiriadur poersonol chi ar ein gweinydd, bydd angen i chi osod enw ar gyfer y geiriadur. Os oes geiriadur \'da chi ar ein gweinydd yn barod, teipiwch ei enw a chliciwch y botwm Adfer.', - dic_rename: 'Ailenwi', - dic_restore: 'Adfer', - dictionariesTab: 'Geiriaduron', - disable: 'Analluogi SCAYT', - emptyDic: 'Ni ddylai enw\'r geiriadur fod yn wag.', - enable: 'Galluogi SCAYT', - ignore: 'Anwybyddu', - ignoreAll: 'Anwybyddu pob', - ignoreDomainNames: 'Anwybyddu Enwau Parth', - langs: 'Ieithoedd', - languagesTab: 'Ieithoedd', - mixedCase: 'Anwybyddu Geiriau â Chymysgedd Nodau Uwch ac Is', - mixedWithDigits: 'Anwybyddu Geiriau â Rhifau', - moreSuggestions: 'Awgrymiadau pellach', - opera_title: 'Heb ei gynnal gan Opera', - options: 'Opsiynau', - optionsTab: 'Opsiynau', - title: 'Gwirio\'r Sillafu Wrth Deipio', - toggle: 'Togl SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/da.js deleted file mode 100644 index 43eb49ac8ac..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/da.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'da', { - about: 'Om SCAYT', - aboutTab: 'Om', - addWord: 'Tilføj ord', - allCaps: 'Ignorer alle store bogstaver', - dic_create: 'Opret', - dic_delete: 'Slet', - dic_field_name: 'Navn på ordbog', - dic_info: 'Til start er brugerordbogen gemt i en Cookie. Dog har Cookies en begrænsning på størrelse. Når ordbogen når en bestemt størrelse kan den blive gemt på vores server. For at gemme din personlige ordbog på vores server skal du angive et navn for denne. Såfremt du allerede har gemt en ordbog, skriv navnet på denne og klik på Gendan knappen.', - dic_rename: 'Omdøb', - dic_restore: 'Gendan', - dictionariesTab: 'Ordbøger', - disable: 'Deaktivér SCAYT', - emptyDic: 'Ordbogsnavn må ikke være tom.', - enable: 'Aktivér SCAYT', - ignore: 'Ignorér', - ignoreAll: 'Ignorér alle', - ignoreDomainNames: 'Ignorér domænenavne', - langs: 'Sprog', - languagesTab: 'Sprog', - mixedCase: 'Ignorer ord med store og små bogstaver', - mixedWithDigits: 'Ignorér ord med numre', - moreSuggestions: 'Flere forslag', - opera_title: 'Ikke supporteret af Opera', - options: 'Indstillinger', - optionsTab: 'Indstillinger', - title: 'Stavekontrol mens du skriver', - toggle: 'Skift/toggle SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/de.js deleted file mode 100644 index c058230e388..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/de.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'de', { - about: 'Über SCAYT', - aboutTab: 'Über', - addWord: 'Wort hinzufügen', - allCaps: 'Groß geschriebenen Wörter ignorieren', - dic_create: 'Erzeugen', - dic_delete: 'Löschen', - dic_field_name: 'Wörterbuchname', - dic_info: 'Anfangs wird das Benutzerwörterbuch in einem Cookie gespeichert. Allerdings sind Cookies in der Größe begrenzt. Wenn das Benutzerwörterbuch bis zu einem Punkt wächst, wo es nicht mehr in einem Cookie gespeichert werden kann, wird das Benutzerwörterbuch auf dem Server gespeichert. Um Ihr persönliches Wörterbuch auf dem Server zu speichern, müssen Sie einen Namen für das Wörterbuch angeben. Falls Sie schon ein gespeicherte Wörterbuch haben, geben Sie bitte dessen Namen ein und klicken Sie auf die Schaltfläche Wiederherstellen.', - dic_rename: 'Umbenennen', - dic_restore: 'Wiederherstellen', - dictionariesTab: 'Wörterbücher', - disable: 'SCAYT ausschalten', - emptyDic: 'Wörterbuchname sollte leer sein.', - enable: 'SCAYT einschalten', - ignore: 'Ignorieren', - ignoreAll: 'Alle ignorieren', - ignoreDomainNames: 'Domain-Namen ignorieren', - langs: 'Sprachen', - languagesTab: 'Sprachen', - mixedCase: 'Wörter mit gemischte Setzkasten ignorieren', - mixedWithDigits: 'Wörter mit Zahlen ignorieren', - moreSuggestions: 'Mehr Vorschläge', - opera_title: 'Nicht von Opera unterstützt', - options: 'Optionen', - optionsTab: 'Optionen', - title: 'Rechtschreibprüfung während der Texteingabe (SCAYT)', - toggle: 'SCAYT umschalten', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/el.js deleted file mode 100644 index afa5b3374ee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/el.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'el', { - about: 'About SCAYT', // MISSING - aboutTab: 'Περί', - addWord: 'Προσθήκη στο λεξικό', - allCaps: 'Να αγνοούνται όλες οι λέξεις σε κεφαλαία', - dic_create: 'Δημιουργία', - dic_delete: 'Διαγραφή', - dic_field_name: 'Όνομα λεξικού', - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Μετονομασία', - dic_restore: 'Ανάκτηση', - dictionariesTab: 'Λεξικά', - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Το όνομα του λεξικού δεν πρέπει να είναι κενό.', - enable: 'Enable SCAYT', // MISSING - ignore: 'Αγνόησε το', - ignoreAll: 'Να αγνοηθούν όλα', - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Γλώσσες', - languagesTab: 'Γλώσσες', - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'Περισσότερες προτάσεις', - opera_title: 'Not supported by Opera', // MISSING - options: 'Επιλογές', - optionsTab: 'Επιλογές', - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-au.js deleted file mode 100644 index 7262c5b3d44..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-au.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'en-au', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT',// MISSING - noSuggestions: 'No suggestion' // MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-ca.js deleted file mode 100644 index ffff6c8bd62..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-ca.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'en-ca', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT',// MISSING - noSuggestions: 'No suggestion' // MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-gb.js deleted file mode 100644 index 2693a1b4444..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en-gb.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'en-gb', { - about: 'About SCAYT', - aboutTab: 'About', - addWord: 'Add Word', - allCaps: 'Ignore All-Caps Words', - dic_create: 'Create', - dic_delete: 'Delete', - dic_field_name: 'Dictionary name', - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', - dic_rename: 'Rename', - dic_restore: 'Restore', - dictionariesTab: 'Dictionaries', - disable: 'Disable SCAYT', - emptyDic: 'Dictionary name should not be empty.', - enable: 'Enable SCAYT', - ignore: 'Ignore', - ignoreAll: 'Ignore All', - ignoreDomainNames: 'Ignore Domain Names', - langs: 'Languages', - languagesTab: 'Languages', - mixedCase: 'Ignore Words with Mixed Case', - mixedWithDigits: 'Ignore Words with Numbers', - moreSuggestions: 'More suggestions', - opera_title: 'Not supported by Opera', - options: 'Options', - optionsTab: 'Options', - title: 'Spell Check As You Type', - toggle: 'Toggle SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en.js deleted file mode 100644 index 59fab5dd84d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/en.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'en', { - about: 'About SCAYT', - aboutTab: 'About', - addWord: 'Add Word', - allCaps: 'Ignore All-Caps Words', - dic_create: 'Create', - dic_delete: 'Delete', - dic_field_name: 'Dictionary name', - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', - dic_rename: 'Rename', - dic_restore: 'Restore', - dictionariesTab: 'Dictionaries', - disable: 'Disable SCAYT', - emptyDic: 'Dictionary name should not be empty.', - enable: 'Enable SCAYT', - ignore: 'Ignore', - ignoreAll: 'Ignore All', - ignoreDomainNames: 'Ignore Domain Names', - langs: 'Languages', - languagesTab: 'Languages', - mixedCase: 'Ignore Words with Mixed Case', - mixedWithDigits: 'Ignore Words with Numbers', - moreSuggestions: 'More suggestions', - opera_title: 'Not supported by Opera', - options: 'Options', - optionsTab: 'Options', - title: 'Spell Check As You Type', - toggle: 'Toggle SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/eo.js deleted file mode 100644 index e320537fdbf..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/eo.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'eo', { - about: 'Pri OKDVT', - aboutTab: 'Pri', - addWord: 'Almeti la vorton', - allCaps: 'Ignori la vortojn skribitajn nur per ĉefliteroj', - dic_create: 'Krei', - dic_delete: 'Forigi', - dic_field_name: 'Vortaronomo', - dic_info: 'Komence la vortaro de la uzanto estas konservita en kuketo. Tamen la kuketgrando estas limigita. Kiam la vortaro de la uzanto atingas grandon, kiu ne plu ebligas konservi ĝin en kuketo, tiam la vortaro povas esti konservata en niaj serviloj. Por konservi vian personan vortaron en nian servilon, vi devas indiki nomon por tiu vortaro. Se vi jam havas konservitan vortaron, bonvolu entajpi ties nomon kaj alklaki la restaŭrbutonon.', - dic_rename: 'Renomi', - dic_restore: 'Restaŭri', - dictionariesTab: 'Vortaroj', - disable: 'Malebligi OKDVT', - emptyDic: 'La vortaronomo ne devus esti malplena.', - enable: 'Ebligi OKDVT', - ignore: 'Ignori', - ignoreAll: 'Ignori ĉion', - ignoreDomainNames: 'Ignori domajnajn nomojn', - langs: 'Lingvoj', - languagesTab: 'Lingvoj', - mixedCase: 'Ignori vortojn kun miksa uskleco', - mixedWithDigits: 'Ignori vortojn kun nombroj', - moreSuggestions: 'Pli da sugestoj', - opera_title: 'Ne subportata de Opera', - options: 'Opcioj', - optionsTab: 'Opcioj', - title: 'OrtografiKontrolado Dum Vi Tajpas (OKDVT)', - toggle: 'Baskuligi OKDVT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/es.js deleted file mode 100644 index b78bf362a12..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/es.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'es', { - about: 'Acerca de Corrector', - aboutTab: 'Acerca de', - addWord: 'Añadir palabra', - allCaps: 'Omitir palabras en MAYÚSCULAS', - dic_create: 'Crear', - dic_delete: 'Borrar', - dic_field_name: 'Nombre del diccionario', - dic_info: 'Inicialmente el Diccionario de usuario se guarda en una Cookie. Sin embargo, las cookies están limitadas en tamaño. Cuando el diccionario crece a un punto en el que no se puede guardar en una Cookie, el diccionario puede ser almacenado en nuestro servidor. Para almacenar su diccionario personalizado en nuestro servidor debe especificar un nombre para su diccionario. Si ya ha guardado un diccionaro, por favor, escriba su nombre y pulse el botón Recuperar', - dic_rename: 'Renombrar', - dic_restore: 'Recuperar', - dictionariesTab: 'Diccionarios', - disable: 'Desactivar Corrector', - emptyDic: 'El nombre del diccionario no puede estar en blanco.', - enable: 'Activar Corrector', - ignore: 'Ignorar', - ignoreAll: 'Ignorar Todas', - ignoreDomainNames: 'Omitir nombres de dominio', - langs: 'Idiomas', - languagesTab: 'Idiomas', - mixedCase: 'Ignorar palabras con combinación de mayúsculas y minúsculas', - mixedWithDigits: 'Omitir palabras con números', - moreSuggestions: 'Más sugerencias', - opera_title: 'No soportado en Opera', - options: 'Opciones', - optionsTab: 'Opciones', - title: 'Comprobar Ortografía Mientras Escribe', - toggle: 'Cambiar Corrector', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/et.js deleted file mode 100644 index b8ed3975c13..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/et.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'et', { - about: 'SCAYT-ist lähemalt', - aboutTab: 'Lähemalt', - addWord: 'Lisa sõna', - allCaps: 'Läbivate suurtähtedega sõnade eiramine', - dic_create: 'Loo', - dic_delete: 'Kustuta', - dic_field_name: 'Sõnaraamatu nimi', - dic_info: 'Alguses säilitatakse kasutaja sõnaraamatut küpsises. Küpsise suurus on piiratud. Pärast sõnaraamatu kasvamist nii suureks, et see küpsisesse ei mahu, võib sõnaraamatut hoida meie serveris. Oma isikliku sõnaraamatu hoidmiseks meie serveris pead andma sellele nime. Kui sa juba oled sõnaraamatu salvestanud, sisesta selle nimi ja klõpsa taastamise nupule.', - dic_rename: 'Nimeta ümber', - dic_restore: 'Taasta', - dictionariesTab: 'Sõnaraamatud', - disable: 'SCAYT keelatud', - emptyDic: 'Sõnaraamatu nimi ei tohi olla tühi.', - enable: 'SCAYT lubatud', - ignore: 'Eira', - ignoreAll: 'Eira kõiki', - ignoreDomainNames: 'Domeeninimede eiramine', - langs: 'Keeled', - languagesTab: 'Keeled', - mixedCase: 'Tavapäratu tõstuga sõnade eiramine', - mixedWithDigits: 'Numbreid sisaldavate sõnade eiramine', - moreSuggestions: 'Veel soovitusi', - opera_title: 'Operas pole toetatud', - options: 'Valikud', - optionsTab: 'Valikud', - title: 'Õigekirjakontroll kirjutamise ajal', - toggle: 'SCAYT sisse/välja lülitamine', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/eu.js deleted file mode 100644 index 78011702274..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/eu.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'eu', { - about: 'SCAYTi buruz', - aboutTab: 'Honi buruz', - addWord: 'Hitza Gehitu', - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Hiztegiak', - disable: 'Desgaitu SCAYT', - emptyDic: 'Hiztegiaren izena ezin da hutsik egon.', - enable: 'Gaitu SCAYT', - ignore: 'Baztertu', - ignoreAll: 'Denak baztertu', - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Hizkuntzak', - languagesTab: 'Hizkuntzak', - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'Iradokizun gehiago', - opera_title: 'Not supported by Opera', // MISSING - options: 'Aukerak', - optionsTab: 'Aukerak', - title: 'Ortografia Zuzenketa Idatzi Ahala (SCAYT)', - toggle: 'SCAYT aldatu', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fa.js deleted file mode 100644 index 7a3381d5e29..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fa.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'fa', { - about: 'درباره SCAYT', - aboutTab: 'درباره', - addWord: 'افزودن Word', - allCaps: 'نادیده گرفتن همه کلاه-واژهها', - dic_create: 'ایجاد', - dic_delete: 'حذف', - dic_field_name: 'نام دیکشنری', - dic_info: 'در ابتدا دیکشنری کاربر در کوکی ذخیره میشود. با این حال، کوکیها در اندازه محدود شدهاند. وقتی که دیکشنری کاربری بزرگ میشود و به نقطهای که نمیتواند در کوکی ذخیره شود، پس از آن دیکشنری ممکن است بر روی سرور ما ذخیره شود. برای ذخیره دیکشنری شخصی شما بر روی سرور ما، باید یک نام برای دیکشنری خود مشخص نمایید. اگر شما قبلا یک دیکشنری روی سرور ما ذخیره کردهاید، لطفا نام آنرا درج و روی دکمه بازیافت کلیک نمایید.', - dic_rename: 'تغییر نام', - dic_restore: 'بازیافت', - dictionariesTab: 'دیکشنریها', - disable: 'غیرفعالسازی SCAYT', - emptyDic: 'نام دیکشنری نباید خالی باشد.', - enable: 'فعالسازی SCAYT', - ignore: 'عبور کردن', - ignoreAll: 'عبور کردن از همه', - ignoreDomainNames: 'عبور از نامهای دامنه', - langs: 'زبانها', - languagesTab: 'زبانها', - mixedCase: 'عبور از کلماتی مرکب از حروف بزرگ و کوچک', - mixedWithDigits: 'عبور از کلمات به همراه عدد', - moreSuggestions: 'پیشنهادهای بیشتر', - opera_title: 'توسط اپرا پشتیبانی نمیشود', - options: 'گزینهها', - optionsTab: 'گزینهها', - title: 'بررسی املای تایپ شما', - toggle: 'ضامن SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fi.js deleted file mode 100644 index d88231be189..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fi.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'fi', { - about: 'Tietoja oikoluvusta kirjoitetaessa', - aboutTab: 'Tietoa', - addWord: 'Lisää sana', - allCaps: 'Ohita sanat, jotka on kirjoitettu kokonaan isoilla kirjaimilla', - dic_create: 'Luo', - dic_delete: 'Poista', - dic_field_name: 'Sanakirjan nimi', - dic_info: 'Oletuksena sanakirjat tallennetaan evästeeseen, mutta evästeiden koko on kuitenkin rajallinen. Sanakirjan kasvaessa niin suureksi, ettei se enää mahdu evästeeseen, sanakirja täytyy tallentaa palvelimellemme. Tallentaaksesi sanakirjasi palvelimellemme tulee sinun antaa sille nimi. Jos olet jo tallentanut sanakirjan, anna sen nimi ja klikkaa Palauta-painiketta', - dic_rename: 'Nimeä uudelleen', - dic_restore: 'Palauta', - dictionariesTab: 'Sanakirjat', - disable: 'Poista käytöstä oikoluku kirjoitetaessa', - emptyDic: 'Sanakirjan nimi on annettava.', - enable: 'Ota käyttöön oikoluku kirjoitettaessa', - ignore: 'Ohita', - ignoreAll: 'Ohita kaikki', - ignoreDomainNames: 'Ohita verkkotunnukset', - langs: 'Kielet', - languagesTab: 'Kielet', - mixedCase: 'Ohita sanat, joissa on sekoitettu isoja ja pieniä kirjaimia', - mixedWithDigits: 'Ohita sanat, joissa on numeroita', - moreSuggestions: 'Lisää ehdotuksia', - opera_title: 'Opera ei tue tätä ominaisuutta', - options: 'Asetukset', - optionsTab: 'Asetukset', - title: 'Oikolue kirjoitettaessa', - toggle: 'Vaihda oikoluku kirjoittaessa tilaa', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fo.js deleted file mode 100644 index 4c89b6be610..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fo.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'fo', { - about: 'Um SCAYT', - aboutTab: 'Um', - addWord: 'Legg orð afturat', - allCaps: 'Loyp orð við bert stórum stavum um', - dic_create: 'Upprætta nýggja', - dic_delete: 'Strika', - dic_field_name: 'Orðabókanavn', - dic_info: 'Upprunaliga er brúkara-orðabókin goymd í eini cookie í tínum egna kaga. Men hesar cookies eru avmarkaðar í stødd. Tá brúkara-orðabókin veksur seg ov stóra til eina cookie, so er møguligt at goyma hana á ambætara okkara. Fyri at goyma persónligu orðabókina á ambætaranum eigur tú at velja eitt navn til tína skuffu. Hevur tú longu goymt eina orðabók, so vinarliga skriva navnið og klikk á knøttin Endurskapa.', - dic_rename: 'Broyt', - dic_restore: 'Endurskapa', - dictionariesTab: 'Orðabøkur', - disable: 'Nokta SCAYT', - emptyDic: 'Heiti á orðabók eigur ikki at vera tómt.', - enable: 'Loyv SCAYT', - ignore: 'Ignorera', - ignoreAll: 'Ignorera alt', - ignoreDomainNames: 'loyp økisnøvn um', - langs: 'Tungumál', - languagesTab: 'Tungumál', - mixedCase: 'Loyp orð við blandaðum smáum og stórum stavum um', - mixedWithDigits: 'Loyp orð við tølum um', - moreSuggestions: 'Fleiri tilráðingar', - opera_title: 'Ikki stuðlað í Opera', - options: 'Uppseting', - optionsTab: 'Uppseting', - title: 'Kanna stavseting, meðan tú skrivar', - toggle: 'Toggle SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fr-ca.js deleted file mode 100644 index 6022a87b701..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fr-ca.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'fr-ca', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fr.js deleted file mode 100644 index 7a82a691104..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/fr.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'fr', { - about: 'A propos de SCAYT', - aboutTab: 'À propos de', - addWord: 'Ajouter le mot', - allCaps: 'Ignorer les mots entièrement en majuscules', - dic_create: 'Créer', - dic_delete: 'Effacer', - dic_field_name: 'Nom du dictionnaire', - dic_info: 'Initialement, le dictionnaire de l\'utilisateur est stocké dans un cookie. Cependant, les cookies sont limités en taille. Quand le dictionnaire atteint une taille qu\'il n\'est plus possible de stocker dans un cookie, il peut alors être stocké sur nos serveurs. Afin de stocker votre dictionnaire personnel sur nos serveurs, vous devez spécifier un nom pour ce dictionnaire. Si vous avez déjà un dictionnaire stocké, merci de taper son nom puis cliquer sur Restaurer pour le récupérer.', - dic_rename: 'Renommer', - dic_restore: 'Restaurer', - dictionariesTab: 'Dictionnaires', - disable: 'Désactiver SCAYT', - emptyDic: 'Le nom du dictionnaire ne devrait pas être vide.', - enable: 'Activer SCAYT', - ignore: 'Ignorer', - ignoreAll: 'Ignorer Tout', - ignoreDomainNames: 'Ignorer les noms de domaines', - langs: 'Langues', - languagesTab: 'Langues', - mixedCase: 'Ignorer les mots à casse multiple', - mixedWithDigits: 'Ignorer les mots contenant des chiffres', - moreSuggestions: 'Plus de suggestions', - opera_title: 'Non supporté par Opera', - options: 'Options', - optionsTab: 'Options', - title: 'Vérification de l\'Orthographe en Cours de Frappe (SCAYT)', - toggle: 'Activer/Désactiver SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/gl.js deleted file mode 100644 index dce2c9ff537..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/gl.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'gl', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/gu.js deleted file mode 100644 index 7ded05f2ef9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/gu.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'gu', { - about: 'SCAYT વિષે', - aboutTab: 'વિષે', - addWord: 'શબ્દ ઉમેરવો', - allCaps: 'ઓલ-કેપ્સ વર્ડ છોડી દો.', - dic_create: 'બનાવવું', - dic_delete: 'કાઢી નાખવું', - dic_field_name: 'શબ્દકોશ નામ', - dic_info: 'પેહલા User Dictionary, Cookie તરીકે સ્ટોર થાય છે. પણ Cookie ની સમતા ઓછી છે. જયારે User Dictionary, Cookie તરીકે સ્ટોર ના કરી શકાય, ત્યારે તે અમારા સર્વર પર સ્ટોર થાય છે. તમારી વ્યતિગત ડીકસ્નરી ને સર્વર પર સ્ટોર કરવા માટે તમારે તેનું નામ આપવું પડશે. જો તમે તમારી ડીકસ્નરી નું નામ આપેલું હોય તો તમે રિસ્ટોર બટન ક્લીક કરી શકો.', - dic_rename: 'નવું નામ આપવું', - dic_restore: 'પાછું ', - dictionariesTab: 'શબ્દકોશ', - disable: 'SCAYT ડિસેબલ કરવું', - emptyDic: 'ડિક્સનરીનું નામ ખાલી ના હોય.', - enable: 'SCAYT એનેબલ કરવું', - ignore: 'ઇગ્નોર', - ignoreAll: 'બધા ઇગ્નોર ', - ignoreDomainNames: 'ડોમેન નામ છોડી દો.', - langs: 'ભાષાઓ', - languagesTab: 'ભાષા', - mixedCase: 'મિક્સ કેસ વર્ડ છોડી દો.', - mixedWithDigits: 'આંકડા વાળા શબ્દ છોડી દો.', - moreSuggestions: 'વધારે વિકલ્પો', - opera_title: 'ઓપેરામાં સપોર્ટ નથી', - options: 'વિકલ્પો', - optionsTab: 'વિકલ્પો', - title: 'ટાઈપ કરતા સ્પેલ તપાસો', - toggle: 'SCAYT ટોગલ', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/he.js deleted file mode 100644 index 977f788fb09..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/he.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'he', { - about: 'אודות SCAYT', - aboutTab: 'אודות', - addWord: 'הוספת מילה', - allCaps: 'התעלם ממילים שכל אותיותיהן גדולות', - dic_create: 'יצירה', - dic_delete: 'מחיקה', - dic_field_name: 'שם המילון', - dic_info: 'בהתחלה מילון המשתמש מאוחסן בעוגיה, אך עוגיות מוגבלות במקום. כאשר המילון מגיע לגודל בו הוא אינו יכול להתאכסן בעוגיה, המילון צריך להתאכסן בשרתנו. לשם כך עליך לתת שם למילון. אם כבר יש לך מילון מאוחסן, יש להכניס את שמו וללחוץ על כפתור השחזור.', - dic_rename: 'שינוי שם', - dic_restore: 'שחזור', - dictionariesTab: 'מילון', - disable: 'בטל SCAYT', - emptyDic: 'יש לבחור מילון.', - enable: 'אפשר SCAYT', - ignore: 'התעלמות', - ignoreAll: 'התעלמות מהכל', - ignoreDomainNames: 'התעלם משמות מתחם', - langs: 'שפות', - languagesTab: 'שפות', - mixedCase: 'התעלם ממילים עם אותיות גדולות וקטנות ביחד', - mixedWithDigits: 'התעלם ממילים עם מספרים', - moreSuggestions: 'הצעות נוספות', - opera_title: 'לא זמין בדפדפן אופרה', - options: 'אפשרויות', - optionsTab: 'אפשרויות', - title: 'בדיקת איות בזמן כתיבה (SCAYT)', - toggle: 'שינוי SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hi.js deleted file mode 100644 index 3e8e8af28b0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hi.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'hi', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hr.js deleted file mode 100644 index f0ebff9fe7d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hr.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'hr', { - about: 'O SCAYT', - aboutTab: 'O SCAYT', - addWord: 'Dodaj riječ', - allCaps: 'Ignoriraj riječi s velikim slovima', - dic_create: 'Napravi', - dic_delete: 'Obriši', - dic_field_name: 'Naziv riječnika', - dic_info: 'Na početku se korisnički Riječnik sprema u Cookie. Nažalost, veličina im je ograničena. Kada korisnički Riječnik naraste preko te veličine, Riječnik će biti smješten na naš server. Kako bi se korisnički Riječnik spremio na naš server morate odabrati naziv Vašeg Riječnika. Ukoliko ste već prije spremali Riječnik na naše servere, unesite naziv Riječnika i pritisnite na Povrati.', - dic_rename: 'Promijeni naziv', - dic_restore: 'Povrati', - dictionariesTab: 'Rječnici', - disable: 'Onemogući SCAYT', - emptyDic: 'Naziv rječnika ne smije biti prazno.', - enable: 'Omogući SCAYT', - ignore: 'Zanemari', - ignoreAll: 'Zanemari sve', - ignoreDomainNames: 'Ignoriraj nazive domena', - langs: 'Jezici', - languagesTab: 'Jezici', - mixedCase: 'Ignoriraj riječi s miješanim slovima', - mixedWithDigits: 'Ignoriraj riječi s brojevima', - moreSuggestions: 'Više prijedloga', - opera_title: 'Nije podržano u Operi', - options: 'Opcije', - optionsTab: 'Opcije', - title: 'Provjeri pravopis tijekom tipkanja (SCAYT)', - toggle: 'Omoguću/Onemogući SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hu.js deleted file mode 100644 index 05802b6571e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/hu.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'hu', { - about: 'SCAYT névjegy', - aboutTab: 'Névjegy', - addWord: 'Szó hozzáadása', - allCaps: 'Nagybetűs szavak kihagyása', - dic_create: 'Létrehozás', - dic_delete: 'Törlés', - dic_field_name: 'Szótár neve', - dic_info: 'Kezdetben a felhasználói szótár böngésző sütiben tárolódik. Azonban a sütik maximális mérete korlátozott. Amikora a szótár akkora lesz, hogy már sütiben nem lehet tárolni, akkor a szótárat tárolhatja a szerveren is. Ehhez egy nevet kell megadni a szótárhoz. Amennyiben már van szerveren tárolt szótára, adja meg a nevét és kattintson a visszaállítás gombra.', - dic_rename: 'Átnevezés', - dic_restore: 'Visszaállítás', - dictionariesTab: 'Szótár', - disable: 'SCAYT letiltása', - emptyDic: 'A szótár nevét meg kell adni.', - enable: 'SCAYT engedélyezése', - ignore: 'Kihagy', - ignoreAll: 'Összes kihagyása', - ignoreDomainNames: 'Domain nevek kihagyása', - langs: 'Nyelvek', - languagesTab: 'Nyelvek', - mixedCase: 'Kis és nagybetűt is tartalmazó szavak kihagyása', - mixedWithDigits: 'Számokat tartalmazó szavak kihagyása', - moreSuggestions: 'További javaslatok', - opera_title: 'Az Opera nem támogatja', - options: 'Beállítások', - optionsTab: 'Beállítások', - title: 'Helyesírás ellenőrzés gépelés közben', - toggle: 'SCAYT kapcsolása', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/is.js deleted file mode 100644 index dc3aa70332e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/is.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'is', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/it.js deleted file mode 100644 index 97f3e9374be..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/it.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'it', { - about: 'About COMS', - aboutTab: 'Info', - addWord: 'Aggiungi Parola', - allCaps: 'Ignora Parole in maiuscolo', - dic_create: 'Crea', - dic_delete: 'Cancella', - dic_field_name: 'Nome del dizionario', - dic_info: 'Inizialmente il dizionario utente è memorizzato in un Cookie. I Cookie però hanno una dimensioni massima limitata. Quando il dizionario utente creasce a tal punto da non poter più essere memorizzato in un Cookie, allora il dizionario può essere memorizzato sul nostro server. Per memorizzare il proprio dizionario personale sul nostro server, è necessario specificare un nome per il proprio dizionario. Se avete già memorizzato un dizionario, inserite il nome che gli avete dato e premete il pulsante Ripristina.', - dic_rename: 'Rinomina', - dic_restore: 'Ripristina', - dictionariesTab: 'Dizionari', - disable: 'Disabilita COMS', - emptyDic: 'Il nome del dizionario non può essere vuoto.', - enable: 'Abilita COMS', - ignore: 'Ignora', - ignoreAll: 'Ignora tutti', - ignoreDomainNames: 'Ignora nomi di dominio', - langs: 'Lingue', - languagesTab: 'Lingue', - mixedCase: 'Ignora parole con maiuscole e minuscole', - mixedWithDigits: 'Ignora parole con numeri', - moreSuggestions: 'Altri suggerimenti', - opera_title: 'Non supportato da Opera', - options: 'Opzioni', - optionsTab: 'Opzioni', - title: 'Controllo Ortografico Mentre Scrivi', - toggle: 'Inverti abilitazione SCOMS', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ja.js deleted file mode 100644 index b89ad04c976..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ja.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ja', { - about: 'SCAYTﾊﾞｰｼﾞｮﾝ', - aboutTab: 'バージョン情報', - addWord: '語句追加', - allCaps: '全て大文字の単語を無視', - dic_create: '登録', - dic_delete: '削除', - dic_field_name: '辞書名', - dic_info: '始めユーザーディレクトリは、Cookieに保存されます。但し Cookie はサイズに制限があります。ユーザーディレクトリがCookieに保存できないサイズに到達するとディレクトリはサーバー上に保存されます。個人のディレクトリをサーバー上に保存するには、ディレクトリ名を明示する必要があります。もし既に保存されたディレクトリがある場合、その名前を入力し、元に戻すボタンを押してください。', - dic_rename: '名前変更', - dic_restore: '元に戻す', - dictionariesTab: '辞書', - disable: 'SCAYT無効', - emptyDic: '辞書名は必ず入力してください', - enable: 'SCAYT有効', - ignore: '無視', - ignoreAll: 'すべて無視', - ignoreDomainNames: 'ドメイン名を無視', - langs: '言語', - languagesTab: '言語', - mixedCase: '大文字小文字混在の単語を無視', - mixedWithDigits: '数字付き単語を無視', - moreSuggestions: '他の候補', - opera_title: 'Operaではサポートされません', - options: 'オプション', - optionsTab: 'オプション', - title: 'スペルチェック設定(SCAYT)', - toggle: 'SCAYT切替', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ka.js deleted file mode 100644 index 28bf7d44ec1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ka.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ka', { - about: 'SCAYT-ის შესახებ', - aboutTab: 'ინფორმაცია', - addWord: 'სიტყვის დამატება', - allCaps: 'დიდი ასოებით დაწერილი სიტყვების უგულებელყოფა', - dic_create: 'შექმნა', - dic_delete: 'წაშლა', - dic_field_name: 'ლექსიკონის სახელი', - dic_info: 'თავდაპირველად მომხმარებლის ლექსიკონი ინახება Cookie-ში. თუმცა Cookie შეზღუდულია ზომაში. როცა ლექსიკონის ზომა გაიზრდება საკმაოდ ის შეიძლება შევინახოთ ჩვენს სერვერზე. ჩვენს სერვერზე ლექსიკონს შესანახად უნდა მიუთითოთ მისი სახელი. თუ უკე გაქვთ ლექსიკონი, აკრიფეთ მისი სახელი და დააჭირეთ "დაბრუნების" ღილაკს.', - dic_rename: 'გადარქმევა', - dic_restore: 'დაბრუნება', - dictionariesTab: 'ლექსიკონები', - disable: 'SCAYT-ის გამორთვა', - emptyDic: 'ლექსიკონის სიტყვა არ უნდა იყოს ცარიელი.', - enable: 'SCAYT-ის ჩართვა', - ignore: 'უგულებელყოფა', - ignoreAll: 'ყველას უგულებელყოფა', - ignoreDomainNames: 'დომენური სახელების უგულებელყოფა', - langs: 'ენები', - languagesTab: 'ენები', - mixedCase: 'შერეული ასოებანი სიტყვების უგულებელყოფა', - mixedWithDigits: 'ციფრებიანი სიტყვების უგულებელყოფა', - moreSuggestions: 'მეტი შემოთავაზება', - opera_title: 'არაა მხარდაჭერილი Opera-ს მიერ', - options: 'პარამეტრები', - optionsTab: 'პარამეტრები', - title: 'მართლწერის შემოწმება კრეფისას', - toggle: 'SCAYT-ის გადართვა', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/km.js deleted file mode 100644 index a0c5833ad6b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/km.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'km', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ko.js deleted file mode 100644 index 65aacc50906..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ko.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ko', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ku.js deleted file mode 100644 index 8067717007c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ku.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ku', { - about: 'دهربارهی SCAYT', - aboutTab: 'دهربارهی', - addWord: 'زیادکردنی ووشه', - allCaps: 'پشتگوێخستنی وشانهی پێکهاتووه لهپیتی گهوره', - dic_create: 'درووستکردن', - dic_delete: 'سڕینهوه', - dic_field_name: 'ناوی فهرههنگ', - dic_info: 'لهبنچینهدا فهرههنگی بهکارهێنهر کۆگاکردن کراوه له شهکرۆکه Cookie, ههرچۆنێك بێت شهکۆرکه سنووردار کراوه له قهباره کۆگاکردن.کاتێك فهرههنگی بهکارهێنهر گهیشته ئهم خاڵهی کهناتوانرێت زیاتر کۆگاکردن بکرێت له شهکرۆکه، ئهوسا فهرههنگهکه پێویسته کۆگابکرێت له ڕاژهکهی ئێمه. بۆ کۆگاکردنی زانیاری تایبهتی فهرههنگهکه له ڕاژهکهی ئێمه, پێویسته ناوێك ههڵبژێریت بۆ فهرههنگهکه. گهر تۆ فهرههنگێکی کۆگاکراوت ههیه, تکایه ناوی فهرههنگهکه بنووسه وه کلیکی دوگمهی گهڕاندنهوه بکه.', - dic_rename: 'گۆڕینی ناو', - dic_restore: 'گهڕاندنهوه', - dictionariesTab: 'فهرههنگهکان', - disable: 'ناچالاککردنی SCAYT', - emptyDic: 'ناوی فهرههنگ نابێت خاڵی بێت.', - enable: 'چالاککردنی SCAYT', - ignore: 'پشتگوێخستن', - ignoreAll: 'پشتگوێخستنی ههمووی', - ignoreDomainNames: 'پشتگوێخستنی دۆمهین', - langs: 'زمانهکان', - languagesTab: 'زمانهکان', - mixedCase: 'پشتگوێخستنی وشانهی پێکهاتووه لهپیتی گهورهو بچووك', - mixedWithDigits: 'پشتگوێخستنی وشانهی پێکهاتووه لهژماره', - moreSuggestions: 'پێشنیاری زیاتر', - opera_title: 'پشتیوانی نهکراوه لهلایهن Opera', - options: 'ههڵبژارده', - optionsTab: 'ههڵبژارده', - title: 'پشکنینی نووسه لهکاتی نووسین', - toggle: 'گۆڕینی SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/lt.js deleted file mode 100644 index 674d7ec80d2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/lt.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'lt', { - about: 'Apie SCAYT', - aboutTab: 'Apie', - addWord: 'Pridėti žodį', - allCaps: 'Ignoruoti visas didžiąsias raides', - dic_create: 'Sukurti', - dic_delete: 'Ištrinti', - dic_field_name: 'Žodyno pavadinimas', - dic_info: 'Paprastai žodynas yra saugojamas sausainėliuose (cookies), kurių dydis, bet kokiu atveju, yra apribotas. Esant sausainėlių apimties pervišiui, viskas bus saugoma serveryje. Jei norite iš kart viską saugoti serveryje, turite sugalvoti žodynui pavadinimą. Jei jau turite žodyną, įrašykite pavadinimą ir nuspauskite Atstatyti mygtuką.', - dic_rename: 'Pervadinti', - dic_restore: 'Atstatyti', - dictionariesTab: 'Žodynai', - disable: 'Išjungti SCAYT', - emptyDic: 'Žodyno vardas neturėtų būti tuščias.', - enable: 'Įjungti SCAYT', - ignore: 'Ignoruoti', - ignoreAll: 'Ignoruoti viską', - ignoreDomainNames: 'Ignoruoti domenų vardus', - langs: 'Kalbos', - languagesTab: 'Kalbos', - mixedCase: 'Ignoruoti maišyto dydžio raides', - mixedWithDigits: 'Ignoruoti raides su skaičiais', - moreSuggestions: 'Daugiau patarimų', - opera_title: 'Nepalaikoma naršyklėje Opera', - options: 'Parametrai', - optionsTab: 'Parametrai', - title: 'Tikrinti klaidas kai rašoma', - toggle: 'Perjungti SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/lv.js deleted file mode 100644 index 4ff65218e6a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/lv.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'lv', { - about: 'Par SCAYT', - aboutTab: 'Par', - addWord: 'Pievienot vārdu', - allCaps: 'Ignorēt vārdus ar lielajiem burtiem', - dic_create: 'Izveidot', - dic_delete: 'Dzēst', - dic_field_name: 'Vārdnīcas nosaukums', - dic_info: 'Sākumā lietotāja vārdnīca tiek glabāta Cookie. Diemžēl, Cookie ir ierobežots izmērs. Kad vārdnīca sasniegs izmēru, ka to vairs nevar glabāt Cookie, tā tiks noglabāta uz servera. Lai saglabātu personīgo vārdnīcu uz jūsu servera, jums jānorāda tās nosaukums. Ja jūs jau esiet noglabājuši vārdnīcu, lūdzu ierakstiet tās nosaukum un nospiediet Atjaunot pogu.', - dic_rename: 'Pārsaukt', - dic_restore: 'Atjaunot', - dictionariesTab: 'Vārdnīcas', - disable: 'Atslēgt SCAYT', - emptyDic: 'Vārdnīcas nosaukums nevar būt tukšs.', - enable: 'Ieslēgt SCAYT', - ignore: 'Ignorēt', - ignoreAll: 'Ignorēt visu', - ignoreDomainNames: 'Ignorēt domēnu nosaukumus', - langs: 'Valodas', - languagesTab: 'Valodas', - mixedCase: 'Ignorēt vārdus ar jauktu reģistru burtiem', - mixedWithDigits: 'Ignorēt vārdus ar skaitļiem', - moreSuggestions: 'Vairāk ieteikumi', - opera_title: 'Opera neatbalsta', - options: 'Uzstādījumi', - optionsTab: 'Uzstādījumi', - title: 'Pārbaudīt gramatiku rakstot', - toggle: 'Pārslēgt SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/mk.js deleted file mode 100644 index 757e173077f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/mk.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'mk', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/mn.js deleted file mode 100644 index 90ff9106c6a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/mn.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'mn', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Бий болгох', - dic_delete: 'Устгах', - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Нэрийг солих', - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Толь бичгүүд', - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Хэлүүд', - languagesTab: 'Хэлүүд', - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Сонголт', - optionsTab: 'Сонголт', - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ms.js deleted file mode 100644 index a7b14f33130..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ms.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ms', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/nb.js deleted file mode 100644 index 12344b3e7d6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/nb.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'nb', { - about: 'Om SCAYT', - aboutTab: 'Om', - addWord: 'Legg til ord', - allCaps: 'Ikke kontroller ord med kun store bokstaver', - dic_create: 'Opprett', - dic_delete: 'Slett', - dic_field_name: 'Ordboknavn', - dic_info: 'Brukerordboken lagres først i en informasjonskapsel på din maskin, men det er en begrensning på hvor mye som kan lagres her. Når ordboken blir for stor til å lagres i en informasjonskapsel, vil vi i stedet lagre ordboken på vår server. For å lagre din personlige ordbok på vår server, burde du velge et navn for ordboken din. Hvis du allerede har lagret en ordbok, vennligst skriv inn ordbokens navn og klikk på Gjenopprett-knappen.', - dic_rename: 'Gi nytt navn', - dic_restore: 'Gjenopprett', - dictionariesTab: 'Ordbøker', - disable: 'Slå av SCAYT', - emptyDic: 'Ordboknavn bør ikke være tom.', - enable: 'Slå på SCAYT', - ignore: 'Ignorer', - ignoreAll: 'Ignorer Alle', - ignoreDomainNames: 'Ikke kontroller domenenavn', - langs: 'Språk', - languagesTab: 'Språk', - mixedCase: 'Ikke kontroller ord med blandet små og store bokstaver', - mixedWithDigits: 'Ikke kontroller ord som inneholder tall', - moreSuggestions: 'Flere forslag', - opera_title: 'Ikke støttet av Opera', - options: 'Valg', - optionsTab: 'Valg', - title: 'Stavekontroll mens du skriver', - toggle: 'Veksle SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/nl.js deleted file mode 100644 index c054c36a20d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/nl.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'nl', { - about: 'Over SCAYT', - aboutTab: 'Over', - addWord: 'Woord toevoegen', - allCaps: 'Negeer woorden helemaal in hoofdletters', - dic_create: 'Aanmaken', - dic_delete: 'Verwijderen', - dic_field_name: 'Naam woordenboek', - dic_info: 'Initieel wordt het gebruikerswoordenboek opgeslagen in een cookie. Cookies zijn echter beperkt in grootte. Zodra het gebruikerswoordenboek het punt bereikt waarop het niet meer in een cookie opgeslagen kan worden, dan wordt het woordenboek op de server opgeslagen. Om je persoonlijke woordenboek op je eigen server op te slaan, moet je een mapnaam opgeven. Indien je al een woordenboek hebt opgeslagen, typ dan de naam en klik op de Terugzetten knop.', - dic_rename: 'Hernoemen', - dic_restore: 'Terugzetten', - dictionariesTab: 'Woordenboeken', - disable: 'SCAYT uitschakelen', - emptyDic: 'De naam van het woordenboek mag niet leeg zijn.', - enable: 'SCAYT inschakelen', - ignore: 'Negeren', - ignoreAll: 'Alles negeren', - ignoreDomainNames: 'Negeer domeinnamen', - langs: 'Talen', - languagesTab: 'Talen', - mixedCase: 'Negeer woorden met hoofd- en kleine letters', - mixedWithDigits: 'Negeer woorden met cijfers', - moreSuggestions: 'Meer suggesties', - opera_title: 'Niet ondersteund door Opera', - options: 'Opties', - optionsTab: 'Opties', - title: 'Controleer de spelling tijdens het typen', - toggle: 'SCAYT in/uitschakelen', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/no.js deleted file mode 100644 index 822d3b47aad..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/no.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'no', { - about: 'Om SCAYT', - aboutTab: 'Om', - addWord: 'Legg til ord', - allCaps: 'Ikke kontroller ord med kun store bokstaver', - dic_create: 'Opprett', - dic_delete: 'Slett', - dic_field_name: 'Ordboknavn', - dic_info: 'Brukerordboken lagres først i en informasjonskapsel på din maskin, men det er en begrensning på hvor mye som kan lagres her. Når ordboken blir for stor til å lagres i en informasjonskapsel, vil vi i stedet lagre ordboken på vår server. For å lagre din personlige ordbok på vår server, burde du velge et navn for ordboken din. Hvis du allerede har lagret en ordbok, vennligst skriv inn ordbokens navn og klikk på Gjenopprett-knappen.', - dic_rename: 'Gi nytt navn', - dic_restore: 'Gjenopprett', - dictionariesTab: 'Ordbøker', - disable: 'Slå av SCAYT', - emptyDic: 'Ordboknavn bør ikke være tom.', - enable: 'Slå på SCAYT', - ignore: 'Ignorer', - ignoreAll: 'Ignorer Alle', - ignoreDomainNames: 'Ikke kontroller domenenavn', - langs: 'Språk', - languagesTab: 'Språk', - mixedCase: 'Ikke kontroller ord med blandet små og store bokstaver', - mixedWithDigits: 'Ikke kontroller ord som inneholder tall', - moreSuggestions: 'Flere forslag', - opera_title: 'Ikke støttet av Opera', - options: 'Valg', - optionsTab: 'Valg', - title: 'Stavekontroll mens du skriver', - toggle: 'Veksle SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pl.js deleted file mode 100644 index a367e273089..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pl.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'pl', { - about: 'Informacje o SCAYT', - aboutTab: 'Informacje o SCAYT', - addWord: 'Dodaj słowo', - allCaps: 'Ignoruj wyrazy pisane dużymi literami', - dic_create: 'Utwórz', - dic_delete: 'Usuń', - dic_field_name: 'Nazwa słownika', - dic_info: 'Początkowo słownik użytkownika przechowywany jest w cookie. Pliki cookie mają jednak ograniczoną pojemność. Jeśli słownik użytkownika przekroczy wielkość dopuszczalną dla pliku cookie, możliwe jest przechowanie go na naszym serwerze. W celu zapisania słownika na serwerze niezbędne jest nadanie mu nazwy. Jeśli słownik został już zapisany na serwerze, wystarczy podać jego nazwę i nacisnąć przycisk Przywróć.', - dic_rename: 'Zmień nazwę', - dic_restore: 'Przywróć', - dictionariesTab: 'Słowniki', - disable: 'Wyłącz SCAYT', - emptyDic: 'Nazwa słownika nie może być pusta.', - enable: 'Włącz SCAYT', - ignore: 'Ignoruj', - ignoreAll: 'Ignoruj wszystkie', - ignoreDomainNames: 'Ignoruj nazwy domen', - langs: 'Języki', - languagesTab: 'Języki', - mixedCase: 'Ignoruj wyrazy pisane dużymi i małymi literami', - mixedWithDigits: 'Ignoruj wyrazy zawierające cyfry', - moreSuggestions: 'Więcej sugestii', - opera_title: 'Funkcja nie jest obsługiwana przez przeglądarkę Opera', - options: 'Opcje', - optionsTab: 'Opcje', - title: 'Sprawdź pisownię podczas pisania (SCAYT)', - toggle: 'Przełącz SCAYT', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pt-br.js deleted file mode 100644 index 46ce9292af1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pt-br.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'pt-br', { - about: 'Sobre a correção ortográfica durante a digitação', - aboutTab: 'Sobre', - addWord: 'Adicionar palavra', - allCaps: 'Ignorar palavras maiúsculas', - dic_create: 'Criar', - dic_delete: 'Excluir', - dic_field_name: 'Nome do Dicionário', - dic_info: 'Inicialmente, o dicionário do usuário fica armazenado em um Cookie. Porém, Cookies tem tamanho limitado, portanto quand o dicionário do usuário atingir o tamanho limite poderá ser armazenado no nosso servidor. Para armazenar seu dicionário pessoal no nosso servidor deverá especificar um nome para ele. Se já tiver um dicionário armazenado por favor especifique o seu nome e clique em Restaurar.', - dic_rename: 'Renomear', - dic_restore: 'Restaurar', - dictionariesTab: 'Dicionários', - disable: 'Desabilitar correção ortográfica durante a digitação', - emptyDic: 'O nome do dicionário não deveria estar vazio.', - enable: 'Habilitar correção ortográfica durante a digitação', - ignore: 'Ignorar', - ignoreAll: 'Ignorar todas', - ignoreDomainNames: 'Ignorar nomes de domínio', - langs: 'Idiomas', - languagesTab: 'Idiomas', - mixedCase: 'Ignorar palavras com maiúsculas e minúsculas misturadas', - mixedWithDigits: 'Ignorar palavras com números', - moreSuggestions: 'Mais sugestões', - opera_title: 'Não suportado no Opera', - options: 'Opções', - optionsTab: 'Opções', - title: 'Correção ortográfica durante a digitação', - toggle: 'Ativar/desativar correção ortográfica durante a digitação', - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pt.js deleted file mode 100644 index ade424e5ea5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/pt.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'pt', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ro.js deleted file mode 100644 index b5bdba03f47..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ro.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ro', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT', // MISSING - noSuggestions: 'No suggestion' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ru.js deleted file mode 100644 index 2fb8df57242..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ru.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ru', { - about: 'О SCAYT', - aboutTab: 'О SCAYT', - addWord: 'Добавить слово', - allCaps: 'Игнорировать слова из заглавных букв', - dic_create: 'Создать', - dic_delete: 'Удалить', - dic_field_name: 'Название словаря', - dic_info: 'Изначально, пользовательский словарь хранится в cookie, которые ограничены в размере. Когда словарь пользователя вырастает до размеров, что его невозможно хранить в cookie, он переносится на хранение на наш сервер. Чтобы сохранить ваш словарь на нашем сервере, вам следует указать название вашего словаря. Если у вас уже был словарь, который вы сохраняли на нашем сервере, то укажите здесь его название и нажмите кнопку Восстановить.', - dic_rename: 'Переименовать', - dic_restore: 'Восстановить', - dictionariesTab: 'Словари', - disable: 'Отключить SCAYT', - emptyDic: 'Вы должны указать название словаря.', - enable: 'Включить SCAYT', - ignore: 'Пропустить', - ignoreAll: 'Пропустить всё', - ignoreDomainNames: 'Игнорировать доменные имена', - langs: 'Языки', - languagesTab: 'Языки', - mixedCase: 'Игнорировать слова из букв в разном регистре', - mixedWithDigits: 'Игнорировать слова, содержащие цифры', - moreSuggestions: 'Ещё варианты', - opera_title: 'Не поддерживается Opera', - options: 'Настройки', - optionsTab: 'Параметры', - title: 'Проверка орфографии по мере ввода (SCAYT)', - toggle: 'Переключить SCAYT', - noSuggestions: 'Нет вариантов' -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sk.js deleted file mode 100644 index e3ae5ebaa40..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sk.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'sk', { - about: 'O KPPP (Kontrola pravopisu počas písania)', - aboutTab: 'O', - addWord: 'Pridať slovo', - allCaps: 'Ignorovať slová písané veľkými písmenami', - dic_create: 'Vytvoriť', - dic_delete: 'Vymazať', - dic_field_name: 'Názov slovníka', - dic_info: 'Spočiatku je užívateľský slovník uložený v cookie. Cookie však majú obmedzenú veľkosť. Keď užívateľský slovník narastie do bodu, kedy nemôže byť uložený v cookie, potom musí byť slovník uložený na našom serveri. Pre uloženie vášho osobného slovníka na náš server by ste mali zadať názov pre váš slovník. Ak už máte uložený slovník, prosíme, napíšte jeho názov a kliknite tlačidlo Obnoviť.', - dic_rename: 'Premenovať', - dic_restore: 'Obnoviť', - dictionariesTab: 'Slovníky', - disable: 'Zakázať KPPP (Kontrola pravopisu počas písania)', - emptyDic: 'Názov slovníka by nemal byť prázdny.', - enable: 'Povoliť KPPP (Kontrola pravopisu počas písania)', - ignore: 'Ignorovať', - ignoreAll: 'Ignorovať všetko', - ignoreDomainNames: 'Iznorovať názvy domén', - langs: 'Jazyky', - languagesTab: 'Jazyky', - mixedCase: 'Ignorovať slová so smiešanými veľkými a malými písmenami', - mixedWithDigits: 'Ignorovať slová s číslami', - moreSuggestions: 'Viac návrhov', - opera_title: 'Nepodporované Operou', - options: 'Možnosti', - optionsTab: 'Možnosti', - title: 'Kontrola pravopisu počas písania', - toggle: 'Prepnúť KPPP (Kontrola pravopisu počas písania)', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sl.js deleted file mode 100644 index 94ca56f5091..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sl.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'sl', { - about: 'O storitvi SCAYT', - aboutTab: 'O storitvi', - addWord: 'Dodaj besedo', - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Slovarji', - disable: 'Onemogoči SCAYT', - emptyDic: 'Ime slovarja ne more biti prazno.', - enable: 'Omogoči SCAYT', - ignore: 'Prezri', - ignoreAll: 'Prezri vse', - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Jeziki', - languagesTab: 'Jeziki', - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'Več predlogov', - opera_title: 'Not supported by Opera', // MISSING - options: 'Možnosti', - optionsTab: 'Možnosti', - title: 'Črkovanje med tipkanjem', - toggle: 'Preklopi SCAYT', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sr-latn.js deleted file mode 100644 index a45b7739bd2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sr-latn.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'sr-latn', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT',// MISSING - noSuggestions: 'No suggestion' // MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sr.js deleted file mode 100644 index 6a42eb0c952..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sr.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'sr', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT',// MISSING - noSuggestions: 'No suggestion' // MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sv.js deleted file mode 100644 index 1439455e6fb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/sv.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'sv', { - about: 'Om SCAYT', - aboutTab: 'Om', - addWord: 'Lägg till ord', - allCaps: 'Ignorera alla ord med enbart versaler', - dic_create: 'Skapa', - dic_delete: 'Ta bort', - dic_field_name: 'Ordlistans namn', - dic_info: 'Inledningsvis lagras ordlistan i en cookie. När ordlista växer till en punkt där det inte kan lagras i en cookie, lagras den på vår server. För att lagra din personliga ordlista på vår server du ska ange ett namn för din ordbok. Om du redan har en lagrad ordbok, skriv namnet och klicka på knappen Återställ.', - dic_rename: 'Byt namn', - dic_restore: 'Återställ', - dictionariesTab: 'Ordlistor', - disable: 'Inaktivera SCAYT', - emptyDic: 'Ordlistans namn får ej vara tomt.', - enable: 'Aktivera SCAYT', - ignore: 'Ignorera', - ignoreAll: 'Ignorera alla', - ignoreDomainNames: 'Ignorera domännamn', - langs: 'Språk', - languagesTab: 'Språk', - mixedCase: 'Ignorera ord med blandat shiftläge', - mixedWithDigits: 'Ignorera ord med nummer', - moreSuggestions: 'Fler förslag', - opera_title: 'Stöds ej av Opera', - options: 'Inställningar', - optionsTab: 'Inställningar', - title: 'Stavningskontroll medan du skriver', - toggle: 'Växla SCAYT', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/th.js deleted file mode 100644 index 3339bec3ae9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/th.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'th', { - about: 'About SCAYT', // MISSING - aboutTab: 'About', // MISSING - addWord: 'Add Word', // MISSING - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: 'Dictionaries', // MISSING - disable: 'Disable SCAYT', // MISSING - emptyDic: 'Dictionary name should not be empty.', // MISSING - enable: 'Enable SCAYT', // MISSING - ignore: 'Ignore', // MISSING - ignoreAll: 'Ignore All', // MISSING - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: 'Languages', // MISSING - languagesTab: 'Languages', // MISSING - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: 'More suggestions', // MISSING - opera_title: 'Not supported by Opera', // MISSING - options: 'Options', // MISSING - optionsTab: 'Options', // MISSING - title: 'Spell Check As You Type', // MISSING - toggle: 'Toggle SCAYT',// MISSING - noSuggestions: 'No suggestion' // MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/tr.js deleted file mode 100644 index 52c169b0f17..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/tr.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'tr', { - about: 'SCAYT\'ı hakkında', - aboutTab: 'Hakkında', - addWord: 'Kelime Ekle', - allCaps: 'Tüm büyük küçük kelimeleri yoksay', - dic_create: 'Oluştur', - dic_delete: 'Sil', - dic_field_name: 'Sözlük adı', - dic_info: 'Başlangıçta Kullanıcı Sözlüğü bir çerezde saklanır. Ancak, Çerezler boyutu sınırlıdır. Kullanıcı Sözlüğü, çerezin içinde saklanamayacağı bir noktada, bizim sunucularımızın içindeki sözlükte saklanabilir. Bizim sunucu üzerinde kişisel Sözlük saklamanız için, Sözlüğe bir ad belirtmelisiniz. Eğer zaten bir saklı Sözlük varsa, lütfen adını yazın ve Geri Yükle düğmesini tıklayın.', - dic_rename: 'Yeniden adlandır', - dic_restore: 'Geri al', - dictionariesTab: 'Sözlükler', - disable: 'SCAYT\'ı pasifleştir', - emptyDic: 'Sözlük adı boş olamaz.', - enable: 'SCAYT\'ı etkinleştir', - ignore: 'Yoksay', - ignoreAll: 'Tümünü Yoksay', - ignoreDomainNames: 'Domain adlarını yoksay', - langs: 'Diller', - languagesTab: 'Diller', - mixedCase: 'Karışık büyüklük ile Sözcükler yoksay', - mixedWithDigits: 'Sayılarla Kelimeler yoksay', - moreSuggestions: 'Daha fazla öneri', - opera_title: 'Opera tarafından desteklenmemektedir', - options: 'Seçenekler', - optionsTab: 'Seçenekler', - title: 'Girmiş olduğunuz kelime denetimi', - toggle: 'SCAYT\'ı değiştir', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ug.js deleted file mode 100644 index 06bcbfc689f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/ug.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'ug', { - about: 'شۇئان ئىملا تەكشۈرۈش ھەققىدە', - aboutTab: 'ھەققىدە', - addWord: 'سۆز قوش', - allCaps: 'چوڭ ھەرپتە يېزىلغان ھەممە سۆزگە پەرۋا قىلما', - dic_create: 'قۇر', - dic_delete: 'ئۆچۈر', - dic_field_name: 'لۇغەت ئاتى', - dic_info: 'باشلىنىشتا ئىشلەتكۈچى لۇغىتى Cookie غا ساقلىنىدۇ ئەمما Cookie نىڭ سىغىمى چەكلىك بولغاچقا، ئىشلەتكۈچى لۇغىتى كۆپىيىپ Cookie چەكلىمىسىدىن ئېشىپ كەتكەندە ساقلىغىلى بولمايدۇ، بۇ چاغدا لۇغىتىڭىزنى مۇلازىمېتىرىمىزغا ساقلىسىڭىز بولىدۇ. شەخسىي لۇغىتىڭىزنى مۇلازىمېتىرىمىزغا ساقلىماقچى بولسىڭىز لۇغىتىڭىزگە ئاتتىن بىرنى قويۇڭ، ئەگەر مۇلازىمتېرىمىزدا سىزنىڭ لۇغىتىڭىزدىن بىرسى بولسا لۇغەت ئاتىنى كىرگۈزۈپ ئەسلىگە قايتۇر توپچىسىنى بېسىڭ.', - dic_rename: 'ئات ئۆزگەرت', - dic_restore: 'ئەسلىگە كەلتۈر', - dictionariesTab: 'لۇغەت', - disable: 'شۇئان ئىملا تەكشۈرۈشنى چەكلە', - emptyDic: 'لۇغەت ئاتى بوش قالمايدۇ', - enable: 'شۇئان ئىملا تەكشۈرۈشنى قوزغات', - ignore: 'پەرۋا قىلما', - ignoreAll: 'ھەممىسىگە پەرۋا قىلما', - ignoreDomainNames: 'دائىرە ئاتىغا پەرۋا قىلما', - langs: 'تىل', - languagesTab: 'تىل', - mixedCase: 'چوڭ كىچىك ھەرپ بىلەن ئارىلاش يېزىلغان سۆزگە پەرۋا قىلما', - mixedWithDigits: 'سان بار سۆزگە پەرۋا قىلما', - moreSuggestions: 'تېخىمۇ كۆپ ئىملا تەۋسىيەسى', - opera_title: 'Opera توركۆرگۈنى قوللىمايدۇ', - options: 'تاللانما', - optionsTab: 'تاللانما', - title: 'شۇئان ئىملا تەكشۈر', - toggle: 'شۇئان ئىملا تەكشۈرۈشنى ۋاقىتلىق توختات/قوزغات', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/uk.js deleted file mode 100644 index 3e8c6c0a7ae..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/uk.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'uk', { - about: 'Про SCAYT', - aboutTab: 'Про SCAYT', - addWord: 'Додати слово', - allCaps: 'Пропустити прописні слова', - dic_create: 'Створити', - dic_delete: 'Видалити', - dic_field_name: 'Назва словника', - dic_info: 'Як правило, користувацькі словники зберігаються у cookie-файлах. Однак, cookie-файли мають обмеження на розмір. Якщо користувацький словник зростає в обсязі настільки, що вже не може бути збережений у cookie-файлі, тоді його можна зберегти на нашому сервері. Щоб зберегти Ваш персональний словник на нашому сервері необхідно вказати назву словника. Якщо Ви вже зберігали словник на сервері, будь ласка, вкажіть назву збереженого словника і натисніть кнопку Відновити.', - dic_rename: 'Перейменувати', - dic_restore: 'Відновити', - dictionariesTab: 'Словники', - disable: 'Вимкнути SCAYT', - emptyDic: 'Назва словника повинна бути вказана.', - enable: 'Ввімкнути SCAYT', - ignore: 'Пропустити', - ignoreAll: 'Пропустити всі', - ignoreDomainNames: 'Пропустити доменні назви', - langs: 'Мови', - languagesTab: 'Мови', - mixedCase: 'Пропустити слова зі змішаним регістром', - mixedWithDigits: 'Пропустити слова, що містять цифри', - moreSuggestions: 'Більше варіантів', - opera_title: 'Не підтримується в Opera', - options: 'Опції', - optionsTab: 'Опції', - title: 'Перефірка орфографії по мірі набору', - toggle: 'Перемкнути SCAYT', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/vi.js deleted file mode 100644 index 75cf4fe4480..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/vi.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'vi', { - about: 'Thông tin về SCAYT', - aboutTab: 'Thông tin', - addWord: 'Thêm từ', - allCaps: 'Không phân biệt chữ HOA chữ thường', - dic_create: 'Tạo', - dic_delete: 'Xóa', - dic_field_name: 'Tên từ điển', - dic_info: 'Ban đầu, từ điển người dùng được lưu trữ trong một cookie. Tuy nhiên, kích thước cookie bị giới hạn. Khi người sử dụng từ điển phát triển đến điểm không thể được lưu trữ trong cookie, từ điển sẽ được lưu trữ trên máy chủ của chúng tôi. Để lưu trữ từ điển cá nhân của bạn trên máy chủ của chúng tôi, bạn nên xác định một tên cho từ điển của bạn. Nếu bạn đã có một cuốn từ điển được lưu trữ, xin vui lòng gõ tên của nó và nhấn vào nút Khôi phục.', - dic_rename: 'Thay tên', - dic_restore: 'Phục hồi', - dictionariesTab: 'Từ điển', - disable: 'Tắt SCAYT', - emptyDic: 'Tên của từ điển không được để trống.', - enable: 'Bật SCAYT', - ignore: 'Bỏ qua', - ignoreAll: 'Bỏ qua tất cả', - ignoreDomainNames: 'Bỏ qua tên miền', - langs: 'Ngôn ngữ', - languagesTab: 'Tab ngôn ngữ', - mixedCase: 'Không phân biệt loại chữ', - mixedWithDigits: 'Không phân biệt chữ và số', - moreSuggestions: 'Đề xuất thêm', - opera_title: 'Không hỗ trợ trên trình duyệt Opera', - options: 'Tùy chọn', - optionsTab: 'Tùy chọn', - title: 'Kiểm tra chính tả ngay khi gõ chữ (SCAYT)', - toggle: 'Bật tắt SCAYT', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/zh-cn.js deleted file mode 100644 index 5911c5fbc64..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/zh-cn.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'zh-cn', { - about: '关于即时拼写检查', - aboutTab: '关于', - addWord: '添加单词', - allCaps: '忽略所有大写单词', - dic_create: '创建', - dic_delete: '删除', - dic_field_name: '字典名称', - dic_info: '一开始用户词典储存在 Cookie 中, 但是 Cookies 的容量是有限的, 当用户词典增长到超出 Cookie 限制时就无法再储存了, 这时您可以将词典储存到我们的服务器上. 要把您的个人词典到储存到我们的服务器上的话, 需要为您的词典指定一个名称, 如果您在我们的服务器上已经有储存有一个词典, 请输入词典名称并按还原按钮.', - dic_rename: '重命名', - dic_restore: '还原', - dictionariesTab: '字典', - disable: '禁用即时拼写检查', - emptyDic: '字典名不应为空.', - enable: '启用即时拼写检查', - ignore: '忽略', - ignoreAll: '全部忽略', - ignoreDomainNames: '忽略域名', - langs: '语言', - languagesTab: '语言', - mixedCase: '忽略大小写混合的单词', - mixedWithDigits: '忽略带数字的单词', - moreSuggestions: '更多拼写建议', - opera_title: '不支持 Opera 浏览器', - options: '选项', - optionsTab: '选项', - title: '即时拼写检查', - toggle: '暂停/启用即时拼写检查', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/zh.js deleted file mode 100644 index 7ff304b8359..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/lang/zh.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'scayt', 'zh', { - about: '關於即時拼寫檢查', - aboutTab: '關於', - addWord: '添加單詞', - allCaps: 'Ignore All-Caps Words', // MISSING - dic_create: 'Create', // MISSING - dic_delete: 'Delete', // MISSING - dic_field_name: 'Dictionary name', // MISSING - dic_info: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING - dic_rename: 'Rename', // MISSING - dic_restore: 'Restore', // MISSING - dictionariesTab: '字典', - disable: '關閉即時拼寫檢查', - emptyDic: '字典名不應為空.', - enable: '啟用即時拼寫檢查', - ignore: '忽略', - ignoreAll: '全部忽略', - ignoreDomainNames: 'Ignore Domain Names', // MISSING - langs: '語言', - languagesTab: '語言', - mixedCase: 'Ignore Words with Mixed Case', // MISSING - mixedWithDigits: 'Ignore Words with Numbers', // MISSING - moreSuggestions: '更多拼寫建議', - opera_title: 'Not supported by Opera', // MISSING - options: '選項', - optionsTab: '選項', - title: '即時拼寫檢查', - toggle: '啟用／關閉即時拼寫檢查', - noSuggestions: 'No suggestion'// MISSING -}); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/plugin.js deleted file mode 100644 index 8829f486eb7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/plugin.js +++ /dev/null @@ -1,929 +0,0 @@ -/** - * @license Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.html or http://ckeditor.com/license - */ - -/** - * @fileOverview Spell Check As You Type (SCAYT). - * Button name : Scayt. - */ - -(function() { - var commandName = 'scaytcheck', - wscCommandName = 'checkspell', - openPage = ''; - - // Checks if a value exists in an array - function in_array( needle, haystack ) { - var found = 0, - key; - for ( key in haystack ) { - if ( haystack[ key ] == needle ) { - found = 1; - break; - } - } - return found; - } - - var onEngineLoad = function() { - var editor = this; - - var createInstance = function( ev ) // Create new instance every time Document is created. - { - if ( typeof plugin.instances[ editor.name ] != 'undefined' || plugin.instances[ editor.name ] != null ) - return; - - var config = editor.config; - // Initialise Scayt instance. - var oParams = {}; - // Get the iframe. - - if(editor.editable().$.nodeName == 'BODY') - oParams.srcNodeRef = editor.document.getWindow().$.frameElement; - else - oParams.srcNodeRef = editor.editable().$; - - // syntax : AppName.AppVersion@AppRevision - oParams.assocApp = 'CKEDITOR.' + CKEDITOR.version + '@' + CKEDITOR.revision; - oParams.customerid = config.scayt_customerid || '1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2'; - oParams.customDictionaryIds = config.scayt_customDictionaryIds || ''; - oParams.userDictionaryName = config.scayt_userDictionaryName || ''; - oParams.sLang = config.scayt_sLang || 'en_US'; - - // Introduce SCAYT onLoad callback. (#5632) - oParams.onLoad = function() { - // Draw down word marker to avoid being covered by background-color style.(#5466) - if ( !( CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) ) - this.addStyle( this.selectorCss(), 'padding-bottom: 2px !important;' ); - - // Call scayt_control.focus when SCAYT loaded - // and only if editor has focus and scayt control creates at first time (#5720) - if ( editor.editable().hasFocus && !plugin.isControlRestored( editor ) ) - this.focus(); - - }; - - /* - ** commented due to #23630 BCG: IE 9: SCAYT plugin for CKEditor 4: checkDirty issue - ** We redefined checkDirty of CKEDITOR already - so this is waste functionality, that - ** cause recursive calling of checkDirty in IE - */ - // oParams.onBeforeChange = function() { - // if ( plugin.getScayt( editor ) && !editor.checkDirty() ) { - // setTimeout( function() { - // editor.resetDirty(); - // }, 0 ); - // } - // }; - - var scayt_custom_params = window.scayt_custom_params; - if ( typeof scayt_custom_params == 'object' ) { - for ( var k in scayt_custom_params ) - oParams[ k ] = scayt_custom_params[ k ]; - } - // needs for restoring a specific scayt control settings - if ( plugin.getControlId( editor ) ) - oParams.id = plugin.getControlId( editor ); - - var scayt_control = new window.scayt( oParams ); - - scayt_control.afterMarkupRemove.push( function( node ) { - ( new CKEDITOR.dom.element( node, scayt_control.document ) ).mergeSiblings(); - }); - - // Copy config. - var lastInstance = plugin.instances[ editor.name ]; - if ( lastInstance ) { - scayt_control.sLang = lastInstance.sLang; - scayt_control.option( lastInstance.option() ); - scayt_control.paused = lastInstance.paused; - } - - plugin.instances[ editor.name ] = scayt_control; - - try { - scayt_control.setDisabled( plugin.isPaused( editor ) === false ); - } catch ( e ) {} - - editor.fire( 'showScaytState' ); - }; - - function bindInlineModeEvents() { - editor.once( 'focus', createInstance ); - editor.once( 'blur', destroyInstance ); - } - - function destroyInstance( ev ) { - var editor = ev.editor, - scayt_instance = plugin.getScayt( editor ), - inline_mode = ( editor.elementMode == CKEDITOR.ELEMENT_MODE_INLINE ); - - // SCAYT instance might already get destroyed by mode switch (#5744). - if ( !scayt_instance ) - return; - - plugin.setPaused( editor, !scayt_instance.disabled ); - // store a control id for restore a specific scayt control settings - plugin.setControlId( editor, scayt_instance.id ); - scayt_instance.destroy( true ); - delete plugin.instances[ editor.name ]; - - if ( inline_mode ) bindInlineModeEvents(); - } - - ( editor.elementMode == CKEDITOR.ELEMENT_MODE_INLINE ) ? bindInlineModeEvents() : editor.on( 'contentDom', createInstance ); - - editor.on( 'contentDomUnload', function() { - // Remove scripts. - var scripts = CKEDITOR.document.getElementsByTag( 'script' ), - scaytIdRegex = /^dojoIoScript(\d+)$/i, - scaytSrcRegex = /^https?:\/\/svc\.webspellchecker\.net\/spellcheck\/script\/ssrv\.cgi/i; - - for ( var i = 0; i < scripts.count(); i++ ) { - var script = scripts.getItem( i ), - id = script.getId(), - src = script.getAttribute( 'src' ); - - if ( id && src && id.match( scaytIdRegex ) && src.match( scaytSrcRegex ) ) - script.remove(); - } - }); - - editor.on( 'beforeCommandExec', function( ev ) // Disable SCAYT before Source command execution. - { - if ( ev.data.name == 'source' && editor.mode == 'source' ) - plugin.markControlRestore( editor ); - }); - - editor.on( 'afterCommandExec', function( ev ) { - if ( !plugin.isScaytEnabled( editor ) ) - return; - - if ( editor.mode == 'wysiwyg' && ( ev.data.name == 'undo' || ev.data.name == 'redo' ) ) { - plugin.getScayt( editor ).setDisabled(true); - if (plugin.refresh_timeout) { - window.clearTimeout(plugin.refresh_timeout); - } - plugin.refresh_timeout = window.setTimeout( function() { - plugin.getScayt( editor ).setDisabled(false); - - plugin.getScayt( editor ).focus(); - plugin.getScayt( editor ).refresh(); - }, 10 ); - } - }); - - editor.on( 'destroy', destroyInstance ); - - // Listen to data manipulation to reflect scayt markup. - editor.on( 'setData', destroyInstance ); - - // Reload spell-checking for current word after insertion completed. - editor.on( 'insertElement', function() { - var scayt_instance = plugin.getScayt( editor ); - if ( plugin.isScaytEnabled( editor ) ) { - // Unlock the selection before reload, SCAYT will take - // care selection update. - if ( CKEDITOR.env.ie ) - editor.getSelection().unlock( true ); - - // Return focus to the editor and refresh SCAYT markup (#5573). - window.setTimeout( function() { - scayt_instance.focus(); - scayt_instance.refresh(); - }, 10 ); - } - }, this, null, 50 ); - - editor.on( 'insertHtml', function() { - var scayt_instance = plugin.getScayt( editor ); - if ( plugin.isScaytEnabled( editor ) ) { - // Unlock the selection before reload, SCAYT will take - // care selection update. - if ( CKEDITOR.env.ie ) - editor.getSelection().unlock( true ); - - // Return focus to the editor (#5573) - // Refresh SCAYT markup - window.setTimeout( function() { - scayt_instance.focus(); - scayt_instance.refresh(); - }, 10 ); - } - }, this, null, 50 ); - - editor.on( 'scaytDialog', function( ev ) // Communication with dialog. - { - ev.data.djConfig = window.djConfig; - ev.data.scayt_control = plugin.getScayt( editor ); - ev.data.tab = openPage; - ev.data.scayt = window.scayt; - }); - - var dataProcessor = editor.dataProcessor, - htmlFilter = dataProcessor && dataProcessor.htmlFilter; - - if ( htmlFilter ) { - htmlFilter.addRules({ - elements: { - span: function( element ) { - if ( element.attributes[ 'data-scayt_word' ] && element.attributes[ 'data-scaytid' ] ) { - delete element.name; // Write children, but don't write this node. - return element; - } - } - } - }); - } - - // Override Image.equals method avoid CK snapshot module to add SCAYT markup to snapshots. (#5546) - var undoImagePrototype = CKEDITOR.plugins.undo.Image.prototype; - - // add backword compatibility for CKEDITOR 4.2. method equals was repleced on other method - var equalsContentMethodName = (typeof undoImagePrototype.equalsContent == "function") ? 'equalsContent' : 'equals'; - - undoImagePrototype[equalsContentMethodName] = CKEDITOR.tools.override( undoImagePrototype[equalsContentMethodName], function( org ) { - return function( otherImage ) { - // - var thisContents = this.contents, - otherContents = otherImage.contents; - var scayt_instance = plugin.getScayt( this.editor ); - // Making the comparison based on content without SCAYT word markers. - if ( scayt_instance && plugin.isScaytReady( this.editor ) ) { - // scayt::reset might return value undefined. (#5742) - this.contents = scayt_instance.reset( thisContents ) || ''; - otherImage.contents = scayt_instance.reset( otherContents ) || ''; - } - - var retval = org.apply( this, arguments ); - - this.contents = thisContents; - otherImage.contents = otherContents; - return retval; - }; - }); - - // added due to #23630 (checkDirty wrong behaviour on SCAYT load) - var editorPrototype = CKEDITOR.editor.prototype; - // Override editor.checkDirty method avoid CK checkDirty functionality to fix SCAYT issues with incorrect checkDirty behavior. - editorPrototype.checkDirty = CKEDITOR.tools.override(editorPrototype.checkDirty, function( org ){ - return function() { - var retval = null, - scayt_instance = plugin.getScayt( this ); - - if ( scayt_instance && plugin.isScaytReady( this ) ) { - var currentData = scayt_instance.reset(this.getSnapshot()); - var prevData = scayt_instance.reset(this._.previousValue); - retval = ( currentData !== prevData ); - } else { - retval = org.apply(this); - } - - return retval; - } - }); - - if(editor.document && (editor.elementMode != CKEDITOR.ELEMENT_MODE_INLINE || editor.focusManager.hasFocus)){ - createInstance(); - } - }; - - CKEDITOR.plugins.scayt = { - engineLoaded: false, - instances: {}, - // Data storage for SCAYT control, based on editor instances - controlInfo: {}, - setControlInfo: function( editor, o ) { - if ( editor && editor.name && typeof( this.controlInfo[ editor.name ] ) != 'object' ) - this.controlInfo[ editor.name ] = {}; - - for ( var infoOpt in o ) - this.controlInfo[ editor.name ][ infoOpt ] = o[ infoOpt ]; - }, - isControlRestored: function( editor ) { - if ( editor && editor.name && this.controlInfo[ editor.name ] ) { - return this.controlInfo[ editor.name ].restored; - } - return false; - }, - markControlRestore: function( editor ) { - this.setControlInfo( editor, { restored: true } ); - }, - setControlId: function( editor, id ) { - this.setControlInfo( editor, { id: id } ); - }, - getControlId: function( editor ) { - if ( editor && editor.name && this.controlInfo[ editor.name ] && this.controlInfo[ editor.name ].id ) { - return this.controlInfo[ editor.name ].id; - } - return null; - }, - setPaused: function( editor, bool ) { - this.setControlInfo( editor, { paused: bool } ); - }, - isPaused: function( editor ) { - if ( editor && editor.name && this.controlInfo[ editor.name ] ) { - return this.controlInfo[ editor.name ].paused; - } - return undefined; - }, - getScayt: function( editor ) { - return this.instances[ editor.name ]; - }, - isScaytReady: function( editor ) { - return this.engineLoaded === true && 'undefined' !== typeof window.scayt && this.getScayt( editor ); - }, - isScaytEnabled: function( editor ) { - var scayt_instance = this.getScayt( editor ); - return ( scayt_instance ) ? scayt_instance.disabled === false : false; - }, - getUiTabs: function( editor ) { - var uiTabs = []; - - // read UI tabs value from config - var configUiTabs = editor.config.scayt_uiTabs || "1,1,1"; - - // convert string to array - configUiTabs = configUiTabs.split( ',' ); - - // "About us" should be always shown for standard config - configUiTabs[ 3 ] = "1"; - - for ( var i = 0; i < 4; i++ ) { - uiTabs[ i ] = ( typeof window.scayt != "undefined" && typeof window.scayt.uiTags != "undefined" ) ? ( parseInt( configUiTabs[ i ], 10 ) && window.scayt.uiTags[ i ] ) : parseInt( configUiTabs[ i ], 10 ); - } - - if(typeof editor.plugins.wsc == "object") - uiTabs.push(1); - else - uiTabs.push(0); - - return uiTabs; - }, - loadEngine: function( editor ) { - // SCAYT doesn't work with Firefox2, Opera and AIR. - if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 || CKEDITOR.env.opera || CKEDITOR.env.air ) - return editor.fire( 'showScaytState' ); - - if ( this.engineLoaded === true ) - return onEngineLoad.apply( editor ); // Add new instance. - else if ( this.engineLoaded == -1 ) // We are waiting. - return CKEDITOR.on( 'scaytReady', function() { - onEngineLoad.apply( editor ); - }); // Use function(){} to avoid rejection as duplicate. - - CKEDITOR.on( 'scaytReady', onEngineLoad, editor ); - CKEDITOR.on( 'scaytReady', function() { - this.engineLoaded = true; - }, this, null, 0 ); // First to run. - - this.engineLoaded = -1; // Loading in progress. - - // compose scayt url - var protocol = document.location.protocol; - // Default to 'http' for unknown. - protocol = protocol.search( /https?:/ ) != -1 ? protocol : 'http:'; - var baseUrl = 'svc.webspellchecker.net/scayt26/loader__base.js'; - - var scaytUrl = editor.config.scayt_srcUrl || ( protocol + '//' + baseUrl ); - var scaytConfigBaseUrl = plugin.parseUrl( scaytUrl ).path + '/'; - - if ( window.scayt == undefined ) { - CKEDITOR._djScaytConfig = { - baseUrl: scaytConfigBaseUrl, - addOnLoad: [ - function() - { - CKEDITOR.fireOnce( 'scaytReady' ); - } - ], - isDebug: false - }; - // Append javascript code. - CKEDITOR.document.getHead().append( CKEDITOR.document.createElement( 'script', { - attributes: { - type: 'text/javascript', - async: 'true', - src: scaytUrl - } - })); - } else - CKEDITOR.fireOnce( 'scaytReady' ); - - return null; - }, - parseUrl: function( data ) { - var match; - if ( data.match && ( match = data.match( /(.*)[\/\\](.*?\.\w+)$/ ) ) ) - return { path: match[ 1 ], file: match[ 2 ] }; - else - return data; - } - }; - - var plugin = CKEDITOR.plugins.scayt; - - // Context menu constructing. - var addButtonCommand = function( editor, buttonName, buttonLabel, commandName, command, menugroup, menuOrder ) { - editor.addCommand( commandName, command ); - - // If the "menu" plugin is loaded, register the menu item. - editor.addMenuItem( commandName, { - label: buttonLabel, - command: commandName, - group: menugroup, - order: menuOrder - }); - }; - - var commandDefinition = { - preserveState: true, - editorFocus: false, - canUndo: false, - - exec: function( editor ) { - if ( plugin.isScaytReady( editor ) ) { - var isEnabled = plugin.isScaytEnabled( editor ); - - this.setState( isEnabled ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_ON ); - - var scayt_control = plugin.getScayt( editor ); - // the place where the status of editor focus should be restored - // after there will be ability to store its state before SCAYT button click - // if (storedFocusState is focused ) - // scayt_control.focus(); - // - // now focus is set certainly - scayt_control.focus(); - scayt_control.setDisabled( isEnabled ); - } else if ( !editor.config.scayt_autoStartup && plugin.engineLoaded >= 0 ) // Load first time - { - editor.focus(); - this.setState( CKEDITOR.TRISTATE_DISABLED ); - plugin.loadEngine( editor ); - } - } - }; - - // Add scayt plugin. - CKEDITOR.plugins.add( 'scayt', { - requires: 'menubutton,dialog', - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en-au,en-ca,en-gb,en,eo,es,et,eu,fa,fi,fo,fr-ca,fr,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,lt,lv,mk,mn,ms,nb,nl,no,pl,pt-br,pt,ro,ru,sk,sl,sr-latn,sr,sv,th,tr,ug,uk,vi,zh-cn,zh', // %REMOVE_LINE_CORE% - icons: 'scayt', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - - beforeInit: function( editor ) { - - var items_order = editor.config.scayt_contextMenuItemsOrder || 'suggest|moresuggest|control', - items_order_str = ""; - - items_order = items_order.split( '|' ); - - if ( items_order && items_order.length ) { - for ( var pos = 0; pos < items_order.length; pos++ ) - items_order_str += 'scayt_' + items_order[ pos ] + ( items_order.length != parseInt( pos, 10 ) + 1 ? ',' : '' ); - } - - // Put it on top of all context menu items (#5717) - editor.config.menu_groups = items_order_str + ',' + editor.config.menu_groups; - }, - - checkEnvironment: function(){ - return ( CKEDITOR.env.opera || CKEDITOR.env.air ) ? 0 : 1; - }, - - init: function( editor ) { - - var self = this; - // Delete span[data-scaytid] when text pasting in editor (#6921) - var dataFilter = editor.dataProcessor && editor.dataProcessor.dataFilter; - var dataFilterRules = { - elements: { - span: function( element ) { - var attrs = element.attributes; - if ( attrs && attrs[ 'data-scaytid' ] ) - delete element.name; - } - } - }; - dataFilter && dataFilter.addRules( dataFilterRules ); - - var moreSuggestions = {}, - mainSuggestions = {}; - - // Scayt command. - var command = editor.addCommand( commandName, commandDefinition ); - - // Add Options dialog. - CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/options.js' ) ); - - var uiTabs = plugin.getUiTabs( editor ); - - var menuGroup = 'scaytButton'; - editor.addMenuGroup( menuGroup ); - // Temporary hack - place scayt's groups at the beginning of the context menu. - editor.addMenuGroup( 'scayt_suggest', -10 ); - editor.addMenuGroup( 'scayt_moresuggest', -9 ); - editor.addMenuGroup( 'scayt_control', -8 ); - - // combine menu items to render - var uiMenuItems = {}; - - var lang = editor.lang.scayt; - - // always added - uiMenuItems.scaytToggle = { - label: lang.enable, - command: commandName, - group: menuGroup - }; - - if ( uiTabs[ 0 ] == 1 ) - uiMenuItems.scaytOptions = { - label: lang.options, - group: menuGroup, - onClick: function() { - openPage = 'options'; - editor.openDialog( commandName ); - } - }; - - if ( uiTabs[ 1 ] == 1 ) - uiMenuItems.scaytLangs = { - label: lang.langs, - group: menuGroup, - onClick: function() { - openPage = 'langs'; - editor.openDialog( commandName ); - } - }; - if ( uiTabs[ 2 ] == 1 ) - uiMenuItems.scaytDict = { - label: lang.dictionariesTab, - group: menuGroup, - onClick: function() { - openPage = 'dictionaries'; - editor.openDialog( commandName ); - } - }; - // always added - uiMenuItems.scaytAbout = { - label: editor.lang.scayt.about, - group: menuGroup, - onClick: function() { - openPage = 'about'; - editor.openDialog( commandName ); - } - }; - - if ( uiTabs[4] == 1 ) - uiMenuItems.scaytWSC = { - label : editor.lang.wsc.toolbar, - group : menuGroup, - command : wscCommandName - }; - - editor.addMenuItems( uiMenuItems ); - - editor.ui.add( 'Scayt', CKEDITOR.UI_MENUBUTTON, { - label: lang.title, - title: CKEDITOR.env.opera ? lang.opera_title : lang.title, - modes: { wysiwyg: self.checkEnvironment() }, - toolbar: 'spellchecker,20', - onRender: function() { - command.on( 'state', function() { - this.setState( command.state ); - }, this ); - }, - onMenu: function() { - var isEnabled = plugin.isScaytEnabled( editor ); - - editor.getMenuItem( 'scaytToggle' ).label = lang[ isEnabled ? 'disable' : 'enable' ]; - - var uiTabs = plugin.getUiTabs( editor ); - - return { - scaytToggle: CKEDITOR.TRISTATE_OFF, - scaytOptions: isEnabled && uiTabs[ 0 ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, - scaytLangs: isEnabled && uiTabs[ 1 ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, - scaytDict: isEnabled && uiTabs[ 2 ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, - scaytAbout: isEnabled && uiTabs[ 3 ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, - scaytWSC: uiTabs[4] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED - }; - } - }); - - // If the "contextmenu" plugin is loaded, register the listeners. - if ( editor.contextMenu && editor.addMenuItems ) { - editor.contextMenu.addListener( function( element, selection ) { - if ( !plugin.isScaytEnabled( editor ) || selection.getRanges()[ 0 ].checkReadOnly() ) - return null; - - var scayt_control = plugin.getScayt( editor ), - node = scayt_control.getScaytNode(); - - if ( !node ) - return null; - - var word = scayt_control.getWord( node ); - - if ( !word ) - return null; - - var sLang = scayt_control.getLang(), - _r = {}, contextCommands = editor.config.scayt_contextCommands || 'all', - items_suggestion = window.scayt.getSuggestion( word, sLang ); - - contextCommands = contextCommands.split( '|' ); - - // Remove unused commands and menuitems - - for ( var m in moreSuggestions ) { - delete editor._.menuItems[ m ]; - delete editor.commands[ m ]; - } - for ( m in mainSuggestions ) { - delete editor._.menuItems[ m ]; - delete editor.commands[ m ]; - } - - if ( !items_suggestion || !items_suggestion.length ){ - var no_sugg = { - exec: function() {} - }; - addButtonCommand( editor, 'no_sugg', lang.noSuggestions, 'scayt_no_sugg', no_sugg, 'scayt_control', 1, true ); - mainSuggestions[ 'scayt_no_sugg' ] = CKEDITOR.TRISTATE_OFF; - }else{ - // Reset items. - moreSuggestions = {}; - mainSuggestions = {}; - - var moreSuggestionsUnable = editor.config.scayt_moreSuggestions || 'on'; - var moreSuggestionsUnableAdded = false; - - var maxSuggestions = editor.config.scayt_maxSuggestions; - ( typeof maxSuggestions != 'number' ) && ( maxSuggestions = 5 ); - !maxSuggestions && ( maxSuggestions = items_suggestion.length ); - - for ( var i = 0, l = items_suggestion.length; i < l; i += 1 ) { - var commandName = 'scayt_suggestion_' + items_suggestion[ i ].replace( ' ', '_' ); - var exec = (function( el, s ) { - return { - exec: function() { - scayt_control.replace( el, s ); - } - }; - })( node, items_suggestion[ i ] ); - - if ( i < maxSuggestions ) { - addButtonCommand( editor, 'button_' + commandName, items_suggestion[ i ], commandName, exec, 'scayt_suggest', i + 1 ); - _r[ commandName ] = CKEDITOR.TRISTATE_OFF; - mainSuggestions[ commandName ] = CKEDITOR.TRISTATE_OFF; - } else if ( moreSuggestionsUnable == 'on' ) { - addButtonCommand( editor, 'button_' + commandName, items_suggestion[ i ], commandName, exec, 'scayt_moresuggest', i + 1 ); - moreSuggestions[ commandName ] = CKEDITOR.TRISTATE_OFF; - moreSuggestionsUnableAdded = true; - } - } - - if ( moreSuggestionsUnableAdded ) { - // Register the More suggestions group; - editor.addMenuItem( 'scayt_moresuggest', { - label: lang.moreSuggestions, - group: 'scayt_moresuggest', - order: 10, - getItems: function() { - return moreSuggestions; - } - }); - mainSuggestions[ 'scayt_moresuggest' ] = CKEDITOR.TRISTATE_OFF; - } - } - - if ( in_array( 'all', contextCommands ) || in_array( 'ignore', contextCommands ) ) { - var ignore_command = { - exec: function() { - scayt_control.ignore( node ); - } - }; - addButtonCommand( editor, 'ignore', lang.ignore, 'scayt_ignore', ignore_command, 'scayt_control', 2 ); - mainSuggestions[ 'scayt_ignore' ] = CKEDITOR.TRISTATE_OFF; - } - - if ( in_array( 'all', contextCommands ) || in_array( 'ignoreall', contextCommands ) ) { - var ignore_all_command = { - exec: function() { - scayt_control.ignoreAll( node ); - } - }; - addButtonCommand( editor, 'ignore_all', lang.ignoreAll, 'scayt_ignore_all', ignore_all_command, 'scayt_control', 3 ); - mainSuggestions[ 'scayt_ignore_all' ] = CKEDITOR.TRISTATE_OFF; - } - - if ( in_array( 'all', contextCommands ) || in_array( 'add', contextCommands ) ) { - var addword_command = { - exec: function() { - window.scayt.addWordToUserDictionary( node ); - } - }; - addButtonCommand( editor, 'add_word', lang.addWord, 'scayt_add_word', addword_command, 'scayt_control', 4 ); - mainSuggestions[ 'scayt_add_word' ] = CKEDITOR.TRISTATE_OFF; - } - - if ( scayt_control.fireOnContextMenu ) - scayt_control.fireOnContextMenu( editor ); - - return mainSuggestions; - }); - } - - var showInitialState = function( evt ) { - evt.removeListener(); - if ( CKEDITOR.env.opera || CKEDITOR.env.air ) - command.setState( CKEDITOR.TRISTATE_DISABLED ); - else - command.setState( plugin.isScaytEnabled( editor ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF ); - }; - - editor.on( 'showScaytState', showInitialState ); - editor.on( 'instanceReady', showInitialState ); - - // Start plugin - if ( editor.config.scayt_autoStartup ) { - editor.on( 'instanceReady', function() { - plugin.loadEngine( editor ); - }); - } - }, - - afterInit: function( editor ) { - - // Prevent word marker line from displaying in elements path and been removed when cleaning format. (#3570) (#4125) - var elementsPathFilters, - scaytFilter = function( element ) { - if ( element.hasAttribute( 'data-scaytid' ) ) - return false; - }; - - if ( editor._.elementsPath && ( elementsPathFilters = editor._.elementsPath.filters ) ) - elementsPathFilters.push( scaytFilter ); - - editor.addRemoveFormatFilter && editor.addRemoveFormatFilter( scaytFilter ); - - } - }); -})(); - -/** - * If enabled (set to `true`), turns on SCAYT automatically - * after loading the editor. - * - * config.scayt_autoStartup = true; - * - * @cfg {Boolean} [scayt_autoStartup=false] - * @member CKEDITOR.config - */ - -/** - * Defines the number of SCAYT suggestions to show in the main context menu. - * Possible values are: - * - * * `0` (zero) – All suggestions are displayed in the main context menu. - * * Positive number – The maximum number of suggestions to show in the context - * menu. Other entries will be shown in the "More Suggestions" sub-menu. - * * Negative number – No suggestions are shown in the main context menu. All - * entries will be listed in the the "Suggestions" sub-menu. - * - * Examples: - * - * // Display only three suggestions in the main context menu. - * config.scayt_maxSuggestions = 3; - * - * // Do not show the suggestions directly. - * config.scayt_maxSuggestions = -1; - * - * @cfg {Number} [scayt_maxSuggestions=5] - * @member CKEDITOR.config - */ - -/** - * Sets the customer ID for SCAYT. Required for migration from free, - * ad-supported version to paid, ad-free version. - * - * // Load SCAYT using my customer ID. - * config.scayt_customerid = 'your-encrypted-customer-id'; - * - * @cfg {String} [scayt_customerid=''] - * @example - * @member CKEDITOR.config - */ - -/** - * Enables/disables the "More Suggestions" sub-menu in the context menu. - * Possible values are `'on'` and `'off'`. - * - * // Disables the "More Suggestions" sub-menu. - * config.scayt_moreSuggestions = 'off'; - * - * @cfg {String} [scayt_moreSuggestions='on'] - * @member CKEDITOR.config - */ - -/** - * Customizes the display of SCAYT context menu commands ("Add Word", "Ignore" - * and "Ignore All"). This must be a string with one or more of the following - * words separated by a pipe character (`'|'`): - * - * * `off` – disables all options. - * * `all` – enables all options. - * * `ignore` – enables the "Ignore" option. - * * `ignoreall` – enables the "Ignore All" option. - * * `add` – enables the "Add Word" option. - * - * Example: - * - * // Show only "Add Word" and "Ignore All" in the context menu. - * config.scayt_contextCommands = 'add|ignoreall'; - * - * @cfg {String} [scayt_contextCommands='all'] - * @member CKEDITOR.config - */ - -/** - * Sets the default spell checking language for SCAYT. Possible values are: - * `'en_US'`, `'en_GB'`, `'pt_BR'`, `'da_DK'`, - * `'nl_NL'`, `'en_CA'`, `'fi_FI'`, `'fr_FR'`, - * `'fr_CA'`, `'de_DE'`, `'el_GR'`, `'it_IT'`, - * `'nb_NO'`, `'pt_PT'`, `'es_ES'`, `'sv_SE'`. - * - * // Sets SCAYT to German. - * config.scayt_sLang = 'de_DE'; - * - * @cfg {String} [scayt_sLang='en_US'] - * @member CKEDITOR.config - */ - -/** - * Sets the visibility of particular tabs in the SCAYT dialog window and toolbar - * button. This setting must contain a `1` (enabled) or `0` - * (disabled) value for each of the following entries, in this precise order, - * separated by a comma (`','`): `'Options'`, `'Languages'`, and `'Dictionary'`. - * - * // Hides the "Languages" tab. - * config.scayt_uiTabs = '1,0,1'; - * - * @cfg {String} [scayt_uiTabs='1,1,1'] - * @member CKEDITOR.config - */ - - -/** - * Sets the URL to SCAYT core. Required to switch to the licensed version of SCAYT application. - * - * Further details available at [http://wiki.webspellchecker.net/doku.php?id=migration:hosredfreetolicensedck](http://wiki.webspellchecker.net/doku.php?id=migration:hosredfreetolicensedck) - * - * config.scayt_srcUrl = "http://my-host/spellcheck/lf/scayt/scayt.js"; - * - * @cfg {String} [scayt_srcUrl=''] - * @member CKEDITOR.config - */ - -/** - * Links SCAYT to custom dictionaries. This is a string containing dictionary IDs - * separared by commas (`','`). Available only for the licensed version. - * - * Further details at [http://wiki.webspellchecker.net/doku.php?id=installationandconfiguration:customdictionaries:licensed](http://wiki.webspellchecker.net/doku.php?id=installationandconfiguration:customdictionaries:licensed) - * - * config.scayt_customDictionaryIds = '3021,3456,3478"'; - * - * @cfg {String} [scayt_customDictionaryIds=''] - * @member CKEDITOR.config - */ - -/** - * Makes it possible to activate a custom dictionary in SCAYT. The user - * dictionary name must be used. Available only for the licensed version. - * - * config.scayt_userDictionaryName = 'MyDictionary'; - * - * @cfg {String} [scayt_userDictionaryName=''] - * @member CKEDITOR.config - */ - -/** - * Defines the order SCAYT context menu items by groups. - * This must be a string with one or more of the following - * words separated by a pipe character (`'|'`): - * - * * `suggest` – main suggestion word list, - * * `moresuggest` – more suggestions word list, - * * `control` – SCAYT commands, such as "Ignore" and "Add Word". - * - * Example: - * - * config.scayt_contextMenuItemsOrder = 'moresuggest|control|suggest'; - * - * @cfg {String} [scayt_contextMenuItemsOrder='suggest|moresuggest|control'] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/icons/hidpi/selectall.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/icons/hidpi/selectall.png deleted file mode 100644 index c67f64ddebb..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/icons/hidpi/selectall.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/icons/selectall.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/icons/selectall.png deleted file mode 100644 index 0d1e8160e42..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/icons/selectall.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/af.js deleted file mode 100644 index 965515c3a10..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'af', { - toolbar: 'Selekteer alles' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ar.js deleted file mode 100644 index afcd11c02f7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ar', { - toolbar: 'تحديد الكل' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bg.js deleted file mode 100644 index fd33ecbb2f7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'bg', { - toolbar: 'Избери всичко' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bn.js deleted file mode 100644 index 212a018066d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'bn', { - toolbar: 'সব সিলেক্ট কর' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bs.js deleted file mode 100644 index 21cfc71cbae..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'bs', { - toolbar: 'Selektuj sve' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ca.js deleted file mode 100644 index 1777077503b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ca', { - toolbar: 'Selecciona-ho tot' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/cs.js deleted file mode 100644 index a35e47734be..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'cs', { - toolbar: 'Vybrat vše' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/cy.js deleted file mode 100644 index 8a6e05233dc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'cy', { - toolbar: 'Dewis Popeth' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/da.js deleted file mode 100644 index 3bb61ebc90d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'da', { - toolbar: 'Vælg alt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/de.js deleted file mode 100644 index 42b70cbd378..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'de', { - toolbar: 'Alles auswählen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/el.js deleted file mode 100644 index 7142480a6de..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'el', { - toolbar: 'Επιλογή όλων' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-au.js deleted file mode 100644 index 17fa6261230..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'en-au', { - toolbar: 'Select All' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-ca.js deleted file mode 100644 index 3020b83f84a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'en-ca', { - toolbar: 'Select All' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-gb.js deleted file mode 100644 index ee79a812ee3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'en-gb', { - toolbar: 'Select All' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en.js deleted file mode 100644 index 0bebdc82837..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'en', { - toolbar: 'Select All' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/eo.js deleted file mode 100644 index 50d12193ca8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'eo', { - toolbar: 'Elekti ĉion' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/es.js deleted file mode 100644 index 545d6c0012b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'es', { - toolbar: 'Seleccionar Todo' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/et.js deleted file mode 100644 index 673feb7cf60..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'et', { - toolbar: 'Kõige valimine' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/eu.js deleted file mode 100644 index d04e41b30f0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'eu', { - toolbar: 'Hautatu dena' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fa.js deleted file mode 100644 index 2e6bb9eccb0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'fa', { - toolbar: 'گزینش همه' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fi.js deleted file mode 100644 index 457e810ed82..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'fi', { - toolbar: 'Valitse kaikki' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fo.js deleted file mode 100644 index 8b4cd114c37..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'fo', { - toolbar: 'Markera alt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fr-ca.js deleted file mode 100644 index dc9e62c49ac..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'fr-ca', { - toolbar: 'Sélectionner tout' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fr.js deleted file mode 100644 index 28870de56d1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'fr', { - toolbar: 'Tout sélectionner' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/gl.js deleted file mode 100644 index 7e1d0e00bf2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'gl', { - toolbar: 'Seleccionar todo' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/gu.js deleted file mode 100644 index e9e5529327e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'gu', { - toolbar: 'બઘું પસંદ કરવું' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/he.js deleted file mode 100644 index 45c5ddabe09..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'he', { - toolbar: 'בחירת הכל' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hi.js deleted file mode 100644 index 7966d961b60..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'hi', { - toolbar: 'सब सॅलॅक्ट करें' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hr.js deleted file mode 100644 index bd72541da58..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'hr', { - toolbar: 'Odaberi sve' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hu.js deleted file mode 100644 index 3e4c3842ee2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'hu', { - toolbar: 'Mindent kijelöl' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/id.js deleted file mode 100644 index ba6d4af7c07..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'id', { - toolbar: 'Pilih Semua' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/is.js deleted file mode 100644 index 75f4e5e80a3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'is', { - toolbar: 'Velja allt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/it.js deleted file mode 100644 index e0c06b63049..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'it', { - toolbar: 'Seleziona tutto' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ja.js deleted file mode 100644 index c74f95d5a55..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ja', { - toolbar: 'すべて選択' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ka.js deleted file mode 100644 index af5049d0326..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ka', { - toolbar: 'ყველაფრის მონიშნვა' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/km.js deleted file mode 100644 index d3c913bb762..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'km', { - toolbar: 'រើស​ទាំង​អស់' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ko.js deleted file mode 100644 index de7b0f3e56c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ko', { - toolbar: '전체선택' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ku.js deleted file mode 100644 index 390049a11d3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ku', { - toolbar: 'دیاریکردنی هەمووی' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/lt.js deleted file mode 100644 index 4306a3789bb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'lt', { - toolbar: 'Pažymėti viską' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/lv.js deleted file mode 100644 index 2ae1beab894..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'lv', { - toolbar: 'Iezīmēt visu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/mk.js deleted file mode 100644 index 0912b73e321..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'mk', { - toolbar: 'Select All' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/mn.js deleted file mode 100644 index 1547f7f370f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'mn', { - toolbar: 'Бүгдийг нь сонгох' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ms.js deleted file mode 100644 index c4c90e7ff58..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ms', { - toolbar: 'Pilih Semua' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/nb.js deleted file mode 100644 index 843d889853d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'nb', { - toolbar: 'Merk alt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/nl.js deleted file mode 100644 index fe0b464ee98..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'nl', { - toolbar: 'Alles selecteren' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/no.js deleted file mode 100644 index 91106c34703..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'no', { - toolbar: 'Merk alt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pl.js deleted file mode 100644 index 2f8b4d46885..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'pl', { - toolbar: 'Zaznacz wszystko' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pt-br.js deleted file mode 100644 index 05e4a8f442b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'pt-br', { - toolbar: 'Selecionar Tudo' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pt.js deleted file mode 100644 index 814faf4a2fe..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'pt', { - toolbar: 'Selecionar Tudo' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ro.js deleted file mode 100644 index 26ff58d59c5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ro', { - toolbar: 'Selectează tot' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ru.js deleted file mode 100644 index 8ff0eca17ad..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ru', { - toolbar: 'Выделить все' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/si.js deleted file mode 100644 index 39ae6391c7d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'si', { - toolbar: 'සියල්ලම ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sk.js deleted file mode 100644 index d927fa016cf..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'sk', { - toolbar: 'Vybrať všetko' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sl.js deleted file mode 100644 index b22aab87b6b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'sl', { - toolbar: 'Izberi vse' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sq.js deleted file mode 100644 index 8efd8f47d60..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'sq', { - toolbar: 'Përzgjidh të Gjitha' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sr-latn.js deleted file mode 100644 index 012114394b6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'sr-latn', { - toolbar: 'Označi sve' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sr.js deleted file mode 100644 index 63c026cb5d8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'sr', { - toolbar: 'Означи све' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sv.js deleted file mode 100644 index 83790071fdb..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'sv', { - toolbar: 'Markera allt' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/th.js deleted file mode 100644 index 38af8b2108e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'th', { - toolbar: 'เลือกทั้งหมด' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/tr.js deleted file mode 100644 index 66ec9a9e5d0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'tr', { - toolbar: 'Tümünü Seç' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ug.js deleted file mode 100644 index f455916d27d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'ug', { - toolbar: 'ھەممىنى تاللا' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/uk.js deleted file mode 100644 index bd92f828d61..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'uk', { - toolbar: 'Виділити все' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/vi.js deleted file mode 100644 index b237ff0d9f4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'vi', { - toolbar: 'Chọn tất cả' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/zh-cn.js deleted file mode 100644 index ac32510067b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'zh-cn', { - toolbar: '全选' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/zh.js deleted file mode 100644 index 3c12dcdd480..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'selectall', 'zh', { - toolbar: '全選' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/plugin.js deleted file mode 100644 index af1e498d7f9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/selectall/plugin.js +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview The "selectall" plugin provides an editor command that - * allows selecting the entire content of editable area. - * This plugin also enables a toolbar button for the feature. - */ - -( function() { - CKEDITOR.plugins.add( 'selectall', { - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'selectall', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - editor.addCommand( 'selectAll', { modes: { wysiwyg: 1, source: 1 }, - exec: function( editor ) { - var editable = editor.editable(); - - if ( editable.is( 'textarea' ) ) { - var textarea = editable.$; - - if ( CKEDITOR.env.ie ) - textarea.createTextRange().execCommand( 'SelectAll' ); - else { - textarea.selectionStart = 0; - textarea.selectionEnd = textarea.value.length; - } - - textarea.focus(); - } else { - if ( editable.is( 'body' ) ) - editor.document.$.execCommand( 'SelectAll', false, null ); - else { - var range = editor.createRange(); - range.selectNodeContents( editable ); - range.select(); - } - - // Force triggering selectionChange (#7008) - editor.forceNextSelectionCheck(); - editor.selectionChange(); - } - - }, - canUndo: false - } ); - - editor.ui.addButton && editor.ui.addButton( 'SelectAll', { - label: editor.lang.selectall.toolbar, - command: 'selectAll', - toolbar: 'selection,10' - } ); - } - } ); -} )(); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/hidpi/showblocks-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/hidpi/showblocks-rtl.png deleted file mode 100644 index c88abcb6dbe..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/hidpi/showblocks-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/hidpi/showblocks.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/hidpi/showblocks.png deleted file mode 100644 index a776fcc139f..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/hidpi/showblocks.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/showblocks-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/showblocks-rtl.png deleted file mode 100644 index cd87d3e258e..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/showblocks-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/showblocks.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/showblocks.png deleted file mode 100644 index 41b5f3466d2..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/icons/showblocks.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_address.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_address.png deleted file mode 100644 index 1ee67aa245f..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_address.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_blockquote.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_blockquote.png deleted file mode 100644 index cae3aec621a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_blockquote.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_div.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_div.png deleted file mode 100644 index c71f397880c..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_div.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h1.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h1.png deleted file mode 100644 index 3a64347350e..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h1.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h2.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h2.png deleted file mode 100644 index 8062ebe8e4b..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h2.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h3.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h3.png deleted file mode 100644 index 5b6a4030284..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h3.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h4.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h4.png deleted file mode 100644 index 6c7f7951d49..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h4.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h5.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h5.png deleted file mode 100644 index e153de09988..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h5.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h6.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h6.png deleted file mode 100644 index c8d993a9d23..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_h6.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_p.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_p.png deleted file mode 100644 index 4e6035d209b..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_p.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_pre.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_pre.png deleted file mode 100644 index d11a0fffbe6..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/images/block_pre.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/af.js deleted file mode 100644 index 554256ce27d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'af', { - toolbar: 'Toon blokke' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ar.js deleted file mode 100644 index 3c1442336ee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ar', { - toolbar: 'مخطط تفصيلي' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bg.js deleted file mode 100644 index a3ce0da8830..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'bg', { - toolbar: 'Показва блокове' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bn.js deleted file mode 100644 index 2d2f11a9b12..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'bn', { - toolbar: 'Show Blocks' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bs.js deleted file mode 100644 index 8cfca3b623d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'bs', { - toolbar: 'Show Blocks' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ca.js deleted file mode 100644 index e096e63b9af..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ca', { - toolbar: 'Mostra els blocs' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/cs.js deleted file mode 100644 index 6fab93a0a50..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'cs', { - toolbar: 'Ukázat bloky' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/cy.js deleted file mode 100644 index c23ec94d252..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'cy', { - toolbar: 'Dangos Blociau' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/da.js deleted file mode 100644 index 72cfa4b5aea..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'da', { - toolbar: 'Vis afsnitsmærker' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/de.js deleted file mode 100644 index d19df25cc9e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'de', { - toolbar: 'Blöcke anzeigen' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/el.js deleted file mode 100644 index 2a6c9d772a7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'el', { - toolbar: 'Προβολή Τμημάτων' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-au.js deleted file mode 100644 index 0fde652f216..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'en-au', { - toolbar: 'Show Blocks' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-ca.js deleted file mode 100644 index e4b9d6716ed..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'en-ca', { - toolbar: 'Show Blocks' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-gb.js deleted file mode 100644 index 46eaabc9889..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'en-gb', { - toolbar: 'Show Blocks' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en.js deleted file mode 100644 index 8d2648dee42..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'en', { - toolbar: 'Show Blocks' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/eo.js deleted file mode 100644 index 8211f5d456b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'eo', { - toolbar: 'Montri la blokojn' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/es.js deleted file mode 100644 index 38990f03fce..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'es', { - toolbar: 'Mostrar bloques' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/et.js deleted file mode 100644 index 0aeff7dc4f4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'et', { - toolbar: 'Blokkide näitamine' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/eu.js deleted file mode 100644 index e557925bbf0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'eu', { - toolbar: 'Blokeak erakutsi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fa.js deleted file mode 100644 index 510ddfdc3a1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'fa', { - toolbar: 'نمایش بلوکها' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fi.js deleted file mode 100644 index 5e09affff7c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'fi', { - toolbar: 'Näytä elementit' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fo.js deleted file mode 100644 index cc1c9e8c070..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'fo', { - toolbar: 'Vís blokkar' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fr-ca.js deleted file mode 100644 index 3b26cbb7fa0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'fr-ca', { - toolbar: 'Afficher les blocs' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fr.js deleted file mode 100644 index a32559f5e75..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'fr', { - toolbar: 'Afficher les blocs' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/gl.js deleted file mode 100644 index f2606ee6783..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'gl', { - toolbar: 'Amosar os bloques' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/gu.js deleted file mode 100644 index c83ce8d3316..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'gu', { - toolbar: 'બ્લૉક બતાવવું' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/he.js deleted file mode 100644 index 7c40640bf63..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'he', { - toolbar: 'הצגת בלוקים' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hi.js deleted file mode 100644 index e060a370495..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'hi', { - toolbar: 'ब्लॉक दिखायें' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hr.js deleted file mode 100644 index b1e2afef3a0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'hr', { - toolbar: 'Prikaži blokove' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hu.js deleted file mode 100644 index 41fe0aa4619..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'hu', { - toolbar: 'Blokkok megjelenítése' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/id.js deleted file mode 100644 index 01817ad665b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'id', { - toolbar: 'Perlihatkan Blok' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/is.js deleted file mode 100644 index 91dd63b49b0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'is', { - toolbar: 'Sýna blokkir' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/it.js deleted file mode 100644 index c3b61471f8d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'it', { - toolbar: 'Visualizza Blocchi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ja.js deleted file mode 100644 index 8da77802b41..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ja', { - toolbar: 'ブロック表示' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ka.js deleted file mode 100644 index f9d9aa538ad..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ka', { - toolbar: 'არეების ჩვენება' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/km.js deleted file mode 100644 index 66c81dfe70b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'km', { - toolbar: 'បង្ហាញ​ប្លក់' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ko.js deleted file mode 100644 index 5f9d49c121a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ko', { - toolbar: '블록 보기' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ku.js deleted file mode 100644 index 39e6e8887ad..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ku', { - toolbar: 'نیشاندانی بەربەستەکان' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/lt.js deleted file mode 100644 index afb8bed8630..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'lt', { - toolbar: 'Rodyti blokus' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/lv.js deleted file mode 100644 index c99cfa6883b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'lv', { - toolbar: 'Parādīt blokus' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/mk.js deleted file mode 100644 index 79c393ef278..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'mk', { - toolbar: 'Show Blocks' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/mn.js deleted file mode 100644 index 8c8699344a5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'mn', { - toolbar: 'Хавтангуудыг харуулах' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ms.js deleted file mode 100644 index 0ad5ea8fda4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ms', { - toolbar: 'Show Blocks' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/nb.js deleted file mode 100644 index cccd13ff6ce..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'nb', { - toolbar: 'Vis blokker' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/nl.js deleted file mode 100644 index c27fcad1579..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'nl', { - toolbar: 'Toon blokken' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/no.js deleted file mode 100644 index 4d42a92d0c0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'no', { - toolbar: 'Vis blokker' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pl.js deleted file mode 100644 index e60be9acc9d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'pl', { - toolbar: 'Pokaż bloki' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pt-br.js deleted file mode 100644 index 064e3ba484d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'pt-br', { - toolbar: 'Mostrar blocos de código' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pt.js deleted file mode 100644 index 5981c7c982a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'pt', { - toolbar: 'Exibir blocos' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ro.js deleted file mode 100644 index a4ad433616a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ro', { - toolbar: 'Arată blocurile' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ru.js deleted file mode 100644 index b98473e4f92..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ru', { - toolbar: 'Отображать блоки' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/si.js deleted file mode 100644 index 85ebfd071be..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'si', { - toolbar: 'කොටස පෙන්නන්න' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sk.js deleted file mode 100644 index 8bb27cd34ae..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'sk', { - toolbar: 'Ukázať bloky' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sl.js deleted file mode 100644 index 27f605ae178..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'sl', { - toolbar: 'Prikaži ograde' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sq.js deleted file mode 100644 index dcfe4f02a5d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'sq', { - toolbar: 'Shfaq Blloqet' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sr-latn.js deleted file mode 100644 index b0212713831..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'sr-latn', { - toolbar: 'Show Blocks' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sr.js deleted file mode 100644 index 1480e23ac48..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'sr', { - toolbar: 'Show Blocks' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sv.js deleted file mode 100644 index dcb76726be4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'sv', { - toolbar: 'Visa block' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/th.js deleted file mode 100644 index 324adab4762..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'th', { - toolbar: 'แสดงบล็อคข้อมูล' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/tr.js deleted file mode 100644 index 42222bd113e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'tr', { - toolbar: 'Blokları Göster' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ug.js deleted file mode 100644 index f9721d8bb5c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'ug', { - toolbar: 'بۆلەكنى كۆرسەت' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/uk.js deleted file mode 100644 index 47d329e3934..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'uk', { - toolbar: 'Показувати блоки' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/vi.js deleted file mode 100644 index 805171bcd11..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'vi', { - toolbar: 'Hiển thị các khối' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/zh-cn.js deleted file mode 100644 index cb3d24c8ae2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'zh-cn', { - toolbar: '显示区块' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/zh.js deleted file mode 100644 index bcfc76b201e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'showblocks', 'zh', { - toolbar: '顯示區塊' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/plugin.js deleted file mode 100644 index 6d963cc7834..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showblocks/plugin.js +++ /dev/null @@ -1,153 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview The "showblocks" plugin. Enable it will make all block level - * elements being decorated with a border and the element name - * displayed on the left-right corner. - */ - -( function() { - 'use strict'; - - var commandDefinition = { - readOnly: 1, - preserveState: true, - editorFocus: false, - - exec: function( editor ) { - this.toggleState(); - this.refresh( editor ); - }, - - refresh: function( editor ) { - if ( editor.document ) { - // Show blocks turns inactive after editor loses focus when in inline. - var showBlocks = this.state == CKEDITOR.TRISTATE_ON && - ( editor.elementMode != CKEDITOR.ELEMENT_MODE_INLINE || - editor.focusManager.hasFocus ); - - var funcName = showBlocks ? 'attachClass' : 'removeClass'; - editor.editable()[ funcName ]( 'cke_show_blocks' ); - } - } - }; - - CKEDITOR.plugins.add( 'showblocks', { - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'showblocks,showblocks-rtl', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - onLoad: function() { - var tags = [ 'p', 'div', 'pre', 'address', 'blockquote', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ], - cssStd, cssImg, cssLtr, cssRtl, - path = CKEDITOR.getUrl( this.path ), - // #10884 don't apply showblocks styles to non-editable elements and chosen ones. - // IE8 does not support :not() pseudoclass, so we need to reset showblocks rather - // than 'prevent' its application. We do that by additional rules. - supportsNotPseudoclass = !( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ), - notDisabled = supportsNotPseudoclass ? ':not([contenteditable=false]):not(.cke_show_blocks_off)' : '', - tag, trailing; - - cssStd = cssImg = cssLtr = cssRtl = ''; - - while ( ( tag = tags.pop() ) ) { - trailing = tags.length ? ',' : ''; - - cssStd += '.cke_show_blocks ' + tag + notDisabled + trailing; - cssLtr += '.cke_show_blocks.cke_contents_ltr ' + tag + notDisabled + trailing; - cssRtl += '.cke_show_blocks.cke_contents_rtl ' + tag + notDisabled + trailing; - cssImg += '.cke_show_blocks ' + tag + notDisabled + '{' + - 'background-image:url(' + path + 'images/block_' + tag + '.png)' + - '}'; - } - - // .cke_show_blocks p { ... } - cssStd += '{' + - 'background-repeat:no-repeat;' + - 'border:1px dotted gray;' + - 'padding-top:8px' + - '}'; - - // .cke_show_blocks.cke_contents_ltr p { ... } - cssLtr += '{' + - 'background-position:top left;' + - 'padding-left:8px' + - '}'; - - // .cke_show_blocks.cke_contents_rtl p { ... } - cssRtl += '{' + - 'background-position:top right;' + - 'padding-right:8px' + - '}'; - - CKEDITOR.addCss( cssStd.concat( cssImg, cssLtr, cssRtl ) ); - - // [IE8] Reset showblocks styles for non-editables and chosen elements, because - // it could not be done using :not() pseudoclass (#10884). - if ( !supportsNotPseudoclass ) { - CKEDITOR.addCss( - '.cke_show_blocks [contenteditable=false],.cke_show_blocks .cke_show_blocks_off{' + - 'border:none;' + - 'padding-top:0;' + - 'background-image:none' + - '}' + - '.cke_show_blocks.cke_contents_rtl [contenteditable=false],.cke_show_blocks.cke_contents_rtl .cke_show_blocks_off{' + - 'padding-right:0' + - '}' + - '.cke_show_blocks.cke_contents_ltr [contenteditable=false],.cke_show_blocks.cke_contents_ltr .cke_show_blocks_off{' + - 'padding-left:0' + - '}' - ); - } - }, - init: function( editor ) { - if ( editor.blockless ) - return; - - var command = editor.addCommand( 'showblocks', commandDefinition ); - command.canUndo = false; - - if ( editor.config.startupOutlineBlocks ) - command.setState( CKEDITOR.TRISTATE_ON ); - - editor.ui.addButton && editor.ui.addButton( 'ShowBlocks', { - label: editor.lang.showblocks.toolbar, - command: 'showblocks', - toolbar: 'tools,20' - } ); - - // Refresh the command on setData. - editor.on( 'mode', function() { - if ( command.state != CKEDITOR.TRISTATE_DISABLED ) - command.refresh( editor ); - } ); - - // Refresh the command on focus/blur in inline. - if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_INLINE ) { - editor.on( 'focus', onFocusBlur ); - editor.on( 'blur', onFocusBlur ); - } - - // Refresh the command on setData. - editor.on( 'contentDom', function() { - if ( command.state != CKEDITOR.TRISTATE_DISABLED ) - command.refresh( editor ); - } ); - - function onFocusBlur() { - command.refresh( editor ); - } - } - } ); -} )(); - -/** - * Whether to automaticaly enable the show block" command when the editor loads. - * - * config.startupOutlineBlocks = true; - * - * @cfg {Boolean} [startupOutlineBlocks=false] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showborders/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/showborders/plugin.js deleted file mode 100644 index f2d1053bb02..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/showborders/plugin.js +++ /dev/null @@ -1,174 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview The "show border" plugin. The command display visible outline - * border line around all table elements if table doesn't have a none-zero 'border' attribute specified. - */ - -( function() { - var commandDefinition = { - preserveState: true, - editorFocus: false, - readOnly: 1, - - exec: function( editor ) { - this.toggleState(); - this.refresh( editor ); - }, - - refresh: function( editor ) { - if ( editor.document ) { - var funcName = ( this.state == CKEDITOR.TRISTATE_ON ) ? 'attachClass' : 'removeClass'; - editor.editable()[ funcName ]( 'cke_show_borders' ); - } - } - }; - - var showBorderClassName = 'cke_show_border'; - - CKEDITOR.plugins.add( 'showborders', { - modes: { 'wysiwyg': 1 }, - - onLoad: function() { - var cssStyleText, - cssTemplate = - // TODO: For IE6, we don't have child selector support, - // where nested table cells could be incorrect. - ( CKEDITOR.env.ie6Compat ? [ - '.%1 table.%2,', - '.%1 table.%2 td, .%1 table.%2 th', - '{', - 'border : #d3d3d3 1px dotted', - '}' - ] : [ - '.%1 table.%2,', - '.%1 table.%2 > tr > td, .%1 table.%2 > tr > th,', - '.%1 table.%2 > tbody > tr > td, .%1 table.%2 > tbody > tr > th,', - '.%1 table.%2 > thead > tr > td, .%1 table.%2 > thead > tr > th,', - '.%1 table.%2 > tfoot > tr > td, .%1 table.%2 > tfoot > tr > th', - '{', - 'border : #d3d3d3 1px dotted', - '}' - ] ).join( '' ); - - cssStyleText = cssTemplate.replace( /%2/g, showBorderClassName ).replace( /%1/g, 'cke_show_borders ' ); - - CKEDITOR.addCss( cssStyleText ); - }, - - init: function( editor ) { - - var command = editor.addCommand( 'showborders', commandDefinition ); - command.canUndo = false; - - if ( editor.config.startupShowBorders !== false ) - command.setState( CKEDITOR.TRISTATE_ON ); - - // Refresh the command on setData. - editor.on( 'mode', function() { - if ( command.state != CKEDITOR.TRISTATE_DISABLED ) - command.refresh( editor ); - }, null, null, 100 ); - - // Refresh the command on wysiwyg frame reloads. - editor.on( 'contentDom', function() { - if ( command.state != CKEDITOR.TRISTATE_DISABLED ) - command.refresh( editor ); - } ); - - editor.on( 'removeFormatCleanup', function( evt ) { - var element = evt.data; - if ( editor.getCommand( 'showborders' ).state == CKEDITOR.TRISTATE_ON && element.is( 'table' ) && ( !element.hasAttribute( 'border' ) || parseInt( element.getAttribute( 'border' ), 10 ) <= 0 ) ) - element.addClass( showBorderClassName ); - } ); - }, - - afterInit: function( editor ) { - var dataProcessor = editor.dataProcessor, - dataFilter = dataProcessor && dataProcessor.dataFilter, - htmlFilter = dataProcessor && dataProcessor.htmlFilter; - - if ( dataFilter ) { - dataFilter.addRules( { - elements: { - 'table': function( element ) { - var attributes = element.attributes, - cssClass = attributes[ 'class' ], - border = parseInt( attributes.border, 10 ); - - if ( ( !border || border <= 0 ) && ( !cssClass || cssClass.indexOf( showBorderClassName ) == -1 ) ) - attributes[ 'class' ] = ( cssClass || '' ) + ' ' + showBorderClassName; - } - } - } ); - } - - if ( htmlFilter ) { - htmlFilter.addRules( { - elements: { - 'table': function( table ) { - var attributes = table.attributes, - cssClass = attributes[ 'class' ]; - - cssClass && ( attributes[ 'class' ] = cssClass.replace( showBorderClassName, '' ).replace( /\s{2}/, ' ' ).replace( /^\s+|\s+$/, '' ) ); - } - } - } ); - } - } - } ); - - // Table dialog must be aware of it. - CKEDITOR.on( 'dialogDefinition', function( ev ) { - var dialogName = ev.data.name; - - if ( dialogName == 'table' || dialogName == 'tableProperties' ) { - var dialogDefinition = ev.data.definition, - infoTab = dialogDefinition.getContents( 'info' ), - borderField = infoTab.get( 'txtBorder' ), - originalCommit = borderField.commit; - - borderField.commit = CKEDITOR.tools.override( originalCommit, function( org ) { - return function( data, selectedTable ) { - org.apply( this, arguments ); - var value = parseInt( this.getValue(), 10 ); - selectedTable[ ( !value || value <= 0 ) ? 'addClass' : 'removeClass' ]( showBorderClassName ); - }; - } ); - - var advTab = dialogDefinition.getContents( 'advanced' ), - classField = advTab && advTab.get( 'advCSSClasses' ); - - if ( classField ) { - classField.setup = CKEDITOR.tools.override( classField.setup, function( originalSetup ) { - return function() { - originalSetup.apply( this, arguments ); - this.setValue( this.getValue().replace( /cke_show_border/, '' ) ); - }; - } ); - - classField.commit = CKEDITOR.tools.override( classField.commit, function( originalCommit ) { - return function( data, element ) { - originalCommit.apply( this, arguments ); - - if ( !parseInt( element.getAttribute( 'border' ), 10 ) ) - element.addClass( 'cke_show_border' ); - }; - } ); - } - } - } ); - -} )(); - -/** - * Whether to automatically enable the "show borders" command when the editor loads. - * - * config.startupShowBorders = false; - * - * @cfg {Boolean} [startupShowBorders=true] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/dialogs/smiley.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/dialogs/smiley.js deleted file mode 100644 index c47469a13a3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/dialogs/smiley.js +++ /dev/null @@ -1,190 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.dialog.add( 'smiley', function( editor ) { - var config = editor.config, - lang = editor.lang.smiley, - images = config.smiley_images, - columns = config.smiley_columns || 8, - i; - - // Simulate "this" of a dialog for non-dialog events. - // @type {CKEDITOR.dialog} - var dialog; - var onClick = function( evt ) { - var target = evt.data.getTarget(), - targetName = target.getName(); - - if ( targetName == 'a' ) - target = target.getChild( 0 ); - else if ( targetName != 'img' ) - return; - - var src = target.getAttribute( 'cke_src' ), - title = target.getAttribute( 'title' ); - - var img = editor.document.createElement( 'img', { - attributes: { - src: src, - 'data-cke-saved-src': src, - title: title, - alt: title, - width: target.$.width, - height: target.$.height - } - } ); - - editor.insertElement( img ); - - dialog.hide(); - evt.data.preventDefault(); - }; - - var onKeydown = CKEDITOR.tools.addFunction( function( ev, element ) { - ev = new CKEDITOR.dom.event( ev ); - element = new CKEDITOR.dom.element( element ); - var relative, nodeToMove; - - var keystroke = ev.getKeystroke(), - rtl = editor.lang.dir == 'rtl'; - switch ( keystroke ) { - // UP-ARROW - case 38: - // relative is TR - if ( ( relative = element.getParent().getParent().getPrevious() ) ) { - nodeToMove = relative.getChild( [ element.getParent().getIndex(), 0 ] ); - nodeToMove.focus(); - } - ev.preventDefault(); - break; - // DOWN-ARROW - case 40: - // relative is TR - if ( ( relative = element.getParent().getParent().getNext() ) ) { - nodeToMove = relative.getChild( [ element.getParent().getIndex(), 0 ] ); - if ( nodeToMove ) - nodeToMove.focus(); - } - ev.preventDefault(); - break; - // ENTER - // SPACE - case 32: - onClick( { data: ev } ); - ev.preventDefault(); - break; - - // RIGHT-ARROW - case rtl ? 37 : 39: - // relative is TD - if ( ( relative = element.getParent().getNext() ) ) { - nodeToMove = relative.getChild( 0 ); - nodeToMove.focus(); - ev.preventDefault( true ); - } - // relative is TR - else if ( ( relative = element.getParent().getParent().getNext() ) ) { - nodeToMove = relative.getChild( [ 0, 0 ] ); - if ( nodeToMove ) - nodeToMove.focus(); - ev.preventDefault( true ); - } - break; - - // LEFT-ARROW - case rtl ? 39 : 37: - // relative is TD - if ( ( relative = element.getParent().getPrevious() ) ) { - nodeToMove = relative.getChild( 0 ); - nodeToMove.focus(); - ev.preventDefault( true ); - } - // relative is TR - else if ( ( relative = element.getParent().getParent().getPrevious() ) ) { - nodeToMove = relative.getLast().getChild( 0 ); - nodeToMove.focus(); - ev.preventDefault( true ); - } - break; - default: - // Do not stop not handled events. - return; - } - } ); - - // Build the HTML for the smiley images table. - var labelId = CKEDITOR.tools.getNextId() + '_smiley_emtions_label'; - var html = [ - '
' + - '' + lang.options + '', - '' - ]; - - var size = images.length; - for ( i = 0; i < size; i++ ) { - if ( i % columns === 0 ) - html.push( '' ); - - var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber(); - html.push( '' ); - - if ( i % columns == columns - 1 ) - html.push( '' ); - } - - if ( i < columns - 1 ) { - for ( ; i < columns - 1; i++ ) - html.push( '' ); - html.push( '' ); - } - - html.push( '
' ); - - var smileySelector = { - type: 'html', - id: 'smileySelector', - html: html.join( '' ), - onLoad: function( event ) { - dialog = event.sender; - }, - focus: function() { - var self = this; - // IE need a while to move the focus (#6539). - setTimeout( function() { - var firstSmile = self.getElement().getElementsByTag( 'a' ).getItem( 0 ); - firstSmile.focus(); - }, 0 ); - }, - onClick: onClick, - style: 'width: 100%; border-collapse: separate;' - }; - - return { - title: editor.lang.smiley.title, - minWidth: 270, - minHeight: 120, - contents: [ - { - id: 'tab1', - label: '', - title: '', - expand: true, - padding: 0, - elements: [ - smileySelector - ] - } - ], - buttons: [ CKEDITOR.dialog.cancelButton ] - }; -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/icons/hidpi/smiley.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/icons/hidpi/smiley.png deleted file mode 100644 index bad62eed468..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/icons/hidpi/smiley.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/icons/smiley.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/icons/smiley.png deleted file mode 100644 index 9fafa28a81a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/icons/smiley.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angel_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angel_smile.gif deleted file mode 100644 index e7daebc2f78..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angel_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angel_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angel_smile.png deleted file mode 100644 index 39a85c39854..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angel_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angry_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angry_smile.gif deleted file mode 100644 index a5890f37953..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angry_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angry_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angry_smile.png deleted file mode 100644 index dd07d3e6ec6..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/angry_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/broken_heart.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/broken_heart.gif deleted file mode 100644 index 0b822cd9c8a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/broken_heart.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/broken_heart.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/broken_heart.png deleted file mode 100644 index 775146fde1c..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/broken_heart.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/confused_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/confused_smile.gif deleted file mode 100644 index 95871949178..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/confused_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/confused_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/confused_smile.png deleted file mode 100644 index d69a6f923bd..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/confused_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/cry_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/cry_smile.gif deleted file mode 100644 index b5133427828..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/cry_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/cry_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/cry_smile.png deleted file mode 100644 index dd610b8f011..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/cry_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/devil_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/devil_smile.gif deleted file mode 100644 index 9b2a10055be..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/devil_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/devil_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/devil_smile.png deleted file mode 100644 index 63a908e11d7..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/devil_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embaressed_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embaressed_smile.gif deleted file mode 100644 index b64a58bdae9..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embaressed_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embarrassed_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embarrassed_smile.gif deleted file mode 100644 index b64a58bdae9..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embarrassed_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embarrassed_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embarrassed_smile.png deleted file mode 100644 index f01cdf3b723..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/embarrassed_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/envelope.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/envelope.gif deleted file mode 100644 index f8ffc54345b..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/envelope.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/envelope.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/envelope.png deleted file mode 100644 index b4180c5b368..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/envelope.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/heart.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/heart.gif deleted file mode 100644 index 77e0fe8bfa2..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/heart.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/heart.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/heart.png deleted file mode 100644 index a5335bb60ff..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/heart.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/kiss.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/kiss.gif deleted file mode 100644 index 49f31ab4933..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/kiss.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/kiss.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/kiss.png deleted file mode 100644 index 4f5f0a5fc07..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/kiss.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/lightbulb.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/lightbulb.gif deleted file mode 100644 index 73f2e5aaaf4..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/lightbulb.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/lightbulb.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/lightbulb.png deleted file mode 100644 index 56c8137dcfd..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/lightbulb.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/omg_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/omg_smile.gif deleted file mode 100644 index abd2a869931..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/omg_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/omg_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/omg_smile.png deleted file mode 100644 index cbbb106a197..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/omg_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/regular_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/regular_smile.gif deleted file mode 100644 index de7f1ef1e18..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/regular_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/regular_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/regular_smile.png deleted file mode 100644 index 786b20006f4..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/regular_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/sad_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/sad_smile.gif deleted file mode 100644 index ee7810e472f..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/sad_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/sad_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/sad_smile.png deleted file mode 100644 index 1ae435c2d74..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/sad_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/shades_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/shades_smile.gif deleted file mode 100644 index 11fc90f60ab..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/shades_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/shades_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/shades_smile.png deleted file mode 100644 index 9e68d5a637c..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/shades_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/teeth_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/teeth_smile.gif deleted file mode 100644 index a950b4389a3..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/teeth_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/teeth_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/teeth_smile.png deleted file mode 100644 index c7d2fd4e74a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/teeth_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_down.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_down.gif deleted file mode 100644 index c01f763fca9..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_down.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_down.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_down.png deleted file mode 100644 index a6bb53291bb..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_down.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_up.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_up.gif deleted file mode 100644 index 0f42774d09e..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_up.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_up.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_up.png deleted file mode 100644 index 6ea78591890..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/thumbs_up.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tongue_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tongue_smile.gif deleted file mode 100644 index 369b4350821..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tongue_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tongue_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tongue_smile.png deleted file mode 100644 index 5bee4c049e6..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tongue_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tounge_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tounge_smile.gif deleted file mode 100644 index 369b4350821..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/tounge_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/whatchutalkingabout_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/whatchutalkingabout_smile.gif deleted file mode 100644 index 2cc81c14f68..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/whatchutalkingabout_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/whatchutalkingabout_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/whatchutalkingabout_smile.png deleted file mode 100644 index bebf74daa62..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/whatchutalkingabout_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/wink_smile.gif b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/wink_smile.gif deleted file mode 100644 index 07cad31b834..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/wink_smile.gif and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/wink_smile.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/wink_smile.png deleted file mode 100644 index 805da960588..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/images/wink_smile.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/af.js deleted file mode 100644 index 749b63ce4b2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/af.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'af', { - options: 'Lagbekkie opsies', - title: 'Voeg lagbekkie by', - toolbar: 'Lagbekkie' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ar.js deleted file mode 100644 index 91f57f15ee3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ar.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ar', { - options: 'خصائص الإبتسامات', - title: 'إدراج ابتسامات', - toolbar: 'ابتسامات' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bg.js deleted file mode 100644 index 7df16430285..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bg.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'bg', { - options: 'Опции за усмивката', - title: 'Вмъкване на усмивка', - toolbar: 'Усмивка' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bn.js deleted file mode 100644 index e0af44ebbe8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bn.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'bn', { - options: 'Smiley Options', // MISSING - title: 'স্মাইলী যুক্ত কর', - toolbar: 'স্মাইলী' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bs.js deleted file mode 100644 index f9883ffb3f9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/bs.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'bs', { - options: 'Smiley Options', // MISSING - title: 'Ubaci smješka', - toolbar: 'Smješko' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ca.js deleted file mode 100644 index 4dc310914d6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ca.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ca', { - options: 'Opcions d\'emoticones', - title: 'Insereix una icona', - toolbar: 'Icona' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/cs.js deleted file mode 100644 index cc841dbb484..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/cs.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'cs', { - options: 'Nastavení smajlíků', - title: 'Vkládání smajlíků', - toolbar: 'Smajlíci' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/cy.js deleted file mode 100644 index 0e8d00ab912..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/cy.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'cy', { - options: 'Opsiynau Gwenogluniau', - title: 'Mewnosod Gwenoglun', - toolbar: 'Gwenoglun' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/da.js deleted file mode 100644 index 3d6e7c489bf..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/da.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'da', { - options: 'Smileymuligheder', - title: 'Vælg smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/de.js deleted file mode 100644 index cd1388ffd21..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/de.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'de', { - options: 'Smiley Optionen', - title: 'Smiley auswählen', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/el.js deleted file mode 100644 index f60f0dbe2d5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/el.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'el', { - options: 'Επιλογές Φατσούλων', - title: 'Εισάγετε μια Φατσούλα', - toolbar: 'Φατσούλα' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-au.js deleted file mode 100644 index 9290f14bcdc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-au.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'en-au', { - options: 'Smiley Options', // MISSING - title: 'Insert a Smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-ca.js deleted file mode 100644 index de736aae52a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-ca.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'en-ca', { - options: 'Smiley Options', // MISSING - title: 'Insert a Smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-gb.js deleted file mode 100644 index 937ab610cf7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en-gb.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'en-gb', { - options: 'Smiley Options', - title: 'Insert a Smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en.js deleted file mode 100644 index cc1b1ab6be3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/en.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'en', { - options: 'Smiley Options', - title: 'Insert a Smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/eo.js deleted file mode 100644 index d0cd1014468..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/eo.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'eo', { - options: 'Opcioj pri mienvinjetoj', - title: 'Enmeti Mienvinjeton', - toolbar: 'Mienvinjeto' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/es.js deleted file mode 100644 index 6f658598168..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/es.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'es', { - options: 'Opciones de emoticonos', - title: 'Insertar un Emoticon', - toolbar: 'Emoticonos' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/et.js deleted file mode 100644 index 8e38e856f7b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/et.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'et', { - options: 'Emotikonide valikud', - title: 'Sisesta emotikon', - toolbar: 'Emotikon' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/eu.js deleted file mode 100644 index e2be9b94f22..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/eu.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'eu', { - options: 'Aurpegiera Aukerak', - title: 'Aurpegiera Sartu', - toolbar: 'Aurpegierak' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fa.js deleted file mode 100644 index c3011d57b97..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fa.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'fa', { - options: 'گزینه​های خندانک', - title: 'گنجاندن خندانک', - toolbar: 'خندانک' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fi.js deleted file mode 100644 index 3bbfbbc62a4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fi.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'fi', { - options: 'Hymiön ominaisuudet', - title: 'Lisää hymiö', - toolbar: 'Hymiö' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fo.js deleted file mode 100644 index fbb657db904..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fo.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'fo', { - options: 'Møguleikar fyri Smiley', - title: 'Vel Smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fr-ca.js deleted file mode 100644 index ab14ee9c5b7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fr-ca.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'fr-ca', { - options: 'Options d\'émoticônes', - title: 'Insérer un émoticône', - toolbar: 'Émoticône' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fr.js deleted file mode 100644 index 22f50b97cb1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/fr.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'fr', { - options: 'Options des émoticones', - title: 'Insérer un émoticone', - toolbar: 'Émoticones' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/gl.js deleted file mode 100644 index 4e4eeb76f21..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/gl.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'gl', { - options: 'Opcións de emoticonas', - title: 'Inserir unha emoticona', - toolbar: 'Emoticona' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/gu.js deleted file mode 100644 index b86af7febc6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/gu.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'gu', { - options: 'સમ્ય્લી વિકલ્પો', - title: 'સ્માઇલી પસંદ કરો', - toolbar: 'સ્માઇલી' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/he.js deleted file mode 100644 index 68558b6899f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/he.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'he', { - options: 'אפשרויות סמיילים', - title: 'הוספת סמיילי', - toolbar: 'סמיילי' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hi.js deleted file mode 100644 index 5f6428b1805..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hi.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'hi', { - options: 'Smiley Options', // MISSING - title: 'स्माइली इन्सर्ट करें', - toolbar: 'स्माइली' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hr.js deleted file mode 100644 index 2550eda4b16..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hr.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'hr', { - options: 'Opcije smješka', - title: 'Ubaci smješka', - toolbar: 'Smješko' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hu.js deleted file mode 100644 index d667ca949fd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/hu.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'hu', { - options: 'Hangulatjel opciók', - title: 'Hangulatjel beszúrása', - toolbar: 'Hangulatjelek' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/id.js deleted file mode 100644 index 8615915c06a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/id.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'id', { - options: 'Opsi Smiley', - title: 'Sisip sebuah Smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/is.js deleted file mode 100644 index 17a888f3303..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/is.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'is', { - options: 'Smiley Options', // MISSING - title: 'Velja svip', - toolbar: 'Svipur' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/it.js deleted file mode 100644 index 64e9aa90cb6..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/it.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'it', { - options: 'Opzioni Smiley', - title: 'Inserisci emoticon', - toolbar: 'Emoticon' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ja.js deleted file mode 100644 index 0b4bdb59550..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ja.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ja', { - options: '絵文字オプション', - title: '顔文字挿入', - toolbar: '絵文字' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ka.js deleted file mode 100644 index 3d4a1fcb485..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ka.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ka', { - options: 'სიცილაკის პარამეტრები', - title: 'სიცილაკის ჩასმა', - toolbar: 'სიცილაკები' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/km.js deleted file mode 100644 index cff8288991c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/km.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'km', { - options: 'ជម្រើស​រូប​សញ្ញា​អារម្មណ៍', - title: 'បញ្ចូល​រូប​សញ្ញា​អារម្មណ៍', - toolbar: 'រូប​សញ្ញ​អារម្មណ៍' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ko.js deleted file mode 100644 index e2a0a15bf1a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ko.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ko', { - options: '이모티콘 옵션', - title: '아이콘 삽입', - toolbar: '아이콘' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ku.js deleted file mode 100644 index e730c82d51c..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ku.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ku', { - options: 'هەڵبژاردەی زەردەخەنه', - title: 'دانانی زەردەخەنەیەك', - toolbar: 'زەردەخەنه' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/lt.js deleted file mode 100644 index 56337b258a2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/lt.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'lt', { - options: 'Šypsenėlių nustatymai', - title: 'Įterpti veidelį', - toolbar: 'Veideliai' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/lv.js deleted file mode 100644 index 85f38b33ba9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/lv.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'lv', { - options: 'Smaidiņu uzstādījumi', - title: 'Ievietot smaidiņu', - toolbar: 'Smaidiņi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/mk.js deleted file mode 100644 index 17b03f487b9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/mk.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'mk', { - options: 'Smiley Options', // MISSING - title: 'Insert a Smiley', // MISSING - toolbar: 'Smiley' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/mn.js deleted file mode 100644 index 6eeaa235f4f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/mn.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'mn', { - options: 'Smiley Options', // MISSING - title: 'Тодорхойлолт оруулах', - toolbar: 'Тодорхойлолт' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ms.js deleted file mode 100644 index 062368944ce..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ms.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ms', { - options: 'Smiley Options', // MISSING - title: 'Masukkan Smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/nb.js deleted file mode 100644 index 5582cac033b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/nb.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'nb', { - options: 'Alternativer for smil', - title: 'Sett inn smil', - toolbar: 'Smil' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/nl.js deleted file mode 100644 index 1f567a1ae1d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/nl.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'nl', { - options: 'Smiley opties', - title: 'Smiley invoegen', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/no.js deleted file mode 100644 index ac1e62b3546..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/no.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'no', { - options: 'Alternativer for smil', - title: 'Sett inn smil', - toolbar: 'Smil' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pl.js deleted file mode 100644 index 879837184d3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pl.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'pl', { - options: 'Opcje emotikonów', - title: 'Wstaw emotikona', - toolbar: 'Emotikony' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pt-br.js deleted file mode 100644 index cc2ff4c07fd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pt-br.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'pt-br', { - options: 'Opções de Emoticons', - title: 'Inserir Emoticon', - toolbar: 'Emoticon' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pt.js deleted file mode 100644 index 510731b1c0b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/pt.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'pt', { - options: 'Opções de Emoticons', - title: 'Inserir um Emoticon', - toolbar: 'Emoticons' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ro.js deleted file mode 100644 index 772eb53ef45..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ro.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ro', { - options: 'Opțiuni figuri expresive', - title: 'Inserează o figură expresivă (Emoticon)', - toolbar: 'Figură expresivă (Emoticon)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ru.js deleted file mode 100644 index e3e0325bf90..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ru.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ru', { - options: 'Выбор смайла', - title: 'Вставить смайл', - toolbar: 'Смайлы' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/si.js deleted file mode 100644 index 80c7288dbb8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/si.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'si', { - options: 'හාස්‍ය විකල්ප', - title: 'හාස්‍යන් ඇතුලත් කිරීම', - toolbar: 'හාස්‍යන්' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sk.js deleted file mode 100644 index 903472dd840..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sk.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'sk', { - options: 'Možnosti smajlíkov', - title: 'Vložiť smajlíka', - toolbar: 'Smajlíky' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sl.js deleted file mode 100644 index bd633cb3dba..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sl.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'sl', { - options: 'Možnosti Smeška', - title: 'Vstavi smeška', - toolbar: 'Smeško' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sq.js deleted file mode 100644 index 8659dc26307..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sq.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'sq', { - options: 'Opsionet e Ikonave', - title: 'Vendos Ikonë', - toolbar: 'Ikona' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sr-latn.js deleted file mode 100644 index a965860e331..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sr-latn.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'sr-latn', { - options: 'Smiley Options', // MISSING - title: 'Unesi smajlija', - toolbar: 'Smajli' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sr.js deleted file mode 100644 index a82eaa50d3d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sr.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'sr', { - options: 'Smiley Options', // MISSING - title: 'Унеси смајлија', - toolbar: 'Смајли' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sv.js deleted file mode 100644 index 74ca27a9e16..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/sv.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'sv', { - options: 'Smileyinställningar', - title: 'Infoga smiley', - toolbar: 'Smiley' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/th.js deleted file mode 100644 index a9348e24074..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/th.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'th', { - options: 'ตัวเลือกไอคอนแสดงอารมณ์', - title: 'แทรกสัญลักษณ์สื่ออารมณ์', - toolbar: 'รูปสื่ออารมณ์' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/tr.js deleted file mode 100644 index f715fc498e3..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/tr.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'tr', { - options: 'İfade Seçenekleri', - title: 'İfade Ekle', - toolbar: 'İfade' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ug.js deleted file mode 100644 index bb583378317..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/ug.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'ug', { - options: 'چىراي ئىپادە سىنبەلگە تاللانمىسى', - title: 'چىراي ئىپادە سىنبەلگە قىستۇر', - toolbar: 'چىراي ئىپادە' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/uk.js deleted file mode 100644 index f6e24b1f6fc..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/uk.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'uk', { - options: 'Опції смайликів', - title: 'Вставити смайлик', - toolbar: 'Смайлик' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/vi.js deleted file mode 100644 index 69f0dca06fa..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/vi.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'vi', { - options: 'Tùy chọn hình biểu lộ cảm xúc', - title: 'Chèn hình biểu lộ cảm xúc (mặt cười)', - toolbar: 'Hình biểu lộ cảm xúc (mặt cười)' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/zh-cn.js deleted file mode 100644 index a3c58f5709e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/zh-cn.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'zh-cn', { - options: '表情图标选项', - title: '插入表情图标', - toolbar: '表情符' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/zh.js deleted file mode 100644 index 52f1aa503c0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/lang/zh.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'smiley', 'zh', { - options: '表情符號選項', - title: '插入表情符號', - toolbar: '表情符號' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/plugin.js deleted file mode 100644 index 2a0d1c08045..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/smiley/plugin.js +++ /dev/null @@ -1,95 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -CKEDITOR.plugins.add( 'smiley', { - requires: 'dialog', - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'smiley', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - editor.config.smiley_path = editor.config.smiley_path || ( this.path + 'images/' ); - editor.addCommand( 'smiley', new CKEDITOR.dialogCommand( 'smiley', { - allowedContent: 'img[alt,height,!src,title,width]', - requiredContent: 'img' - } ) ); - editor.ui.addButton && editor.ui.addButton( 'Smiley', { - label: editor.lang.smiley.toolbar, - command: 'smiley', - toolbar: 'insert,50' - } ); - CKEDITOR.dialog.add( 'smiley', this.path + 'dialogs/smiley.js' ); - } -} ); - -/** - * The base path used to build the URL for the smiley images. It must end with a slash. - * - * config.smiley_path = 'http://www.example.com/images/smileys/'; - * - * config.smiley_path = '/images/smileys/'; - * - * @cfg {String} [smiley_path=CKEDITOR.basePath + 'plugins/smiley/images/'] - * @member CKEDITOR.config - */ - -/** - * The file names for the smileys to be displayed. These files must be - * contained inside the URL path defined with the {@link #smiley_path} setting. - * - * // This is actually the default value. - * config.smiley_images = [ - * 'regular_smile.png','sad_smile.png','wink_smile.png','teeth_smile.png','confused_smile.png','tongue_smile.png', - * 'embarrassed_smile.png','omg_smile.png','whatchutalkingabout_smile.png','angry_smile.png','angel_smile.png','shades_smile.png', - * 'devil_smile.png','cry_smile.png','lightbulb.png','thumbs_down.png','thumbs_up.png','heart.png', - * 'broken_heart.png','kiss.png','envelope.png' - * ]; - * - * @cfg - * @member CKEDITOR.config - */ -CKEDITOR.config.smiley_images = [ - 'regular_smile.png', 'sad_smile.png', 'wink_smile.png', 'teeth_smile.png', 'confused_smile.png', 'tongue_smile.png', - 'embarrassed_smile.png', 'omg_smile.png', 'whatchutalkingabout_smile.png', 'angry_smile.png', 'angel_smile.png', 'shades_smile.png', - 'devil_smile.png', 'cry_smile.png', 'lightbulb.png', 'thumbs_down.png', 'thumbs_up.png', 'heart.png', - 'broken_heart.png', 'kiss.png', 'envelope.png' ]; - -/** - * The description to be used for each of the smileys defined in the - * {@link CKEDITOR.config#smiley_images} setting. Each entry in this array list - * must match its relative pair in the {@link CKEDITOR.config#smiley_images} - * setting. - * - * // Default settings. - * config.smiley_descriptions = [ - * 'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise', - * 'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no', - * 'yes', 'heart', 'broken heart', 'kiss', 'mail' - * ]; - * - * // Use textual emoticons as description. - * config.smiley_descriptions = [ - * ':)', ':(', ';)', ':D', ':/', ':P', ':*)', ':-o', - * ':|', '>:(', 'o:)', '8-)', '>:-)', ';(', '', '', '', - * '', '', ':-*', '' - * ]; - * - * @cfg - * @member CKEDITOR.config - */ -CKEDITOR.config.smiley_descriptions = [ - 'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise', - 'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no', - 'yes', 'heart', 'broken heart', 'kiss', 'mail' -]; - -/** - * The number of columns to be generated by the smilies matrix. - * - * config.smiley_columns = 6; - * - * @since 3.3.2 - * @cfg {Number} [smiley_columns=8] - * @member CKEDITOR.config - */ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/hidpi/source-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/hidpi/source-rtl.png deleted file mode 100644 index adf4af3c984..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/hidpi/source-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/hidpi/source.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/hidpi/source.png deleted file mode 100644 index b4d0a15a4d8..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/hidpi/source.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/source-rtl.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/source-rtl.png deleted file mode 100644 index 27d1ba88198..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/source-rtl.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/source.png b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/source.png deleted file mode 100644 index e44db37985a..00000000000 Binary files a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/icons/source.png and /dev/null differ diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/af.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/af.js deleted file mode 100644 index 69219cedcba..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/af.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'af', { - toolbar: 'Bron' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ar.js deleted file mode 100644 index 9a16c41387a..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ar.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ar', { - toolbar: 'المصدر' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bg.js deleted file mode 100644 index e666a0d56c9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bg.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'bg', { - toolbar: 'Източник' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bn.js deleted file mode 100644 index 2487c69bfa2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'bn', { - toolbar: 'সোর্স' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bs.js deleted file mode 100644 index 50f74b2fe28..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/bs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'bs', { - toolbar: 'HTML kôd' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ca.js deleted file mode 100644 index 3bde9966937..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ca', { - toolbar: 'Codi font' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/cs.js deleted file mode 100644 index d6f636dd64f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/cs.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'cs', { - toolbar: 'Zdroj' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/cy.js deleted file mode 100644 index b119eea8588..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/cy.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'cy', { - toolbar: 'HTML' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/da.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/da.js deleted file mode 100644 index eb4f8691c68..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/da.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'da', { - toolbar: 'Kilde' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/de.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/de.js deleted file mode 100644 index 6c83749146e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/de.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'de', { - toolbar: 'Quellcode' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/el.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/el.js deleted file mode 100644 index f1272d97fef..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/el.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'el', { - toolbar: 'Κώδικας' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-au.js deleted file mode 100644 index 17dc21649c1..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-au.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'en-au', { - toolbar: 'Source' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-ca.js deleted file mode 100644 index 436f7ced283..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'en-ca', { - toolbar: 'Source' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-gb.js deleted file mode 100644 index 45d0dddb5c5..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en-gb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'en-gb', { - toolbar: 'Source' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en.js deleted file mode 100644 index d0d20fe9cd4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/en.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'en', { - toolbar: 'Source' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/eo.js deleted file mode 100644 index bdc71277292..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/eo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'eo', { - toolbar: 'Fonto' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/es.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/es.js deleted file mode 100644 index 3ffafc8630d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/es.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'es', { - toolbar: 'Fuente HTML' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/et.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/et.js deleted file mode 100644 index fd617160acd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/et.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'et', { - toolbar: 'Lähtekood' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/eu.js deleted file mode 100644 index b4f18a353df..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/eu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'eu', { - toolbar: 'HTML Iturburua' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fa.js deleted file mode 100644 index d0342eff353..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fa.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'fa', { - toolbar: 'منبع' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fi.js deleted file mode 100644 index fb40a26ab5d..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'fi', { - toolbar: 'Koodi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fo.js deleted file mode 100644 index f09a80a719e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fo.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'fo', { - toolbar: 'Kelda' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fr-ca.js deleted file mode 100644 index 9c16fa542a0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fr-ca.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'fr-ca', { - toolbar: 'Source' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fr.js deleted file mode 100644 index db7288ac1a4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/fr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'fr', { - toolbar: 'Source' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/gl.js deleted file mode 100644 index ad8481a4795..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/gl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'gl', { - toolbar: 'Orixe' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/gu.js deleted file mode 100644 index 3e917688a3b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/gu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'gu', { - toolbar: 'મૂળ કે પ્રાથમિક દસ્તાવેજ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/he.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/he.js deleted file mode 100644 index f7b1c922e40..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/he.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'he', { - toolbar: 'מקור' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hi.js deleted file mode 100644 index f6fc4eb0c45..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'hi', { - toolbar: 'सोर्स' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hr.js deleted file mode 100644 index ea5d64b9f1b..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'hr', { - toolbar: 'Kôd' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hu.js deleted file mode 100644 index 57cfd217d37..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/hu.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'hu', { - toolbar: 'Forráskód' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/id.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/id.js deleted file mode 100644 index a2606fc8193..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/id.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'id', { - toolbar: 'Sumber' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/is.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/is.js deleted file mode 100644 index 1f97cfbe150..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/is.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'is', { - toolbar: 'Kóði' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/it.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/it.js deleted file mode 100644 index 40473bc09be..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/it.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'it', { - toolbar: 'Sorgente' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ja.js deleted file mode 100644 index 27edc03ad25..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ja.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ja', { - toolbar: 'ソース' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ka.js deleted file mode 100644 index e000e40b88f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ka.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ka', { - toolbar: 'კოდები' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/km.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/km.js deleted file mode 100644 index e724fe58fb9..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/km.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'km', { - toolbar: 'អក្សរ​កូដ' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ko.js deleted file mode 100644 index 7dda18af2e2..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ko.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ko', { - toolbar: '소스' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ku.js deleted file mode 100644 index 89cf58351c0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ku.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ku', { - toolbar: 'سەرچاوە' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/lt.js deleted file mode 100644 index 25dcb0e854f..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/lt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'lt', { - toolbar: 'Šaltinis' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/lv.js deleted file mode 100644 index 2fe82ee9e52..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/lv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'lv', { - toolbar: 'HTML kods' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/mk.js deleted file mode 100644 index a9c47fec3a4..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/mk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'mk', { - toolbar: 'Source' // MISSING -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/mn.js deleted file mode 100644 index f7cc25f732e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/mn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'mn', { - toolbar: 'Код' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ms.js deleted file mode 100644 index f6f3f8b2959..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ms.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ms', { - toolbar: 'Sumber' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/nb.js deleted file mode 100644 index 2d98ab2d121..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/nb.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'nb', { - toolbar: 'Kilde' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/nl.js deleted file mode 100644 index eafd6d5d104..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/nl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'nl', { - toolbar: 'Broncode' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/no.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/no.js deleted file mode 100644 index 7d88bdbfaed..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/no.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'no', { - toolbar: 'Kilde' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pl.js deleted file mode 100644 index 207a21b8760..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'pl', { - toolbar: 'Źródło dokumentu' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pt-br.js deleted file mode 100644 index 0a8730efdb0..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pt-br.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'pt-br', { - toolbar: 'Código-Fonte' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pt.js deleted file mode 100644 index 3b098baf268..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/pt.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'pt', { - toolbar: 'Fonte' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ro.js deleted file mode 100644 index a12699dbaad..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ro.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ro', { - toolbar: 'Sursa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ru.js deleted file mode 100644 index a43e2a0a9ed..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ru.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ru', { - toolbar: 'Источник' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/si.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/si.js deleted file mode 100644 index 2c12c675ffd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/si.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'si', { - toolbar: 'මුලාශ්‍රය' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sk.js deleted file mode 100644 index 2a5b8140667..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'sk', { - toolbar: 'Zdroj' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sl.js deleted file mode 100644 index 49ca4425c39..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sl.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'sl', { - toolbar: 'Izvorna koda' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sq.js deleted file mode 100644 index cdeb5eb240e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sq.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'sq', { - toolbar: 'Burimi' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sr-latn.js deleted file mode 100644 index 221438fb376..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sr-latn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'sr-latn', { - toolbar: 'Kôd' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sr.js deleted file mode 100644 index dab4ab57c91..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'sr', { - toolbar: 'Kôд' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sv.js deleted file mode 100644 index 26bd571cffd..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/sv.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'sv', { - toolbar: 'Källa' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/th.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/th.js deleted file mode 100644 index 6704ec61ada..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/th.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'th', { - toolbar: 'ดูรหัส HTML' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/tr.js deleted file mode 100644 index 7ab852dba27..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/tr.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'tr', { - toolbar: 'Kaynak' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ug.js deleted file mode 100644 index bf84b170685..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/ug.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'ug', { - toolbar: 'مەنبە' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/uk.js deleted file mode 100644 index 624618e97ee..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/uk.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'uk', { - toolbar: 'Джерело' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/vi.js deleted file mode 100644 index c18e023daa8..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/vi.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'vi', { - toolbar: 'Mã HTML' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/zh-cn.js deleted file mode 100644 index b672bb578a7..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/zh-cn.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'zh-cn', { - toolbar: '源码' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/zh.js deleted file mode 100644 index 8f4bc938350..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/lang/zh.js +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.md or http://ckeditor.com/license -*/ -CKEDITOR.plugins.setLang( 'sourcearea', 'zh', { - toolbar: '原始碼' -} ); diff --git a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/plugin.js b/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/plugin.js deleted file mode 100644 index 25175b6333e..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/_source/plugins/sourcearea/plugin.js +++ /dev/null @@ -1,154 +0,0 @@ -/** - * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md or http://ckeditor.com/license - */ - -/** - * @fileOverview The "sourcearea" plugin. It registers the "source" editing - * mode, which displays the raw data being edited in the editor. - */ - -( function() { - CKEDITOR.plugins.add( 'sourcearea', { - lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% - icons: 'source,source-rtl', // %REMOVE_LINE_CORE% - hidpi: true, // %REMOVE_LINE_CORE% - init: function( editor ) { - // Source mode isn't available in inline mode yet. - if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_INLINE ) - return; - - var sourcearea = CKEDITOR.plugins.sourcearea; - - editor.addMode( 'source', function( callback ) { - var contentsSpace = editor.ui.space( 'contents' ), - textarea = contentsSpace.getDocument().createElement( 'textarea' ); - - textarea.setStyles( - CKEDITOR.tools.extend( { - // IE7 has overflow the
'; print ''; - print ''; - print ''; + print ''; print ''; - print ''; print ''."\n"; break; - case "authlink": - print ''; - print ''; - print ''; - print ''; - print ''."\n"; - break; - case "delete": - print ''; - print ''; - print ''; - print ''; - print ''."\n"; - break; - case "info": + case "info": // Google Api setup or Google OAuth Token print ''; print ''.$langs->trans($key['varname']).''; print ''; - print ''; + print ''; print ''."\n"; break; case "submit": @@ -225,7 +219,7 @@ if ($mode == 'config' && $user->admin) //print '
'.print_r($printer, true).'
'; $var=!$var; print ''; - print ''; + print ''; print '".''; } - if ($object->isservice()) + if ($object->isService()) { // Duration print ''; } - if ($object->isservice()) + if ($object->isService()) { // Duration print '"; $nblignes=6; - if ($object->isproduct() && ! empty($conf->stock->enabled)) $nblignes++; - if ($object->isservice()) $nblignes++; + if ($object->isProduct() && ! empty($conf->stock->enabled)) $nblignes++; + if ($object->isService()) $nblignes++; // Reference print ''; } - + + print '
'.$langs->trans("DolibarrStateBoard").' '.$langs->trans("DolibarrStateBoard").'
'; + print '
'; $var=true; @@ -279,7 +278,7 @@ if (empty($user->societe_id)) $var=!$var; if (!empty($langfile[$key])) $langs->load($langfile[$key]); $text=$langs->trans($titres[$key]); - print ''; + print ''; print '
'; print img_object("",$icons[$key]).' '.$text.'
'; //print ''; diff --git a/htdocs/core/modules/askpricesupplier/doc/index.html b/htdocs/install/doctemplates/supplier_proposal/index.html similarity index 100% rename from htdocs/core/modules/askpricesupplier/doc/index.html rename to htdocs/install/doctemplates/supplier_proposal/index.html diff --git a/htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt b/htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt similarity index 100% rename from htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt rename to htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 2241c35f00d..2c0a788e446 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -14,7 +14,7 @@ -- To make pk to be auto increment (mysql): VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT; -- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE -- To set a field as NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL; --- To set a field as default NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL; +-- To set a field as DEFAULT NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL; -- To delete orphelins: VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); -- To delete orphelins: VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); @@ -30,8 +30,8 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_typ -- Taiwan VAT Rates insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5', '0', 'VAT 5%', 1); -ALTER TABLE llx_societe_rib ADD COLUMN rum varchar(32) after default_rib; -ALTER TABLE llx_societe_rib ADD COLUMN frstrecur varchar(16) default 'FRST' after rum; +ALTER TABLE llx_societe_rib ADD COLUMN rum varchar(32) AFTER default_rib; +ALTER TABLE llx_societe_rib ADD COLUMN frstrecur varchar(16) DEFAULT 'FRST' AFTER rum; ALTER TABLE llx_cronjob ADD COLUMN entity integer DEFAULT 0; ALTER TABLE llx_cronjob MODIFY COLUMN params text NULL; @@ -45,16 +45,16 @@ create table llx_loan tms timestamp, label varchar(80) NOT NULL, fk_bank integer, - capital real default 0 NOT NULL, + capital real DEFAULT 0 NOT NULL, datestart date, dateend date, nbterm real, rate double NOT NULL, note_private text, note_public text, - capital_position real default 0, + capital_position real DEFAULT 0, date_position date, - paid smallint default 0 NOT NULL, + paid smallint DEFAULT 0 NOT NULL, accountancy_account_capital varchar(32), accountancy_account_insurance varchar(32), accountancy_account_interest varchar(32), @@ -83,10 +83,10 @@ create table llx_payment_loan )ENGINE=innodb; ALTER TABLE llx_extrafields ADD COLUMN fieldrequired integer DEFAULT 0; -ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) after fieldrequired; -ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms; +ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) AFTER fieldrequired; +ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 AFTER perms; -ALTER TABLE llx_payment_salary ADD COLUMN salary real after datev; +ALTER TABLE llx_payment_salary ADD COLUMN salary real AFTER datev; ALTER TABLE llx_payment_salary ADD INDEX idx_payment_salary_ref (num_payment); ALTER TABLE llx_payment_salary ADD INDEX idx_payment_salary_user (fk_user, entity); @@ -98,7 +98,7 @@ ALTER TABLE llx_payment_salary ADD CONSTRAINT fk_payment_salary_user FOREIGN KEY UPDATE llx_projet_task_time SET task_datehour = task_date where task_datehour IS NULL; -ALTER TABLE llx_projet_task_time ADD COLUMN task_date_withhour integer DEFAULT 0 after task_datehour; +ALTER TABLE llx_projet_task_time ADD COLUMN task_date_withhour integer DEFAULT 0 AFTER task_datehour; ALTER TABLE llx_projet_task MODIFY COLUMN duration_effective real DEFAULT 0 NULL; ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL; @@ -129,8 +129,8 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN fk_supplier_price_expressio ALTER TABLE llx_product ADD COLUMN fk_price_expression integer DEFAULT NULL; ALTER TABLE llx_product_price ADD COLUMN fk_price_expression integer DEFAULT NULL; -ALTER TABLE llx_product ADD COLUMN fifo double(24,8) after pmp; -ALTER TABLE llx_product ADD COLUMN lifo double(24,8) after fifo; +ALTER TABLE llx_product ADD COLUMN fifo double(24,8) AFTER pmp; +ALTER TABLE llx_product ADD COLUMN lifo double(24,8) AFTER fifo; --create table for user conf of printing driver @@ -148,8 +148,6 @@ CREATE TABLE llx_printing userid integer )ENGINE=innodb; -ALTER TABLE llx_product_fournisseur_price ADD COLUMN fk_price_expression integer DEFAULT NULL; - -- Add situation invoices ALTER TABLE llx_facture ADD COLUMN situation_cycle_ref smallint; ALTER TABLE llx_facture ADD COLUMN situation_counter smallint; @@ -244,7 +242,7 @@ CREATE TABLE llx_expensereport ( fk_user_cancel integer DEFAULT NULL, fk_statut integer NOT NULL, -- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé fk_c_paiement integer DEFAULT NULL, - paid smallint default 0 NOT NULL, + paid smallint DEFAULT 0 NOT NULL, note_public text, note_private text, detail_refuse varchar(255) DEFAULT NULL, @@ -330,15 +328,15 @@ ALTER TABLE llx_facture_fourn_det_extrafields ADD INDEX idx_facture_fourn_det_ex ALTER TABLE llx_facture_fourn_det ADD COLUMN special_code integer DEFAULT 0; ALTER TABLE llx_facture_fourn_det ADD COLUMN rang integer DEFAULT 0; -ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_parent_line integer NULL after fk_facture_fourn; +ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_parent_line integer NULL AFTER fk_facture_fourn; ALTER TABLE llx_commande_fournisseurdet ADD COLUMN special_code integer DEFAULT 0; ALTER TABLE llx_commande_fournisseurdet ADD COLUMN rang integer DEFAULT 0; -ALTER TABLE llx_commande_fournisseurdet ADD COLUMN fk_parent_line integer NULL after fk_commande; +ALTER TABLE llx_commande_fournisseurdet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande; ALTER TABLE llx_projet ADD COLUMN date_close datetime DEFAULT NULL; ALTER TABLE llx_projet ADD COLUMN fk_user_close integer DEFAULT NULL; -ALTER TABLE llx_projet ADD COLUMN fk_opp_status integer DEFAULT NULL after fk_statut; +ALTER TABLE llx_projet ADD COLUMN fk_opp_status integer DEFAULT NULL AFTER fk_statut; ALTER TABLE llx_projet ADD COLUMN opp_amount double(24,8) DEFAULT NULL; @@ -430,8 +428,8 @@ CREATE TABLE llx_askpricesupplierdet_extrafields ( -- End Module AskPriceSupplier -- -ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve; -ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve; +ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime AFTER date_approve; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer AFTER fk_user_approve; ALTER TABLE llx_societe ADD COLUMN fk_incoterms integer; ALTER TABLE llx_societe ADD COLUMN location_incoterms varchar(255); @@ -476,9 +474,9 @@ ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields; ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); -- Module Donation -ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL after country; +ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 AFTER country; ALTER TABLE llx_don CHANGE COLUMN fk_paiement fk_payment integer; -ALTER TABLE llx_don ADD COLUMN paid smallint default 0 NOT NULL after fk_payment; +ALTER TABLE llx_don ADD COLUMN paid smallint DEFAULT 0 NOT NULL AFTER fk_payment; ALTER TABLE llx_don CHANGE COLUMN fk_don_projet fk_projet integer NULL; ALTER TABLE llx_don CHANGE COLUMN fk_project fk_projet integer NULL; @@ -569,7 +567,7 @@ create table llx_c_price_global_variable_updater )ENGINE=innodb; ALTER TABLE llx_adherent CHANGE COLUMN note note_private text DEFAULT NULL; -ALTER TABLE llx_adherent ADD COLUMN note_public text DEFAULT NULL after note_private; +ALTER TABLE llx_adherent ADD COLUMN note_public text DEFAULT NULL AFTER note_private; CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product ( rowid integer NOT NULL auto_increment PRIMARY KEY, @@ -607,28 +605,28 @@ INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M2','square INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M3','cubic meter','m3', 1); INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('L','liter','l', 1); -alter table llx_product add fk_unit integer default NULL; +alter table llx_product add fk_unit integer DEFAULT NULL; ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -alter table llx_facturedet_rec add fk_unit integer default NULL; +alter table llx_facturedet_rec add fk_unit integer DEFAULT NULL; ALTER TABLE llx_facturedet_rec ADD CONSTRAINT fk_facturedet_rec_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -alter table llx_facturedet add fk_unit integer default NULL; +alter table llx_facturedet add fk_unit integer DEFAULT NULL; ALTER TABLE llx_facturedet ADD CONSTRAINT fk_facturedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -alter table llx_propaldet add fk_unit integer default NULL; +alter table llx_propaldet add fk_unit integer DEFAULT NULL; ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -alter table llx_commandedet add fk_unit integer default NULL; +alter table llx_commandedet add fk_unit integer DEFAULT NULL; ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -alter table llx_contratdet add fk_unit integer default NULL; +alter table llx_contratdet add fk_unit integer DEFAULT NULL; ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -alter table llx_commande_fournisseurdet add fk_unit integer default NULL; +alter table llx_commande_fournisseurdet add fk_unit integer DEFAULT NULL; ALTER TABLE llx_commande_fournisseurdet ADD CONSTRAINT fk_commande_fournisseurdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -alter table llx_facture_fourn_det add fk_unit integer default NULL; +alter table llx_facture_fourn_det add fk_unit integer DEFAULT NULL; ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index 1f34377e6ec..2cf877acbbc 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -23,6 +23,12 @@ ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 after country; +ALTER TABLE llx_askpricesupplier RENAME TO llx_supplier_proposal; +ALTER TABLE llx_askpricesupplierdet RENAME TO llx_supplier_proposaldet; +ALTER TABLE llx_askpricesupplier_extrafields RENAME TO llx_supplier_proposal_extrafields; +ALTER TABLE llx_askpricesupplierdet_extrafields RENAME TO llx_supplier_proposaldet_extrafields; +ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_asksupplierprice fk_supplier_proposal integer NOT NULL; + -- Fix bad data update llx_opensurvey_sondage set format = 'D' where format = 'D+'; update llx_opensurvey_sondage set format = 'A' where format = 'A+'; @@ -32,6 +38,8 @@ INSERT INTO llx_const (name, value, type, note, visible) values ('MAIN_SIZE_SHOR ALTER TABLE llx_accounting_system MODIFY COLUMN pcg_version varchar(32); ALTER TABLE llx_accountingaccount MODIFY COLUMN fk_pcg_version varchar(32); +ALTER TABLE llx_accountingaccount RENAME TO llx_accounting_account; +ALTER TABLE llx_accounting_account ADD INDEX idx_accounting_account_account_number (account_number); UPDATE llx_const SET name = __ENCRYPT('ACCOUNTING_EXPORT_PREFIX_SPEC')__ WHERE __DECRYPT('name')__ = 'EXPORT_PREFIX_SPEC'; @@ -40,8 +48,6 @@ UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'b UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'amarok'; UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'cameleo'; -ALTER TABLE llx_accountingaccount RENAME TO llx_accounting_account; - ALTER TABLE llx_societe ADD COLUMN model_pdf varchar(255); ALTER TABLE llx_societe_commerciaux ADD COLUMN import_key varchar(14) AFTER fk_user; @@ -65,6 +71,7 @@ ALTER TABLE llx_paiement ADD COLUMN ref varchar(30) NOT NULL DEFAULT '' AFTER ro ALTER TABLE llx_socpeople ADD COLUMN photo varchar(255) AFTER skype; +ALTER TABLE llx_user_param MODIFY COLUMN param varchar(255) NOT NULL DEFAULT ''; ALTER TABLE llx_user_param MODIFY COLUMN value text NOT NULL DEFAULT ''; ALTER TABLE llx_expedition ADD COLUMN import_key varchar(14); @@ -110,7 +117,8 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity); ALTER TABLE llx_product ADD COLUMN onportal smallint DEFAULT 0 AFTER tobuy; -ALTER TABLE llx_user ADD COLUMN employee smallint DEFAULT 1; +ALTER TABLE llx_user ADD COLUMN employee smallint DEFAULT 1 AFTER ref_int; +ALTER TABLE llx_user ADD COLUMN fk_establishment integer DEFAULT 0 AFTER employee; CREATE TABLE IF NOT EXISTS llx_c_hrm_function @@ -226,7 +234,7 @@ create table llx_budget_lines ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_budget integer NOT NULL, - fk_project integer NOT NULL, + fk_project_ids varchar(255) NOT NULL, -- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come". amount double(24,8) NOT NULL, datec datetime, tms timestamp, @@ -235,13 +243,12 @@ create table llx_budget_lines import_key integer )ENGINE=innodb; -ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project); +ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project_ids); -- Supprime orphelins pour permettre montee de la cle -- MYSQL V4 DELETE llx_budget_lines FROM llx_budget_lines LEFT JOIN llx_budget ON llx_budget.rowid = llx_budget_lines.fk_budget WHERE llx_budget_lines.rowid IS NULL; -- POSTGRESQL V8 DELETE FROM llx_budget_lines USING llx_budget WHERE llx_budget_lines.fk_budget NOT IN (SELECT llx_budget.rowid FROM llx_budget); -ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_project); ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (fk_budget) REFERENCES llx_budget (rowid); @@ -287,3 +294,25 @@ CREATE TABLE llx_opensurvey_user_formanswers ( ) ENGINE=InnoDB; + + +create table llx_categorie_project +( + fk_categorie integer NOT NULL, + fk_project integer NOT NULL, + import_key varchar(14) +)ENGINE=innodb; + +ALTER TABLE llx_categorie_project ADD PRIMARY KEY pk_categorie_project (fk_categorie, fk_project); +ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_categorie (fk_categorie); +ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_project (fk_project); + +ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); +ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project FOREIGN KEY (fk_project) REFERENCES llx_projet (rowid); + + +ALTER TABLE llx_c_tva ADD COLUMN code varchar(10) DEFAULT '' after fk_pays; +DROP INDEX uk_c_tva_id ON llx_c_tva; +ALTER TABLE llx_c_tva ADD UNIQUE INDEX uk_c_tva_id (fk_pays, code, taux, recuperableonly); + + diff --git a/htdocs/install/mysql/tables/llx_accounting_account.key.sql b/htdocs/install/mysql/tables/llx_accounting_account.key.sql index 7a38b7dd013..db08831570d 100644 --- a/htdocs/install/mysql/tables/llx_accounting_account.key.sql +++ b/htdocs/install/mysql/tables/llx_accounting_account.key.sql @@ -19,6 +19,7 @@ ALTER TABLE llx_accounting_account ADD INDEX idx_accounting_account_fk_pcg_version (fk_pcg_version); +ALTER TABLE llx_accounting_account ADD INDEX idx_accounting_account_account_number (account_number); ALTER TABLE llx_accounting_account ADD CONSTRAINT fk_accounting_account_fk_pcg_version FOREIGN KEY (fk_pcg_version) REFERENCES llx_accounting_system (pcg_version); diff --git a/htdocs/install/mysql/tables/llx_budget.sql b/htdocs/install/mysql/tables/llx_budget.sql index aeb60cd1ce5..908bfc1337c 100644 --- a/htdocs/install/mysql/tables/llx_budget.sql +++ b/htdocs/install/mysql/tables/llx_budget.sql @@ -20,7 +20,7 @@ create table llx_budget ( rowid integer AUTO_INCREMENT PRIMARY KEY, entity integer NOT NULL DEFAULT 1, - label varchar(255) NOT NULL, + label varchar(255) NOT NULL, -- For example 'Global budget for year' or 'Budget for each project' status integer, note text, date_start date, diff --git a/htdocs/install/mysql/tables/llx_budget_lines.key.sql b/htdocs/install/mysql/tables/llx_budget_lines.key.sql index 9a9771570b1..b31e74b324d 100644 --- a/htdocs/install/mysql/tables/llx_budget_lines.key.sql +++ b/htdocs/install/mysql/tables/llx_budget_lines.key.sql @@ -17,11 +17,10 @@ -- =================================================================== -ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project); +ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project_ids); -- Supprime orphelins pour permettre montee de la cle -- MYSQL V4 DELETE llx_budget_lines FROM llx_budget_lines LEFT JOIN llx_budget ON llx_budget.rowid = llx_budget_lines.fk_budget WHERE llx_budget_lines.rowid IS NULL; -- POSTGRESQL V8 DELETE FROM llx_budget_lines USING llx_budget WHERE llx_budget_lines.fk_budget NOT IN (SELECT llx_budget.rowid FROM llx_budget); -ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_project); ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (fk_budget) REFERENCES llx_budget (rowid); diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql index c5d3d3a4bf2..aba5c7f53ee 100644 --- a/htdocs/install/mysql/tables/llx_budget_lines.sql +++ b/htdocs/install/mysql/tables/llx_budget_lines.sql @@ -18,13 +18,13 @@ create table llx_budget_lines ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_budget integer NOT NULL, - fk_project integer NOT NULL, - amount double(24,8) NOT NULL, - datec datetime, - tms timestamp, - fk_user_creat integer, - fk_user_modif integer, - import_key integer + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_budget integer NOT NULL, + fk_project_ids varchar(255) NOT NULL, -- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come". 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects. + amount double(24,8) NOT NULL, + datec datetime, + tms timestamp, + fk_user_creat integer, + fk_user_modif integer, + import_key integer )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_c_tva.key.sql b/htdocs/install/mysql/tables/llx_c_tva.key.sql index e1ea6d37dab..7911284fdb1 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.key.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.key.sql @@ -1,5 +1,5 @@ -- ======================================================================== --- Copyright (C) 2014 Laurent Destailleur +-- Copyright (C) 2014-2015 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -16,4 +16,6 @@ -- -- ======================================================================== -ALTER TABLE llx_c_tva ADD UNIQUE INDEX uk_c_tva_id (fk_pays, taux, recuperableonly); +ALTER TABLE llx_c_tva ADD UNIQUE INDEX uk_c_tva_id (fk_pays, code, taux, recuperableonly); + +-- ALTER TABLE llx_c_tva ADD UNIQUE INDEX uk_c_tva_id (fk_pays, code, recuperableonly); -- Not yet possible for compatibility reason, where old code is '' diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index dec81d43ed3..91e141ad4d1 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -22,6 +22,7 @@ create table llx_c_tva ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, fk_pays integer NOT NULL, + code varchar(10) DEFAULT '', -- a key to describe vat entry, for example FR20 taux double NOT NULL, localtax1 varchar(20) NOT NULL DEFAULT '0', localtax1_type varchar(10) NOT NULL DEFAULT '0', diff --git a/htdocs/install/mysql/tables/llx_categorie_project.key.sql b/htdocs/install/mysql/tables/llx_categorie_project.key.sql new file mode 100644 index 00000000000..f92e86ff6e9 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_categorie_project.key.sql @@ -0,0 +1,24 @@ +-- ============================================================================ +-- Copyright (C) 2007 Patrick Raguin +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +ALTER TABLE llx_categorie_project ADD PRIMARY KEY pk_categorie_project (fk_categorie, fk_project); +ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_categorie (fk_categorie); +ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_project (fk_project); + +ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); +ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project_rowid FOREIGN KEY (fk_project) REFERENCES llx_projet (rowid); diff --git a/htdocs/install/mysql/tables/llx_categorie_project.sql b/htdocs/install/mysql/tables/llx_categorie_project.sql new file mode 100644 index 00000000000..ca536822ac2 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_categorie_project.sql @@ -0,0 +1,25 @@ +-- ============================================================================ +-- Copyright (C) 2007 Patrick Raguin +-- Copyright (C) 2012 Juanjo Menent +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +create table llx_categorie_project +( + fk_categorie integer NOT NULL, + fk_project integer NOT NULL, + import_key varchar(14) +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql index 16e8a624e72..b728702db79 100644 --- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql +++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql @@ -29,5 +29,5 @@ CREATE TABLE llx_opensurvey_sondage ( allow_comments tinyint NOT NULL DEFAULT 1, allow_spy tinyint NOT NULL DEFAULT 1, tms TIMESTAMP, - sujet TEXT, -- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions + sujet TEXT -- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions ) ENGINE=InnoDB; diff --git a/htdocs/install/mysql/tables/llx_askpricesupplier.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql similarity index 98% rename from htdocs/install/mysql/tables/llx_askpricesupplier.sql rename to htdocs/install/mysql/tables/llx_supplier_proposal.sql index ff62595bd0b..ef307b85c9f 100644 --- a/htdocs/install/mysql/tables/llx_askpricesupplier.sql +++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql @@ -15,7 +15,7 @@ -- along with this program. If not, see . -- ======================================================================== -CREATE TABLE llx_askpricesupplier ( +CREATE TABLE llx_supplier_proposal ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, ref varchar(30) NOT NULL, entity integer NOT NULL DEFAULT '1', diff --git a/htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql similarity index 95% rename from htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql rename to htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql index 4552b4d0079..fdd12cbf317 100644 --- a/htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql @@ -15,7 +15,7 @@ -- along with this program. If not, see . -- ======================================================================== -CREATE TABLE llx_askpricesupplier_extrafields ( +CREATE TABLE llx_supplier_proposal_extrafields ( rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, fk_object integer NOT NULL, diff --git a/htdocs/install/mysql/tables/llx_askpricesupplierdet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql similarity index 95% rename from htdocs/install/mysql/tables/llx_askpricesupplierdet.sql rename to htdocs/install/mysql/tables/llx_supplier_proposaldet.sql index 5755fdcb83f..81b6f2ef2cc 100644 --- a/htdocs/install/mysql/tables/llx_askpricesupplierdet.sql +++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql @@ -15,9 +15,9 @@ -- along with this program. If not, see . -- ======================================================================== -CREATE TABLE llx_askpricesupplierdet ( +CREATE TABLE llx_supplier_proposaldet ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, - fk_askpricesupplier integer NOT NULL, + fk_supplier_proposal integer NOT NULL, fk_parent_line integer DEFAULT NULL, fk_product integer DEFAULT NULL, label varchar(255) DEFAULT NULL, diff --git a/htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql similarity index 95% rename from htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql rename to htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql index 7bfab6e408c..7bf951225b8 100644 --- a/htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql @@ -15,7 +15,7 @@ -- along with this program. If not, see . -- ======================================================================== -CREATE TABLE llx_askpricesupplierdet_extrafields ( +CREATE TABLE llx_supplier_proposaldet_extrafields ( rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, fk_object integer NOT NULL, diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index e1fc421c911..7263803feb6 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -27,6 +27,7 @@ create table llx_user ref_int varchar(50), -- reference into an internal system (deprecated) employee tinyint DEFAULT 1, -- 1 if user is an employee + fk_establishment integer DEFAULT 0, datec datetime, tms timestamp, diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 7194d73b4c4..67bce42645a 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -22,7 +22,7 @@ create table llx_user_param ( fk_user integer NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id - param varchar(64) NOT NULL, + param varchar(255) NOT NULL, value text NOT NULL )ENGINE=innodb; @@ -32,4 +32,4 @@ create table llx_user_param -- 1 : first company param -- 2 : second company param -- 3 : etc... --- \ No newline at end of file +-- diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 6cd2f14954d..1902385df15 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات ا FreeLegalTextOnProposal=نص تجارية حرة على مقترحات WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=أوامر إدارة الإعداد OrdersNumberingModules=أوامر الترقيم نمائط diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index 9a77b5900fa..665bbde9461 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=سعر الوحدة (صافي) UnitPriceTTC=سعر الوحدة PriceU=ارتفاع PriceUHT=ارتفاع (صافي) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=مبلغ AmountInvoice=مبلغ الفاتورة diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang index 92f6ed52491..a9f6eab62fa 100644 --- a/htdocs/langs/ar_SA/other.lang +++ b/htdocs/langs/ar_SA/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=هذا هو البريد الاختبار (الا PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ar_SA/printipp.lang b/htdocs/langs/ar_SA/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/ar_SA/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 76d8d382427..39ee84bcef7 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Линия на продукт / услуга с ну FreeLegalTextOnProposal=Свободен текст на търговски предложения WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Настройки за управление на поръчки OrdersNumberingModules=Поръчки номериране модули diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index 91eabdab90b..851ad25c81d 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Единична цена (нето) UnitPriceTTC=Единична цена PriceU=U.P. PriceUHT=U.P. (нето) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (с данък) Amount=Сума AmountInvoice=Фактурирана стойност diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang index 623efc8863c..1c8187eee15 100644 --- a/htdocs/langs/bg_BG/other.lang +++ b/htdocs/langs/bg_BG/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Това е тестов имейл (думата PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/bg_BG/printipp.lang b/htdocs/langs/bg_BG/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/bg_BG/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/bn_BD/admin.lang +++ b/htdocs/langs/bn_BD/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang index 49c2c3eec37..3eec2987d41 100644 --- a/htdocs/langs/bn_BD/main.lang +++ b/htdocs/langs/bn_BD/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/bn_BD/other.lang +++ b/htdocs/langs/bn_BD/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 4baddc5f3df..dfcc2e5ef4e 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang index 79ef94ddc7f..a2b0d33d19b 100644 --- a/htdocs/langs/bs_BA/main.lang +++ b/htdocs/langs/bs_BA/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/bs_BA/printipp.lang b/htdocs/langs/bs_BA/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/bs_BA/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index e25f1a04234..722d5459945 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nu FreeLegalTextOnProposal=Text lliure en pressupostos WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Configuració del mòdul Sol·licituds a proveïdor -AskPriceSupplierNumberingModules=Mòdels de numeració de solicitut de preus a proveïdor -AskPriceSupplierPDFModules=Mòdels de docuements de solicituts de preus de proveïdors -FreeLegalTextOnAskPriceSupplier=Text lliure en sol·licituds de preus a proveïdors -WatermarkOnDraftAskPriceSupplier=Marca d'aigua en sol·licituds de preus a proveïdors (en cas de estar buit) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Preguntar per compte bancari per utilitzar en el pressupost +##### SupplierProposal ##### +SupplierProposalSetup=Configuració del mòdul Sol·licituds a proveïdor +SupplierProposalNumberingModules=Mòdels de numeració de solicitut de preus a proveïdor +SupplierProposalPDFModules=Mòdels de docuements de solicituts de preus de proveïdors +FreeLegalTextOnSupplierProposal=Text lliure en sol·licituds de preus a proveïdors +WatermarkOnDraftSupplierProposal=Marca d'aigua en sol·licituds de preus a proveïdors (en cas de estar buit) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar per compte bancari per utilitzar en el pressupost ##### Orders ##### OrdersSetup=Configuració del mòdul comandes OrdersNumberingModules=Mòduls de numeració de les comandes diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 42189ae338e..7cf3c051c7f 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Preu base UnitPriceTTC=Preu unitari total PriceU=P.U. PriceUHT=P.U. -AskPriceSupplierUHT=Preu Unitari sol·licitat +SupplierProposalUHT=Preu Unitari sol·licitat PriceUTTC=Preu unitari (IVA inclòs) Amount=Import AmountInvoice=Import factura diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index c5b54076c73..417ec04e748 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Això és un e-mail de prova (la paraula prova ha PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLi adjuntem la factura __FACREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nVolem recordar-li que la seva factura __FACREF__ sembla estar pendent de pagament. Li adjuntem la factura en cuestio, com a recordatori.\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLi adjuntem el pressupost __PROPREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nLi adjuntem la sol·licitud de preus __ASKREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nLi adjuntem la sol·licitud de preus __ASKREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLi adjuntem la comanda __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLi adjuntem la nostre comanda __ORDERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLi adjuntem la factura __FACREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__ diff --git a/htdocs/langs/ca_ES/printipp.lang b/htdocs/langs/ca_ES/printipp.lang deleted file mode 100644 index 1ea5fce8f89..00000000000 --- a/htdocs/langs/ca_ES/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configuració del mòdul Impressió Directe -PrintIPPDesc=Aquest mòdul afegeix un boto per enviar documents directament a una impressora. Es necessari un SO Linux amb CUPS instal·lat. -PRINTIPP_ENABLED=Mostrar icona "Impressió directe" en els llistats de documents -PRINTIPP_HOST=Servidor d'impressió -PRINTIPP_PORT=Port -PRINTIPP_USER=Usuari -PRINTIPP_PASSWORD=Contrasenya -NoPrinterFound=No es pot trobar impressores (Comprovi la configuració del CUPS) -FileWasSentToPrinter=L'arxiu %s ha sigut enviat a l'impressora -NoDefaultPrinterDefined=No hi han impressores definides per defecte -DefaultPrinter=Impresores per defecte -Printer=Impressora -CupsServer=Servidor CUPS diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index 5cf105fb8a7..18bedef7be7 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Řada výrobků / služeb s nulové hodnoty je považo FreeLegalTextOnProposal=Volný text o obchodních návrhů WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zeptejte se na umístění bankovního účtu nabídky -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Cena požaduje nastavení dodavatelé modul -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Volný text na žádosti o cenový dodavatele -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Zeptejte se na bankovní účet destinaci nabídce ceny +##### SupplierProposal ##### +SupplierProposalSetup=Cena požaduje nastavení dodavatelé modul +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Volný text na žádosti o cenový dodavatele +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zeptejte se na bankovní účet destinaci nabídce ceny ##### Orders ##### OrdersSetup=Objednat řízení nastavení OrdersNumberingModules=Objednávky číslování modelů diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang index c9d2cefaf74..abc1a051888 100644 --- a/htdocs/langs/cs_CZ/main.lang +++ b/htdocs/langs/cs_CZ/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Jednotková cena (bez DPH) UnitPriceTTC=Jednotková cena PriceU=UP PriceUHT=UP (bez DPH) -AskPriceSupplierUHT=U.P. net Požadováno +SupplierProposalUHT=U.P. net Požadováno PriceUTTC=U.P. (inc. tax) Amount=Množství AmountInvoice=Fakturovaná částka diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang index 5f14fd018c2..9b7775943c6 100644 --- a/htdocs/langs/cs_CZ/other.lang +++ b/htdocs/langs/cs_CZ/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Toto je testovací mail (slovo testovací musí b PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nNajdete zde fakturu __FACREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nDovolujeme si vás upozornit, že faktura __FACREF__ pravděpodobně nebyla uhrazena. Jako upomínku vám ji v příloze zasíláme znovu.\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nNajdete zde obchodní návrh __PROPREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nNajdete zde cenový požadavek __ASKREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nNajdete zde cenový požadavek __ASKREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nNajdete zde objednávku __ORDERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nNajdete zde naši objednávku __ORDERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nNajdete zde fakturu __FACREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__ diff --git a/htdocs/langs/cs_CZ/printipp.lang b/htdocs/langs/cs_CZ/printipp.lang deleted file mode 100644 index 9aaa2aade01..00000000000 --- a/htdocs/langs/cs_CZ/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Nastavení tiskového modulu Direct -PrintIPPDesc=Tento modul přidá tlačítko Tisk pro odeslání dokumentu přímo na tiskárnu. To vyžaduje systém Linux s nainstalovaným CUPS. -PRINTIPP_ENABLED=Zobrazit ikonu "Přímý tisk" v seznamech dokumentů -PRINTIPP_HOST=Tiskový server -PRINTIPP_PORT=Port -PRINTIPP_USER=Přihlášení -PRINTIPP_PASSWORD=Heslo -NoPrinterFound=Nebyly nalezeny žádné tiskárny (zkontrolujte nastavení CUPS) -FileWasSentToPrinter=Soubor %s byl poslán na tiskárnu -NoDefaultPrinterDefined=Není definována žádná výchozí tiskárna -DefaultPrinter=Výchozí tiskárna -Printer=Tiskárna -CupsServer=CUPS server diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 98ad0003d8a..632ec24991f 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=En linje af produkt / service med et nul beløb anses FreeLegalTextOnProposal=Fri tekst på kommercielle forslag WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Ordrer «forvaltning setup OrdersNumberingModules=Ordrer nummerressourcer moduler diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index e4f41d0d580..c0914268760 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Enhedspris (netto) UnitPriceTTC=Enhedspris PriceU=UP PriceUHT=UP (netto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Mængde AmountInvoice=Fakturabeløbet diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang index 9b12e35bd06..901d8e46210 100644 --- a/htdocs/langs/da_DK/other.lang +++ b/htdocs/langs/da_DK/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en test mail (ordet test skal være i fed PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/da_DK/printipp.lang b/htdocs/langs/da_DK/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/da_DK/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index bccd449a822..aba90142895 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Produkt-/Servicezeilen mit Nullmenge zulässig FreeLegalTextOnProposal=Freier Rechtstext für Angebote WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Lieferanten Preisauskunft Moduleinstellungen -AskPriceSupplierNumberingModules=Nummerierungsmodul Preisanfragen Lieferanten -AskPriceSupplierPDFModules=Lieferanten Preisauskunft Dokumentvorlagen -FreeLegalTextOnAskPriceSupplier=Freier Text auf Preisauskunft Lieferanten -WatermarkOnDraftAskPriceSupplier=Wasserzeichen auf Lieferanten-Preisauskunft Entwurf (keines, wenn leer) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fragen Sie nach Bankkonto Bestimmungsort von der Preisauskunft +##### SupplierProposal ##### +SupplierProposalSetup=Lieferanten Preisauskunft Moduleinstellungen +SupplierProposalNumberingModules=Nummerierungsmodul Preisanfragen Lieferanten +SupplierProposalPDFModules=Lieferanten Preisauskunft Dokumentvorlagen +FreeLegalTextOnSupplierProposal=Freier Text auf Preisauskunft Lieferanten +WatermarkOnDraftSupplierProposal=Wasserzeichen auf Lieferanten-Preisauskunft Entwurf (keines, wenn leer) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fragen Sie nach Bankkonto Bestimmungsort von der Preisauskunft ##### Orders ##### OrdersSetup=Bestellverwaltungseinstellungen OrdersNumberingModules=Bestellnumerierungs-Module diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index 30273d93dcf..a91757f22eb 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Stückpreis (netto) UnitPriceTTC=Stückpreis (brutto) PriceU=VP PriceUHT=VP (netto) -AskPriceSupplierUHT=Nettopreis anfordern +SupplierProposalUHT=Nettopreis anfordern PriceUTTC=E.P. (inkl. Steuern) Amount=Betrag AmountInvoice=Rechnungsbetrag diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang index 862b2865246..9179816826b 100644 --- a/htdocs/langs/de_DE/other.lang +++ b/htdocs/langs/de_DE/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dies ist ein (HTML)-Test Mail (das Wort Test muss PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang.\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ diff --git a/htdocs/langs/de_DE/printipp.lang b/htdocs/langs/de_DE/printipp.lang deleted file mode 100644 index b2e884cbfdb..00000000000 --- a/htdocs/langs/de_DE/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Einstellungen des DirektDruck-Moduls -PrintIPPDesc=Dieses Modul fügt einen "Drucken"-Button zu, um Dokumente direkt zu einen Drucker zu senden. Dies erfordert ein Linux-System mit installiertem CUPS. -PRINTIPP_ENABLED="Direktdruck"-Symbol in Dokumentlisten anzeigen -PRINTIPP_HOST=Druckserver -PRINTIPP_PORT=Port -PRINTIPP_USER=Benutzername -PRINTIPP_PASSWORD=Passwort -NoPrinterFound=Keine Drucker gefunden (CUPS-Konfiguration prüfen) -FileWasSentToPrinter=Datei %s zum Drucker gesandt -NoDefaultPrinterDefined=Kein Standarddrucker defininert -DefaultPrinter=Standarddrucker -Printer=Drucker -CupsServer=CUPS-Server diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 30d21a7e88c..dd25dfd6fb9 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index f722e34f853..7f80378a780 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α) UnitPriceTTC=Τιμή Μονάδος PriceU=Τιμή μον. PriceUHT=Τιμή μον. -AskPriceSupplierUHT=Αιτήματα για τιμές μονάδας +SupplierProposalUHT=Αιτήματα για τιμές μονάδας PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.) Amount=Ποσό AmountInvoice=Ποσό Τιμολογίου diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang index b1723bf35f7..104ff52e1a7 100644 --- a/htdocs/langs/el_GR/other.lang +++ b/htdocs/langs/el_GR/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα δοκιμής PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nΘα ήθελα να σας προειδοποιήσω ότι το τιμολόγιο __FACREF__ φαίνεται να μην έχει πληρωθεί. Στο συνημμένο βρίσκεται το τιμολόγιο που φαίνεται να μην έχει πληρωθεί.\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το αίτημα των τιμών __ASKREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το αίτημα των τιμών __ASKREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ diff --git a/htdocs/langs/el_GR/printipp.lang b/htdocs/langs/el_GR/printipp.lang deleted file mode 100644 index 04a8bfda5b9..00000000000 --- a/htdocs/langs/el_GR/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Ρύθμιση του module Άμεση Εκτύπωση -PrintIPPDesc=Το module αυτό προσθέτει ένα κουμπί Εκτύπωσης για να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή. Απαιτεί ένα σύστημα Linux με εγκατεστημένο CUPS. -PRINTIPP_ENABLED=Εμφάνιση εικονιδίου "Απευθείας εκτύπωση" στις λίστες εγγράφων -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Σύνδεση -PRINTIPP_PASSWORD=Κωδικός -NoPrinterFound=Δεν βρέθηκαν εκτυπωτές (ελέγξτε τη ρύθμιση του CUPS) -FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή -NoDefaultPrinterDefined=Δεν έχει οριστεί προεπιλεγμένος εκτυπωτής -DefaultPrinter=Προεπιλογμένος εκτυπωτής -Printer=Εκτυπωτής -CupsServer=CUPS Server diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 8f8428b3c75..f4d311c8f27 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -333,7 +333,7 @@ UMaskExplanation=This parameter allow you to define permissions set by default o SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache) DisableLinkToHelpCenter=Hide link "Need help or support" on login page -DisableLinkToHelp=Hide link "%s Online help" on left menu +DisableLinkToHelp=Hide link to online help "%s" AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. ModuleDisabled=Module disabled ModuleDisabledSoNoEvent=Module disabled so event never created @@ -846,14 +846,12 @@ VATIsUsedExampleFR=In France, it means companies or organisations having a real VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. ##### Local Taxes ##### LTRate=Rate -LocalTax1IsUsed=Use second tax LocalTax1IsNotUsed=Do not use second tax LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) LocalTax1Management=Second type of tax LocalTax1IsUsedExample= LocalTax1IsNotUsedExample= -LocalTax2IsUsed=Use third tax LocalTax2IsNotUsed=Do not use third tax LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) @@ -1208,13 +1206,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order ##### Orders ##### OrdersSetup=Order management setup diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 3e93a48d7b5..297556d6533 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -89,8 +89,10 @@ VATIsNotUsed=VAT is not used CopyAddressFromSoc=Fill address with thirdparty address NoEmailDefined=There is no email defined ##### Local Taxes ##### +LocalTax1IsUsed=Use second tax LocalTax1IsUsedES= RE is used LocalTax1IsNotUsedES= RE is not used +LocalTax2IsUsed=Use third tax LocalTax2IsUsedES= IRPF is used LocalTax2IsNotUsedES= IRPF is not used LocalTax1ES=RE diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 20c0a144121..c7cbb6d0a9b 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -83,12 +83,18 @@ DatePayment=Payment date DateStartPeriod=Date start period DateEndPeriod=Date end period NewVATPayment=New VAT payment -newLT2PaymentES=New IRPF payment +newLT1Payment=New tax 2 payment +newLT2Payment=New tax 3 payment +LT1Payment=Tax 2 payment +LT1Payments=Tax 2 payments +LT2Payment=Tax 3 payment +LT2Payments=Tax 3 payments newLT1PaymentES=New RE payment -LT2PaymentES=IRPF Payment -LT2PaymentsES=IRPF Payments +newLT2PaymentES=New IRPF payment LT1PaymentES=RE Payment LT1PaymentsES=RE Payments +LT2PaymentES=IRPF Payment +LT2PaymentsES=IRPF Payments VATPayment=VAT Payment VATPayments=VAT Payments VATRefund=VAT Refund diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 796c14af15e..070bc5c3d56 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -59,6 +59,7 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. +NotAuthorized=You are not authorized to do that. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s @@ -305,7 +306,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang index 4567af2a0b6..b902ff27098 100644 --- a/htdocs/langs/en_US/oauth.lang +++ b/htdocs/langs/en_US/oauth.lang @@ -1,9 +1,12 @@ # Dolibarr language file - Source file is en_US - oauth ConfigOAuth=Oauth Configuration -NoAccessToken=No token access saved. -HasAccessToken=A token was generated and saved into database +NoAccessToken=No access token saved into local database +HasAccessToken=A token was generated and saved into local database NewTokenStored=Token received ans saved +ToCheckDeleteTokenOnProvider=To check/delete authorization saved by %s OAuth provider TokenDeleted=Token deleted +RequestAccess=Click here to request/renew access and receive a new token to save +DeleteAccess=Click here to delete token UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider: ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules than need OAuth2 authentication. OAUTH_AMAZON_NAME=Api Amazon diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 287a83afba3..3f635ad85b3 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -70,6 +70,7 @@ ValidateOrder=Validate order UnvalidateOrder=Unvalidate order DeleteOrder=Delete order CancelOrder=Cancel order +OrderReopened= Order %s Reopened AddOrder=Create order AddToMyOrders=Add to my orders AddToOtherOrders=Add to other orders diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 83cb5c7e428..1ff53d36797 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ @@ -121,20 +121,20 @@ LengthUnitdm=dm LengthUnitcm=cm LengthUnitmm=mm Surface=Area -SurfaceUnitm2=m2 -SurfaceUnitdm2=dm2 -SurfaceUnitcm2=cm2 -SurfaceUnitmm2=mm2 -SurfaceUnitfoot2=ft2 -SurfaceUnitinch2=in2 +SurfaceUnitm2=m² +SurfaceUnitdm2=dm² +SurfaceUnitcm2=cm² +SurfaceUnitmm2=mm² +SurfaceUnitfoot2=ft² +SurfaceUnitinch2=in² Volume=Volume TotalVolume=Total volume -VolumeUnitm3=m3 -VolumeUnitdm3=dm3 -VolumeUnitcm3=cm3 -VolumeUnitmm3=mm3 -VolumeUnitfoot3=ft3 -VolumeUnitinch3=in3 +VolumeUnitm3=m³ +VolumeUnitdm3=dm³ (L) +VolumeUnitcm3=cm³ (ml) +VolumeUnitmm3=mm³ (µl) +VolumeUnitfoot3=ft³ +VolumeUnitinch3=in³ VolumeUnitounce=ounce VolumeUnitlitre=litre VolumeUnitgallon=gallon diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang index ab70ca671d7..427b4973e80 100644 --- a/htdocs/langs/en_US/printing.lang +++ b/htdocs/langs/en_US/printing.lang @@ -18,15 +18,13 @@ TestDriver=Test TargetedPrinter=Targeted printer UserConf=Setup per user PRINTGCP=Google Cloud Print -PRINTGCP_INFO=Google Api State +PRINTGCP_INFO=Google OAuth API setup PRINTGCP_AUTHLINK=Authentication PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token PRINTGCP_TOKEN_REFRESH=Token Refresh Present PRINTGCP_TOKEN_EXPIRED=Token Expired PRINTGCP_TOKEN_EXPIRE_AT=Token expire at PRINTGCP_DELETE_TOKEN=Delete saved token -RequestAccess=Click here to request access and receive a token to save -DeleteAccess=Click here to delete token PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. PrintTestDescprintgcp=List of Printers for Google Cloud Print. diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 4ed6ccfc2f5..505f6bce8e5 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -176,6 +176,7 @@ ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status ProjectsStatistics=Statistics on projects/leads TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible. IdTaskTime=Id task time +YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. OpenedProjectsByThirdparties=Opened projects by thirdparties OpportunityTotalAmount=Opportunities total amount OpportunityPonderatedAmount=Opportunities weighted amount diff --git a/htdocs/langs/en_US/askpricesupplier.lang b/htdocs/langs/en_US/supplier_proposal.lang similarity index 64% rename from htdocs/langs/en_US/askpricesupplier.lang rename to htdocs/langs/en_US/supplier_proposal.lang index 0cf337b96e6..b0e2887feb0 100644 --- a/htdocs/langs/en_US/askpricesupplier.lang +++ b/htdocs/langs/en_US/supplier_proposal.lang @@ -1,25 +1,25 @@ -# Dolibarr language file - Source file is en_US - askpricesupplier -AskPriceSupplier=Supplier commercial proposals -askpricesupplierDESC=Manage price requests to suppliers -askpricesupplierMENU_LEFT_TITLE=Price request supplier -askpricesupplierMENU_LEFT_TITLE_NEW=New request -askpricesupplierMENU_LEFT_TITLE_LIST=List +# Dolibarr language file - Source file is en_US - supplier_proposal +SupplierProposal=Supplier commercial proposals +supplier_proposalDESC=Manage price requests to suppliers +supplier_proposalMENU_LEFT_TITLE=Supplier proposals +supplier_proposalMENU_LEFT_TITLE_NEW=New request +supplier_proposalMENU_LEFT_TITLE_LIST=List CommRequest=Price request CommRequests=Price requests SearchRequest=Find a request DraftRequests=Draft requests LastModifiedRequests=Last %s modified price requests RequestsOpened=Open price requests -AskPriceSupplierArea=Area price requests suppliers -Askpricesupplier=Price request supplier +SupplierProposalArea=Supplier proposals area +Askpricesupplier=Supplier proposals NewAskPrice=New price request NewAsk=New request ShowAskpricesupplier=Show price request -AddAskPriceSupplier=Create a price request -AskPriceSupplierRefFourn=Supplier ref -AskPriceSupplierDate=Delivery date -AskPriceSupplierRefFournNotice=Before closing to "Accepted", think to grasp suppliers references. -RelatedAskPriceSupplier=Related price requests suppliers +AddSupplierProposal=Create a price request +SupplierProposalRefFourn=Supplier ref +SupplierProposalDate=Delivery date +SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references. +RelatedSupplierProposal=Related price requests suppliers ConfirmValidateAsk=Are you sure you want to validate this price request under name %s ? DateAsk=Date of request DeleteAsk=Delete request @@ -48,12 +48,12 @@ ConfirmCloneAsk=Are you sure you want to clone the price request %s ? ConfirmReOpenAsk=Are you sure you want to open back the price request %s ? SendAskByMail=Send price request by mail SendAskRef=Sending the price request %s -AskPriceSupplierCard=Request card +SupplierProposalCard=Request card ConfirmDeleteAsk=Are you sure you want to delete this price request ? -ActionsOnAskPriceSupplier=Events on price request +ActionsOnSupplierProposal=Events on price request DocModelAuroreDescription=A complete request model (logo...) CommercialAsk=Price request -DefaultModelAskPriceSupplierCreate=Default model creation -DefaultModelAskPriceSupplierToBill=Default template when closing a price request (accepted) -DefaultModelAskPriceSupplierClosed=Default template when closing a price request (refused) -ListOfAskPriceSupplier=Liste des demandes de prix fournisseurs +DefaultModelSupplierProposalCreate=Default model creation +DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted) +DefaultModelSupplierProposalClosed=Default template when closing a price request (refused) +ListOfSupplierProposal=List of supplier proposal requests diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 1b5358f2b79..9eccba0d95f 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad FreeLegalTextOnProposal=Texto libre en presupuestos WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Configuración del módulo Solicitudes a proveedor -AskPriceSupplierNumberingModules=Modelos de numeración de solicitud de precios a proveedor -AskPriceSupplierPDFModules=Modelos de documentos de solicitud de precios a proveedores -FreeLegalTextOnAskPriceSupplier=Texto libre en solicitudes de precios a proveedores -WatermarkOnDraftAskPriceSupplier=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Preguntar por cuenta bancaria a usar en el presupuesto +##### SupplierProposal ##### +SupplierProposalSetup=Configuración del módulo Solicitudes a proveedor +SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios a proveedor +SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores +FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores +WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto ##### Orders ##### OrdersSetup=Configuración del módulo pedidos OrdersNumberingModules=Módulos de numeración de los pedidos diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 66bcd6d4b85..3bbe0724cec 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Precio base UnitPriceTTC=Precio unitario total PriceU=P.U. PriceUHT=P.U. -AskPriceSupplierUHT=P.U. neto solicitado +SupplierProposalUHT=P.U. neto solicitado PriceUTTC=P.U. (i.i.) Amount=Importe AmountInvoice=Importe factura diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang index 622c5c91c39..4cb1a885c4b 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -60,7 +60,7 @@ PredefinedMailTestHtml=Esto es un e-mail de prueba(la palabra prueba debe PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nQueremos recordarle que su factura __FACREF__ parece estar pendiente de pago. Le adjuntamos la factura en cuestión, como recordatorio.\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLe adjuntamos el presupuesto __PROPREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nLe adjuntamos la solicitud de precios __ASKREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nLe adjuntamos la solicitud de precios __ASKREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLe adjuntamos el pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang deleted file mode 100644 index e97bd15c596..00000000000 --- a/htdocs/langs/es_ES/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configuración del módulo Impresión Directa -PrintIPPDesc=Este módulo añade un botón para enviar documentos directamente a una impresora. Es necesario un SO Linux con CUPS instalado. -PRINTIPP_ENABLED=Mostrar icono "Impresión directa" en los listados de documentos -PRINTIPP_HOST=Servidor de impresión -PRINTIPP_PORT=Puerto -PRINTIPP_USER=Usuario -PRINTIPP_PASSWORD=Contraseña -NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS) -FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora -NoDefaultPrinterDefined=No hay impresora por defecto definida -DefaultPrinter=Impresora por defecto -Printer=Impresora -CupsServer=Servidor CUPS diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 54b4ced593f..4a6f97936da 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Toote/teenuse rida, mille koguseks on märgitud 0, pee FreeLegalTextOnProposal=Vaba tekst pakkumistel WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Tellimuste haldamise seadistamine OrdersNumberingModules=Tellimuste numeratsiooni mudelid diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index e07606ee685..17690a08d1c 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Ühiku hind (neto) UnitPriceTTC=Ühiku hind PriceU=ÜH PriceUHT=ÜH (neto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Summa AmountInvoice=Arve summa diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang index c89032a204b..dc2541fc541 100644 --- a/htdocs/langs/et_EE/other.lang +++ b/htdocs/langs/et_EE/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=See on test kiri (sõna test peab olema rasvases k PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/et_EE/printipp.lang b/htdocs/langs/et_EE/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/et_EE/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index 6e6e891ae29..3b99014487f 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang index b20667c3c86..40a4f4621f8 100644 --- a/htdocs/langs/eu_ES/main.lang +++ b/htdocs/langs/eu_ES/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/eu_ES/other.lang +++ b/htdocs/langs/eu_ES/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/eu_ES/printipp.lang b/htdocs/langs/eu_ES/printipp.lang deleted file mode 100644 index f9c36810b91..00000000000 --- a/htdocs/langs/eu_ES/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Direct Print modulua konfiguratu -PrintIPPDesc=Modulu honek "Inprimatu" botoia gehitzen du dokumentuak zuzenean inprimagailu batera bidaltzeko. CUPS instalatuta duen Linux sistema behar du. -PRINTIPP_ENABLED=Dokumentuen zerrendetan "Direct Print" ikonoa erakutsi -PRINTIPP_HOST=Inprimatzeko zerbitzaria -PRINTIPP_PORT=Ataka -PRINTIPP_USER=Hasi saioa honela -PRINTIPP_PASSWORD=Pasahitza -NoPrinterFound=Ez da inprimagailurik aurkitu (CUPS konfigurazioa egiaztatu) -FileWasSentToPrinter=%s fitxategia inprimagailura bidali da -NoDefaultPrinterDefined=Ez da lehenetsitako inprimagailurik ezarri -DefaultPrinter=Lehenetsitako inprimagailua -Printer=Inprimagailua -CupsServer=CUPS zerbitzaria diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index ab7e526cc8f..bb75e25d09a 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار FreeLegalTextOnProposal=متن رایگان در طرح های تجاری WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=راه اندازی مدیریت سفارش OrdersNumberingModules=سفارشات شماره مدل diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index c9d5f36bb19..1af11d729e3 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=قیمت واحد (خالص) UnitPriceTTC=قیمت واحد PriceU=UP PriceUHT=UP (خالص) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=مقدار AmountInvoice=مقدار فاکتور diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang index 817e117f606..d372dd4b585 100644 --- a/htdocs/langs/fa_IR/other.lang +++ b/htdocs/langs/fa_IR/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=این ایمیل آزمون (آزمون کلمه PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ ما می خواهیم به شما هشدار می دهند که فاکتور __ FACREF__ به نظر می رسد که غیر انتفایی نیست. پس این فاکتور در پیوست است دوباره، به عنوان یک یادآوری. __PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ شما در اینجا خواهید دید پیشنهاد تجاری __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید که منظور __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید منظور ما __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ diff --git a/htdocs/langs/fa_IR/printipp.lang b/htdocs/langs/fa_IR/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/fa_IR/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index b6bd4cd14c9..1b186c29974 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Rivi tuotteen / palvelun nolla määrä pidetään vai FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Tilaukset hallinto-setup OrdersNumberingModules=Tilaukset numerointiin modules diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index 22249c98571..775007e91ed 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Yksikköhinta (netto) UnitPriceTTC=Yksikköhinta PriceU=UP PriceUHT=UP (netto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Määrä AmountInvoice=Laskun summa diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang index c96d7454d53..09361739656 100644 --- a/htdocs/langs/fi_FI/other.lang +++ b/htdocs/langs/fi_FI/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Tämä on testi postitse (sana testi on lihavoitu) PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/fi_FI/printipp.lang b/htdocs/langs/fi_FI/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/fi_FI/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang index e43f0431d51..4b2df3d27a5 100644 --- a/htdocs/langs/fr_CA/main.lang +++ b/htdocs/langs/fr_CA/main.lang @@ -21,7 +21,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'. PriceUHT=Prix -AskPriceSupplierUHT=P.U. HT. demandé +SupplierProposalUHT=P.U. HT. demandé PriceUTTC=P.U. TTC AmountVAT=Montant TPS AmountLT1=Montant TVQ diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 0de11174d41..b0f0935d674 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1194,13 +1194,13 @@ UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Configuration du module Demande de tarifs forunisseurs -AskPriceSupplierNumberingModules=Modèles de numérotation des demandes de prix -AskPriceSupplierPDFModules=Modèles de documents des demandes de prix -FreeLegalTextOnAskPriceSupplier=Texte libre sur les demande de tarifs fournisseurs -WatermarkOnDraftAskPriceSupplier=Filigrane sur le document de demande de prix fournisseurs (aucun si vide) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Demander le compte bancaire cible durant la création de la demande de prix fournisseur +##### SupplierProposal ##### +SupplierProposalSetup=Configuration du module Demande de tarifs forunisseurs +SupplierProposalNumberingModules=Modèles de numérotation des demandes de prix +SupplierProposalPDFModules=Modèles de documents des demandes de prix +FreeLegalTextOnSupplierProposal=Texte libre sur les demande de tarifs fournisseurs +WatermarkOnDraftSupplierProposal=Filigrane sur le document de demande de prix fournisseurs (aucun si vide) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Demander le compte bancaire cible durant la création de la demande de prix fournisseur ##### Orders ##### OrdersSetup=Configuration du module Commandes OrdersNumberingModules=Modèles de numérotation des commandes diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 1d1000a7f46..79d041bed9f 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Prix unitaire HT UnitPriceTTC=Prix unitaire TTC PriceU=P.U. PriceUHT=P.U. HT -AskPriceSupplierUHT=Prix unitaire net requis +SupplierProposalUHT=Prix unitaire net requis PriceUTTC=P.U TTC Amount=Montant AmountInvoice=Montant facture diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 9c63ec04665..628f09acf15 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Ceci est un message de test (le mot test doit êtr PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\nNous voudrions porter à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre demande de tarif __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre demande de tarif __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ diff --git a/htdocs/langs/fr_FR/printipp.lang b/htdocs/langs/fr_FR/printipp.lang deleted file mode 100644 index 13e24fc7408..00000000000 --- a/htdocs/langs/fr_FR/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Réglages du module Direct Print -PrintIPPDesc=Ce module ajoute un bouton Imprimer afin d'envoyer directement les documents à une imprimante. Un système Linux installé avec CUPS est nécessaire. -PRINTIPP_ENABLED=Afficher l'icône « Impression directe » dans les listes de documents -PRINTIPP_HOST=Serveur d'impression -PRINTIPP_PORT=Port -PRINTIPP_USER=Identifiant -PRINTIPP_PASSWORD=Mot de passe -NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration CUPS) -FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante -NoDefaultPrinterDefined=Il n'y a pas d'imprimante définie par défaut -DefaultPrinter=Imprimante par défaut -Printer=Imprimante -CupsServer=Serveur CUPS diff --git a/htdocs/langs/fr_FR/askpricesupplier.lang b/htdocs/langs/fr_FR/supplier_proposal.lang similarity index 66% rename from htdocs/langs/fr_FR/askpricesupplier.lang rename to htdocs/langs/fr_FR/supplier_proposal.lang index 50ba0c96d8d..2bbf73507ba 100644 --- a/htdocs/langs/fr_FR/askpricesupplier.lang +++ b/htdocs/langs/fr_FR/supplier_proposal.lang @@ -1,25 +1,25 @@ -# Dolibarr language file - Source file is en_US - askpricesupplier -AskPriceSupplier=Proposition commerciales fournisseurs -askpricesupplierDESC=Gestion des demandes de prix aux fournisseurs -askpricesupplierMENU_LEFT_TITLE=Demandes de prix fourn. -askpricesupplierMENU_LEFT_TITLE_NEW=Nouvelle demande -askpricesupplierMENU_LEFT_TITLE_LIST=Liste +# Dolibarr language file - Source file is en_US - supplier_proposal +SupplierProposal=Proposition commerciales fournisseurs +supplier_proposalDESC=Gestion des demandes de prix aux fournisseurs +supplier_proposalMENU_LEFT_TITLE=Demandes de prix fourn. +supplier_proposalMENU_LEFT_TITLE_NEW=Nouvelle demande +supplier_proposalMENU_LEFT_TITLE_LIST=Liste CommRequest=Demande de prix CommRequests=Demandes de prix SearchRequest=Rechercher une demande DraftRequests=Demandes brouillons LastModifiedRequests=Les %s dernières demandes de prix modifiées RequestsOpened=Demandes de prix ouvertes -AskPriceSupplierArea=Espace des demandes de prix fournisseurs +SupplierProposalArea=Espace des demandes de prix fournisseurs Askpricesupplier=Demande de prix fournisseur NewAskPrice=Nouvelle demande de prix NewAsk=Nouvelle demande ShowAskpricesupplier=Afficher la demande de prix -AddAskPriceSupplier=Créer une demande de prix -AskPriceSupplierRefFourn=Réf. fournisseur -AskPriceSupplierDate=Date de livraison -AskPriceSupplierRefFournNotice=Avant de clôturer à "Acceptée", pensez à saisir les références fournisseurs. -RelatedAskPriceSupplier=Demandes de prix fournisseurs associées +AddSupplierProposal=Créer une demande de prix +SupplierProposalRefFourn=Réf. fournisseur +SupplierProposalDate=Date de livraison +SupplierProposalRefFournNotice=Avant de clôturer à "Acceptée", pensez à saisir les références fournisseurs. +RelatedSupplierProposal=Demandes de prix fournisseurs associées ConfirmValidateAsk=Êtes-vous sûr de vouloir valider cette demande de prix sous la référence %s ? DateAsk=Date de demande DeleteAsk=Supprimer demande @@ -46,12 +46,12 @@ ConfirmCloneAsk=Êtes-vous sûr de vouloir cloner la demande de prix %s ? ConfirmReOpenAsk=Êtes-vous sûr de vouloir réouvrir la demande de prix %s ? SendAskByMail=Envoyer demande de prix par email SendAskRef=Envoi de la demande de prix %s -AskPriceSupplierCard=Fiche demande +SupplierProposalCard=Fiche demande ConfirmDeleteAsk=Êtes-vous sûr de vouloir effacer cette demande de prix %s ? -ActionsOnAskPriceSupplier=Événements sur la demande +ActionsOnSupplierProposal=Événements sur la demande DocModelAuroreDescription=Modèle de demande de prix fournisseur complet (logo…) CommercialAsk=Demande de prix -DefaultModelAskPriceSupplierCreate=Modèle par défaut à la création -DefaultModelAskPriceSupplierToBill=Modèle par défaut lors de la clôture d'une demande de prix (à accéptée) -DefaultModelAskPriceSupplierClosed=Modèle par défaut lors de la clôture d'une demande de prix (refusée) -ListOfAskPriceSupplier=Liste des demandes de prix fournisseurs \ No newline at end of file +DefaultModelSupplierProposalCreate=Modèle par défaut à la création +DefaultModelSupplierProposalToBill=Modèle par défaut lors de la clôture d'une demande de prix (à accéptée) +DefaultModelSupplierProposalClosed=Modèle par défaut lors de la clôture d'une demande de prix (refusée) +ListOfSupplierProposal=Liste des demandes de prix fournisseurs \ No newline at end of file diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 4f64383c9f8..9561ffa50de 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=קו של המוצר / שירות עם כמות אפס FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=התקנה וניהול של סדר OrdersNumberingModules=הזמנות מספור מודולים diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index e07d2f99747..c46ee354b5b 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang index ee0dc8f5203..dc0343bdda0 100644 --- a/htdocs/langs/he_IL/other.lang +++ b/htdocs/langs/he_IL/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/he_IL/printipp.lang b/htdocs/langs/he_IL/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/he_IL/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 77bbc62586f..9f6b24df199 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang index cca3d72d8d4..3195a70c2ad 100644 --- a/htdocs/langs/hr_HR/main.lang +++ b/htdocs/langs/hr_HR/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/hr_HR/other.lang +++ b/htdocs/langs/hr_HR/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/hr_HR/printipp.lang b/htdocs/langs/hr_HR/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/hr_HR/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 9eb5868acfc..be9d72891c3 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Egy sor termék / szolgáltatás nulla összeg szóba, FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order Management Setup OrdersNumberingModules=Megrendelés számozási modulok diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index 3b5bdc36be3..2862f33388b 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Egység ár (nettó) UnitPriceTTC=Egység ár PriceU=E.Á. PriceUHT=E.Á. (nettó) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Mennyiség AmountInvoice=Számla mennyiség diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang index d79d3d03b48..b6165f9a508 100644 --- a/htdocs/langs/hu_HU/other.lang +++ b/htdocs/langs/hu_HU/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Ez egy teszt mail (a szó vizsgálatot kell vastag PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/hu_HU/printipp.lang b/htdocs/langs/hu_HU/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/hu_HU/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index e8bf7adf9b2..16b02f38038 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang index c7f35694d73..2a447f0d120 100644 --- a/htdocs/langs/id_ID/main.lang +++ b/htdocs/langs/id_ID/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang index 7a38b9f6aba..a90be693f54 100644 --- a/htdocs/langs/id_ID/other.lang +++ b/htdocs/langs/id_ID/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/id_ID/printipp.lang b/htdocs/langs/id_ID/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/id_ID/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index ff5f580b28a..e65160d61a6 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A lína af vöru / þjónustu með núll upphæð er t FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Stjórn Order's skipulag OrdersNumberingModules=Pantanir tala mát diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index e644d3aad35..696554d24da 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit verð (nettó) UnitPriceTTC=Eining verðs PriceU=UPP PriceUHT=UP (nettó) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Upphæð AmountInvoice=Invoice upphæð diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang index 485ffc7841f..2f40cd2fbde 100644 --- a/htdocs/langs/is_IS/other.lang +++ b/htdocs/langs/is_IS/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Þetta er prófun póstur (orðið próf verður f PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/is_IS/printipp.lang b/htdocs/langs/is_IS/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/is_IS/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index e8a80b8fdc1..1eb38b5c2ed 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Una linea di prodotto/servizio con un importo pari a 0 FreeLegalTextOnProposal=Testo libero sulle proposte commerciali WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Configurazione della gestione ordini OrdersNumberingModules=Modelli di numerazione degli ordini diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 1d67b0be959..bca67cab22c 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Prezzo unitario (netto) UnitPriceTTC=Prezzo unitario (lordo) PriceU=P.U. PriceUHT=P.U.(netto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Importo AmountInvoice=Importo della fattura diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index a1ff97351db..11b44cc0d73 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Questa è una mail di test (la parola test deve ri PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura numero __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \nVorremmo portare alla Vostra attenzione che la fattura __FACREF__ sembra non essere stata saldata. La fattura è allegata alla presente, come promemoria.\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n__SIGNATURE__ diff --git a/htdocs/langs/it_IT/printipp.lang b/htdocs/langs/it_IT/printipp.lang deleted file mode 100644 index dd6c2dd584b..00000000000 --- a/htdocs/langs/it_IT/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Impostazioni modulo Direct Print -PrintIPPDesc=Questo modulo aggiunge un pulsante per la stampa diretta dei documenti. Funziona solo su Linux con sistema di stampa CUPS. -PRINTIPP_ENABLED=Mostra icona "Stampa diretta" nella lista dei documenti -PRINTIPP_HOST=Server -PRINTIPP_PORT=Porta -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=Nessuna stampante trovata (controlla la tua installazione di CUPS) -FileWasSentToPrinter=Il file %s è stato inviato alla stampante -NoDefaultPrinterDefined=Non è presente una stampante predefinita -DefaultPrinter=Stampante predefinita -Printer=Stampante -CupsServer=Server CUPS diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 46d534d10e2..3eb5b0c0da8 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=ゼロ量と製品/サービスのラインは、オ FreeLegalTextOnProposal=商業的な提案でフリーテキスト WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=注文の管理セットアップ OrdersNumberingModules=モジュールの番号受注 diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index 5c83ef3a01d..917414dc2bd 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=単価（純額） UnitPriceTTC=単価 PriceU=UP PriceUHT=UP（純額） -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=量 AmountInvoice=請求額 diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang index 4baf53dc6ad..8b61273e70c 100644 --- a/htdocs/langs/ja_JP/other.lang +++ b/htdocs/langs/ja_JP/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=これはテストメール（ワードテスト PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ja_JP/printipp.lang b/htdocs/langs/ja_JP/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/ja_JP/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/ka_GE/admin.lang +++ b/htdocs/langs/ka_GE/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang index 49c2c3eec37..3eec2987d41 100644 --- a/htdocs/langs/ka_GE/main.lang +++ b/htdocs/langs/ka_GE/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/ka_GE/other.lang +++ b/htdocs/langs/ka_GE/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ka_GE/printipp.lang b/htdocs/langs/ka_GE/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/ka_GE/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/kn_IN/admin.lang +++ b/htdocs/langs/kn_IN/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang index 49c2c3eec37..3eec2987d41 100644 --- a/htdocs/langs/kn_IN/main.lang +++ b/htdocs/langs/kn_IN/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/kn_IN/other.lang +++ b/htdocs/langs/kn_IN/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/kn_IN/printipp.lang b/htdocs/langs/kn_IN/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/kn_IN/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index cefbf8dc630..842ca34cb7f 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang index 9884fe5b626..5997dbb3dca 100644 --- a/htdocs/langs/ko_KR/main.lang +++ b/htdocs/langs/ko_KR/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang index 32ab3851e39..86b4dafb9c4 100644 --- a/htdocs/langs/ko_KR/other.lang +++ b/htdocs/langs/ko_KR/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ko_KR/printipp.lang b/htdocs/langs/ko_KR/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/ko_KR/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/lo_LA/admin.lang +++ b/htdocs/langs/lo_LA/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang index 49c2c3eec37..3eec2987d41 100644 --- a/htdocs/langs/lo_LA/main.lang +++ b/htdocs/langs/lo_LA/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/lo_LA/other.lang +++ b/htdocs/langs/lo_LA/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/lo_LA/printipp.lang b/htdocs/langs/lo_LA/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/lo_LA/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index b2c75cfb07a..fa2dc8c6ab1 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Produkto/paslaugos linija su nuline suma yra laikoma g FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuščias) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Klausti pasiūlyme esančios banko sąskaitos paskirties -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Tiekėjų modulyje kainos prašymo nustatymas -AskPriceSupplierNumberingModules=Tiekėjų modulyje kainos prašymų numeracijos modeliai -AskPriceSupplierPDFModules=Tiekėjų modulyje kainos prašymų dokumentų modeliai -FreeLegalTextOnAskPriceSupplier=Laisvas tekstas kainos prašymuose -WatermarkOnDraftAskPriceSupplier=Vandens ženklas ant kainų prašymų tiekėjų (nėra jei tuščias) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Klausti banko sąskaitos paskirties ant kainos užklausos +##### SupplierProposal ##### +SupplierProposalSetup=Tiekėjų modulyje kainos prašymo nustatymas +SupplierProposalNumberingModules=Tiekėjų modulyje kainos prašymų numeracijos modeliai +SupplierProposalPDFModules=Tiekėjų modulyje kainos prašymų dokumentų modeliai +FreeLegalTextOnSupplierProposal=Laisvas tekstas kainos prašymuose +WatermarkOnDraftSupplierProposal=Vandens ženklas ant kainų prašymų tiekėjų (nėra jei tuščias) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Klausti banko sąskaitos paskirties ant kainos užklausos ##### Orders ##### OrdersSetup=Užsakymų valdymo nuostatos OrdersNumberingModules=Užsakymų numeracijos modeliai diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang index 225589204ae..7d47b393b0a 100644 --- a/htdocs/langs/lt_LT/main.lang +++ b/htdocs/langs/lt_LT/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Vieneto kaina (grynoji) UnitPriceTTC=Vieneto kaina PriceU=U.P. PriceUHT=U.P. (grynasis) -AskPriceSupplierUHT=U.P. grynasis Prašomas +SupplierProposalUHT=U.P. grynasis Prašomas PriceUTTC=U.P. (įsk. mokesčius) Amount=Suma AmountInvoice=Sąskaitos-faktūros suma diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang index a2da33ecb0e..45d66704e31 100644 --- a/htdocs/langs/lt_LT/other.lang +++ b/htdocs/langs/lt_LT/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Tai yra pašto bandymas (žodis bandymas turi būt PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nNorime jus perspėti, kad sąskaita-faktūra __ FACREF__ atrodo yra neapmokėta. Todėl tai yra pakartotinis priminimas apmokėti sąskaitą-faktūrą ir pakartotinai prikabinta sąskaita-faktūra.\n\n__PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nČia rasite komercinį pasiūlymą __ PROPREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nČia rasite užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nČia rasite mūsų užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ diff --git a/htdocs/langs/lt_LT/printipp.lang b/htdocs/langs/lt_LT/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/lt_LT/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 3b67036e1d8..78cc5e8f4b1 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Produkta / pakalpojuma ar nulles summu līnija tiek uz FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Pasūtījumu vadības iestatīšana OrdersNumberingModules=Pasūtījumu numerācijas modeļi diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang index 30e2ca28da1..d48722a4636 100644 --- a/htdocs/langs/lv_LV/main.lang +++ b/htdocs/langs/lv_LV/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Vienības cena (neto) UnitPriceTTC=Vienības cena PriceU=UP PriceUHT=UP (neto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Summa AmountInvoice=Rēķina summa diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang index e540fba4c84..c343c0c82cf 100644 --- a/htdocs/langs/lv_LV/other.lang +++ b/htdocs/langs/lv_LV/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Tas ir tests pasts (vārds testam jābūt treknrak PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\n\nYou will find here the invoice __FACREF__\n\n\n__PERSONALIZED__Sincerely\n\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n\n__PERSONALIZED__Sincerely\n\n\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nJums tiek nosūtīts komerciālais piedāvājums __PROPREF__\n\n__PERSONALIZED__Ar cieņu\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/lv_LV/printipp.lang b/htdocs/langs/lv_LV/printipp.lang deleted file mode 100644 index 34b0d4c674c..00000000000 --- a/htdocs/langs/lv_LV/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Printeru serveris -PRINTIPP_PORT=Ports -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Parole -NoPrinterFound=Printeri nav atrasti (pārbaidiet CUPS iestatījumus) -FileWasSentToPrinter=Fails %s nosūtīts uz printeri -NoDefaultPrinterDefined=Nav definēts noklusējtais printeris -DefaultPrinter=Noklusētais printeris -Printer=Printeris -CupsServer=CUPS Serveris diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang index c7f35694d73..2a447f0d120 100644 --- a/htdocs/langs/mk_MK/main.lang +++ b/htdocs/langs/mk_MK/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/mk_MK/other.lang +++ b/htdocs/langs/mk_MK/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/mk_MK/printipp.lang b/htdocs/langs/mk_MK/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/mk_MK/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index bfa033b15af..6abf62b594c 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=En vare/tjeneste med med null i kvantum blir betraktet FreeLegalTextOnProposal=Fritekst på tilbud WatermarkOnDraftProposal=Vannmerke på tilbudskladder (ingen hvis tom) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bakkonto for tilbudet -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Oppsett av modulen leverandør-prisforespørsler -AskPriceSupplierNumberingModules=Leverandør-prisforespørsel nummereringsmodeller -AskPriceSupplierPDFModules=Leverandør-prisforespørsel dokumentmodeller -FreeLegalTextOnAskPriceSupplier=Fritekst på leverandør-prisforespørsel -WatermarkOnDraftAskPriceSupplier=Vannmerke på kladder av leverandør-prisforepørsler (ingen hvis tom) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Be om bankkonto for prisforespørsel +##### SupplierProposal ##### +SupplierProposalSetup=Oppsett av modulen leverandør-prisforespørsler +SupplierProposalNumberingModules=Leverandør-prisforespørsel nummereringsmodeller +SupplierProposalPDFModules=Leverandør-prisforespørsel dokumentmodeller +FreeLegalTextOnSupplierProposal=Fritekst på leverandør-prisforespørsel +WatermarkOnDraftSupplierProposal=Vannmerke på kladder av leverandør-prisforepørsler (ingen hvis tom) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Be om bankkonto for prisforespørsel ##### Orders ##### OrdersSetup=Innstillinger for ordre OrdersNumberingModules=Nummereringsmodul for ordre diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 4948f083731..456c2f5ab4e 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Enhetspris (netto) UnitPriceTTC=Enhetspris PriceU=Pris PriceUHT=Pris (netto) -AskPriceSupplierUHT=Forespørsel om nettopris +SupplierProposalUHT=Forespørsel om nettopris PriceUTTC=U.P. (inkl. avgift) Amount=Beløp AmountInvoice=Fakturabeløp diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang index e1536345a4c..59525041039 100644 --- a/htdocs/langs/nb_NO/other.lang +++ b/htdocs/langs/nb_NO/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en test e-post (ordet test må være i fe PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVedlagt faktura __FACREF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nVi kan ikke se å ha mottatt betaling for faktura __FACREF__ . Som påminnelse sender vi fakturaen på nytt\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVedlagt følger tilbud__PROPREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVedlagt følger prisforespørsel __ASKREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVedlagt følger prisforespørsel __ASKREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVedlagt faktura __FACREF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__ diff --git a/htdocs/langs/nb_NO/printipp.lang b/htdocs/langs/nb_NO/printipp.lang deleted file mode 100644 index b579c2dbb84..00000000000 --- a/htdocs/langs/nb_NO/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Oppsett av Direkteutskrift modul -PrintIPPDesc=Denne modulen legger til en knapp for å sende dokumenter direkte til en skriver. Det krever et Linux-system med CUPS installert. -PRINTIPP_ENABLED=Vis "Direkteutskrift" ikon i dokumentlister -PRINTIPP_HOST=Skriverserver -PRINTIPP_PORT=Port -PRINTIPP_USER=Innlogging -PRINTIPP_PASSWORD=Passord -NoPrinterFound=Ingen skrivere funnet (sjekk CUPS oppsett) -FileWasSentToPrinter=Filen %s ble sendt til skriveren -NoDefaultPrinterDefined=Ingen standardskriver definert -DefaultPrinter=Standardskriver -Printer=Skriver -CupsServer=CUPS Server diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 1c9dc4267eb..375e3354887 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Product- / dienstregels met een waarde van 0 gebruiken FreeLegalTextOnProposal=Vrije tekst op Offertes WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vraag naar bankrekening bestemming van het voorstel -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Prijsaanvragen leveranciers module instelling -AskPriceSupplierNumberingModules=Prijsaanvragen leveranciers nummering modellen -AskPriceSupplierPDFModules=Prijsaanvragen leveranciers documenten modellen -FreeLegalTextOnAskPriceSupplier=Vrije tekst op leveranciers prijsaanvragen -WatermarkOnDraftAskPriceSupplier=Watermerk op ontwerp leveranciers prijsaanvraag ​​(geen als leeg) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Vraag naar bankrekening bestemming van prijsaanvraag +##### SupplierProposal ##### +SupplierProposalSetup=Prijsaanvragen leveranciers module instelling +SupplierProposalNumberingModules=Prijsaanvragen leveranciers nummering modellen +SupplierProposalPDFModules=Prijsaanvragen leveranciers documenten modellen +FreeLegalTextOnSupplierProposal=Vrije tekst op leveranciers prijsaanvragen +WatermarkOnDraftSupplierProposal=Watermerk op ontwerp leveranciers prijsaanvraag ​​(geen als leeg) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Vraag naar bankrekening bestemming van prijsaanvraag ##### Orders ##### OrdersSetup=Opdrachtenbeheerinstellingen OrdersNumberingModules=Opdrachtennummeringmodules diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 094df954fe5..11111d0feaf 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Eenheidsprijs (netto) UnitPriceTTC=Eenheidsprijs (bruto) PriceU=E.P. PriceUHT=EP (netto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Hoeveelheid AmountInvoice=Factuurbedrag diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang index 388bb763143..bb44b6ab054 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dit is een test e-mail (het woord test moet vetged PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Hierbij sturen wij u de factuur __FACREF__\n\n__PERSONALIZED__Met vriendelijke groeten,\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/nl_NL/printipp.lang b/htdocs/langs/nl_NL/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/nl_NL/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 4f60f4776ba..fdc3a61f55c 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest trakt FreeLegalTextOnProposal=Darmowy tekstu propozycji WatermarkOnDraftProposal=Znak wodny projektów wniosków komercyjnych (brak jeśli pusty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia propozycji -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Cena żąda konfiguracji modułu dostawcy -AskPriceSupplierNumberingModules=Wnioski Cena dostawcy numeracji modeli -AskPriceSupplierPDFModules=Cena żąda dostawców modele dokumenty -FreeLegalTextOnAskPriceSupplier=Bezpłatne tekst na podania Ceny dostawców -WatermarkOnDraftAskPriceSupplier=Znak wodny na projekt cenie żąda dostawców (brak jeśli pusty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Zapytaj o rachunku bankowego przeznaczenia zamówienie cena +##### SupplierProposal ##### +SupplierProposalSetup=Cena żąda konfiguracji modułu dostawcy +SupplierProposalNumberingModules=Wnioski Cena dostawcy numeracji modeli +SupplierProposalPDFModules=Cena żąda dostawców modele dokumenty +FreeLegalTextOnSupplierProposal=Bezpłatne tekst na podania Ceny dostawców +WatermarkOnDraftSupplierProposal=Znak wodny na projekt cenie żąda dostawców (brak jeśli pusty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia zamówienie cena ##### Orders ##### OrdersSetup=Zamówienia zarządzania konfiguracją OrdersNumberingModules=Zamówienia numeracji modules diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index c05348d2f20..3b9105eda39 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Cena jednostkowa (netto) UnitPriceTTC=Cena jednostkowa PriceU=cen/szt. PriceUHT=cen/szt (netto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Ilość AmountInvoice=Kwota faktury diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang index 8a1d21d682f..59e18906550 100644 --- a/htdocs/langs/pl_PL/other.lang +++ b/htdocs/langs/pl_PL/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fe PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chcielibyśmy ostrzec, że __FACREF__ faktura wydaje się nie jest wypłacana. Więc to jest faktura w załączniku znowu, jako przypomnienie. __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Znajdziesz tu propozycję handlową __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ Znajdziesz tu wniosek cen __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ Znajdziesz tu wniosek cen __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Znajdziesz tu porządek __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Znajdziesz tu nasze zamówienie __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ diff --git a/htdocs/langs/pl_PL/printipp.lang b/htdocs/langs/pl_PL/printipp.lang deleted file mode 100644 index e0e18a450b9..00000000000 --- a/htdocs/langs/pl_PL/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Konfiguracja modułu Direct Print -PrintIPPDesc=Moduł ten dodaje przycisk Drukuj, aby wysłać dokumenty bezpośrednio do drukarki. To wymaga systemu Linux z CUPS zainstalowanych. -PRINTIPP_ENABLED=Pokaż ikonę "Druk bezpośredni" na listach dokumentów -PRINTIPP_HOST=Serwer druku -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Hasło -NoPrinterFound=Nie znaleziono drukarki (sprawdź konfigurację CUPS) -FileWasSentToPrinter=Plik% s został wysłany do drukarki -NoDefaultPrinterDefined=Nie drukarka domyślna zdefiniowana -DefaultPrinter=Drukarka domyślna -Printer=Drukarka -CupsServer=Serwer CUPS diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 16c2aa1ba0d..7f66261c6a0 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -1021,10 +1021,10 @@ UseOptionLineIfNoQuantity=Uma linha de produto/serviço com quantidade zero é c FreeLegalTextOnProposal=Texto livre em orçamentos WatermarkOnDraftProposal=Marca d'água no rascunho de orçamentos (nenhum se vazio) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta -AskPriceSupplierSetup=Preço solicitado via fornecedor instalação de módulo -FreeLegalTextOnAskPriceSupplier=Texto livre sobre os pedidos de preços de fornecedores -WatermarkOnDraftAskPriceSupplier=Marca d'água em projetos de ordem dos fornecedores (nenhum se estiver vazio) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Informar conta bancária de destino da proposta +SupplierProposalSetup=Preço solicitado via fornecedor instalação de módulo +FreeLegalTextOnSupplierProposal=Texto livre sobre os pedidos de preços de fornecedores +WatermarkOnDraftSupplierProposal=Marca d'água em projetos de ordem dos fornecedores (nenhum se estiver vazio) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de destino da proposta OrdersSetup=Configurações do gestor de pedidos OrdersNumberingModules=modelos de numeração de pedidos OrdersModelModule=Modelos de documentos de pedidos diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang index 96f743193c1..2f33c753573 100644 --- a/htdocs/langs/pt_BR/main.lang +++ b/htdocs/langs/pt_BR/main.lang @@ -153,7 +153,7 @@ UnitPriceHT=Preço Base UnitPriceTTC=Preço Unit. Total PriceU=Preço Unit. PriceUHT=Preço Unit. -AskPriceSupplierUHT=UP net solicitada +SupplierProposalUHT=UP net solicitada PriceUTTC=U.P. (inc. Impostos) AmountInvoice=Valor Fatura AmountPayment=Valor Pagamento diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang index 4f7f8c03d2a..787d0272b8e 100644 --- a/htdocs/langs/pt_BR/other.lang +++ b/htdocs/langs/pt_BR/other.lang @@ -50,7 +50,7 @@ PredefinedMailTestHtml=Esse e um email de teste (a palavra test deve ser PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__ CONTACTCIV NAM E__ Gostaríamos de avisar que a fatura __ FACREF__ parece não ter sido pago. Portanto, esta é a fatura em anexo novamente, como um lembrete. __PERSONALIZED __ Sincerely __ SIGNATURE __ PredefinedMailContentSendProposal=__ CONTACTCIV NAME__ Você vai encontrar aqui a proposta comercial __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVocê vai encontrar aqui o preço pedido __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVocê vai encontrar aqui o preço pedido __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIV NAME__ Você vai encontrar aqui a ordem __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Você vai encontrar aqui o nosso pedido __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ diff --git a/htdocs/langs/pt_BR/printipp.lang b/htdocs/langs/pt_BR/printipp.lang deleted file mode 100644 index bfa731b0a36..00000000000 --- a/htdocs/langs/pt_BR/printipp.lang +++ /dev/null @@ -1,10 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configuração do módulo de Impressão Direta -PrintIPPDesc=Este módulo adiciona um botão de "Imprimir" para enviar documentos diretamente para impressora. Requer um sistema Linux com o CUPS instalado. -PRINTIPP_ENABLED=Mostrar ícone de "Impressão Direta" nas listas de documentos -PRINTIPP_PASSWORD=Senha -NoPrinterFound=Nenhuma impressora encontrada (verifique a configuração do CUPS) -FileWasSentToPrinter=Arquivo %s enviado para impressora -NoDefaultPrinterDefined=Nenhuma impressora padrão definida -DefaultPrinter=Impressora padrão -CupsServer=Servidor CUPS diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index cddb81aee1b..3845bdf00c4 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Uma linha de producto/serviço que tem uma quantidade FreeLegalTextOnProposal=Texto livre em Orçamentos WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Configuração do módulo pedidos OrdersNumberingModules=Módulos de numeração dos pedidos diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 5536b4c8b98..4a9a88f44af 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Preço Base (base) UnitPriceTTC=Preço Unitário PriceU=P.U. PriceUHT=P.U. (base) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Montante AmountInvoice=Montante da Fatura diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang index 78d54b4908f..fbe189959dc 100644 --- a/htdocs/langs/pt_PT/other.lang +++ b/htdocs/langs/pt_PT/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Este é um email de teste (o teste de palavra deve PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/pt_PT/printipp.lang b/htdocs/langs/pt_PT/printipp.lang deleted file mode 100644 index d284d07e866..00000000000 --- a/htdocs/langs/pt_PT/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configuração do módulo Impressão Direta -PrintIPPDesc=Este módulo adiciona um botão de 'Impressora' para enviar os documentos diretamente para uma impressora. Este requer um sistema Linux com CUPS instalados. -PRINTIPP_ENABLED=Mostrar o ícone de "Impressão Direta" nas listas de documento -PRINTIPP_HOST=Servidor de impressão -PRINTIPP_PORT=Porta -PRINTIPP_USER=Iniciar Sessão -PRINTIPP_PASSWORD=Palavra-passe -NoPrinterFound=Não foram encontradas impressoras (verifique a sua configuração de CUPS) -FileWasSentToPrinter=O filcheiro %s foi enviado para a impressora -NoDefaultPrinterDefined=Não está definida a impressora predefinida -DefaultPrinter=Impressora predefinida -Printer=Impressora -CupsServer=Servido CUPS diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index cb274c3790f..059837a0d83 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este c FreeLegalTextOnProposal=Text liber pe ofertele comerciale WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Ordinele de gestionare setup OrdersNumberingModules=Ordinele de numerotare module diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index 55477d39660..37dd6426694 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Preț unitar (net) UnitPriceTTC=Preț unitar PriceU=UP PriceUHT=UP (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Valoare AmountInvoice=Valoare Factură diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang index aa80c7cecca..b5f2f7618ef 100644 --- a/htdocs/langs/ro_RO/other.lang +++ b/htdocs/langs/ro_RO/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Acesta este un e-mail de testare (test de cuvânt PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Am dori să vă avertizăm că factura __FACREF__ pare a nu fi platită. Deci, vă ataşăm din nou factura, ca un memento. \n\n__PERSONALIZED__ Cu respect \n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici oferta comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ diff --git a/htdocs/langs/ro_RO/printipp.lang b/htdocs/langs/ro_RO/printipp.lang deleted file mode 100644 index a1734576be5..00000000000 --- a/htdocs/langs/ro_RO/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configurarea modulului Imprimare directă -PrintIPPDesc=Acest modul adauga un buton de imprimare pentru a trimite documentele direct la o imprimantă. Este nevoie de un sistem Linux cu CUPS instalat. -PRINTIPP_ENABLED=Afișare pictogramă "Print Direct" în listele de documente -PRINTIPP_HOST=Server print -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Parolă -NoPrinterFound=Nu există imprimante (verificați setarea CUPS) -FileWasSentToPrinter=Fișierul %s a fost trimis la imprimantă -NoDefaultPrinterDefined=Nicio imprimantă implicită definită -DefaultPrinter=Imprimantă implicită -Printer=Imprimanta -CupsServer=Server CUPS diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 3cd237ef00a..ca9121ecbdb 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Соответствие продукта / услуг FreeLegalTextOnProposal=Свободный текст на коммерческие предложения WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запрос банковского счёта для предложения -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Настройка модуля запросов цен поставщиков -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Свободный текст на запросе цены у поставщиков -WatermarkOnDraftAskPriceSupplier=Водяной знак на проекте запроса цены у поставщиков (нет знака, если пустое) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Настройка модуля запросов цен поставщиков +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Свободный текст на запросе цены у поставщиков +WatermarkOnDraftSupplierProposal=Водяной знак на проекте запроса цены у поставщиков (нет знака, если пустое) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Приказ 'Management Setup OrdersNumberingModules=Приказы нумерации модулей diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index 706047604b1..aa27c5b99b5 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Цена за единицу (нетто) UnitPriceTTC=Цена за единицу PriceU=Цена ед. PriceUHT=Цена ед. (нетто) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Сумма AmountInvoice=Сумма счета-фактуры diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang index fa80f2f6ba9..fdd057f2ad0 100644 --- a/htdocs/langs/ru_RU/other.lang +++ b/htdocs/langs/ru_RU/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fe PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nВы можете увидеть здесь запрос цены __ASKREF__\n\n\n__PERSONALIZED__С уважением\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nВы можете увидеть здесь запрос цены __ASKREF__\n\n\n__PERSONALIZED__С уважением\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ru_RU/printipp.lang b/htdocs/langs/ru_RU/printipp.lang deleted file mode 100644 index 13656b20f47..00000000000 --- a/htdocs/langs/ru_RU/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Установка модуля Прямой Печати -PrintIPPDesc=Этот модуль добавляет кнопку Печати c последующей отправкой документов напрямую на принтер. Для этого требуется система Linux с установленным CUPS. -PRINTIPP_ENABLED=Показать иконку "Прямая печать" в списке документов -PRINTIPP_HOST=Сервер печати -PRINTIPP_PORT=Порт -PRINTIPP_USER=Логин -PRINTIPP_PASSWORD=Пароль -NoPrinterFound=Ни один принтер не найден (проверьте настройки CUPS) -FileWasSentToPrinter=Файл %s был отправлен на печать -NoDefaultPrinterDefined=Принтер по умолчанию не установлен -DefaultPrinter=Принтер по умолчанию -Printer=Принтер -CupsServer=Сервер CUPS diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 5f79630a72c..7186e501d3e 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Rad výrobkov / služieb s nulovej hodnoty je považov FreeLegalTextOnProposal=Voľný text o obchodných návrhov WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komerčných (none ak prázdny) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Objednať riadenie nastavenia OrdersNumberingModules=Objednávky číslovanie modelov diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang index 57e8dd2e1e4..799a0ae6334 100644 --- a/htdocs/langs/sk_SK/main.lang +++ b/htdocs/langs/sk_SK/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Jednotková cena (bez DPH) UnitPriceTTC=Jednotková cena PriceU=UP PriceUHT=UP (bez DPH) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Množstvo AmountInvoice=Fakturovaná čiastka diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang index ebf48639ff8..d57a8d9500c 100644 --- a/htdocs/langs/sk_SK/other.lang +++ b/htdocs/langs/sk_SK/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Toto je test-mail (slovo test musí byť tučne). PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/sk_SK/printipp.lang b/htdocs/langs/sk_SK/printipp.lang deleted file mode 100644 index eb92974966d..00000000000 --- a/htdocs/langs/sk_SK/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Nastavenie modulu Priama tlač -PrintIPPDesc=Tento modul pridá tlačítko na priamu tlač dokumentov. Vyžaduje si Linuxový systém s nainštalovaným serverom CUPS. -PRINTIPP_ENABLED=Zobraziť ikonu "Priama tlač" v zoznamoch dokumentov -PRINTIPP_HOST=Tlačový server -PRINTIPP_PORT=Port -PRINTIPP_USER=Prihlasovacie meno -PRINTIPP_PASSWORD=Heslo -NoPrinterFound=Nenašli sa žiadne tlačiarne (skontrolujte nastavenia CUPS) -FileWasSentToPrinter=Súbor %s bol odoslaný na tlač -NoDefaultPrinterDefined=Nie je nastavená predvolená tlačiareň -DefaultPrinter=Predvolená tlačiareň -Printer=Tlačiareň -CupsServer=Server CUPS diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 522df753994..45f53da2f13 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Vrstica proizvoda/storitve z vrednostjo 0 se smatra ko FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vprašajte za ciljni bančni račun ponudbe -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Nastavitev modula cenovnih zahtevkov za dobavitelje -AskPriceSupplierNumberingModules=Modeli številčenja cenovnih zahtevkov za dobavitelje -AskPriceSupplierPDFModules=Modeli dokumentiranja cenovnih zahtevkov za dobavitelje -FreeLegalTextOnAskPriceSupplier=Prosti tekst na cenovnih zahtevkov dobaviteljev -WatermarkOnDraftAskPriceSupplier=Vodni tisk na osnutkih cenovnih zahtevkov za dobavitelje (brez, če je prazno) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Vprašaj za končni bančni račun cenovnega zahtevka +##### SupplierProposal ##### +SupplierProposalSetup=Nastavitev modula cenovnih zahtevkov za dobavitelje +SupplierProposalNumberingModules=Modeli številčenja cenovnih zahtevkov za dobavitelje +SupplierProposalPDFModules=Modeli dokumentiranja cenovnih zahtevkov za dobavitelje +FreeLegalTextOnSupplierProposal=Prosti tekst na cenovnih zahtevkov dobaviteljev +WatermarkOnDraftSupplierProposal=Vodni tisk na osnutkih cenovnih zahtevkov za dobavitelje (brez, če je prazno) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Vprašaj za končni bančni račun cenovnega zahtevka ##### Orders ##### OrdersSetup=Nastavitve upravljanja z naročili OrdersNumberingModules=Moduli za številčenje naročil diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index a8d56f2f010..1ab87f73516 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Cena enote (neto) UnitPriceTTC=Cena enote PriceU=C.E. PriceUHT=C.E. (neto) -AskPriceSupplierUHT=Zahtevana neto cena na enoto C.E. +SupplierProposalUHT=Zahtevana neto cena na enoto C.E. PriceUTTC=C.E. (z davkom) Amount=Znesek AmountInvoice=Znesek računa diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang index 85e7917ace3..0524222f823 100644 --- a/htdocs/langs/sl_SI/other.lang +++ b/htdocs/langs/sl_SI/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=To je test mail (beseda test mora biti v krepkem t PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nŽelimo vas opozoriti, da račun __FACREF__ ni bil poravnan. Zato vam račun še enkrat pošiljamo v prilogi.\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nV prilogi je ponudba __PROPREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nV prilogi je zahtevek za ceno __ASKREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nV prilogi je zahtevek za ceno __ASKREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nV prilogi je potrditev naročila __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nV prilogi je naše naročilo __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ diff --git a/htdocs/langs/sl_SI/printipp.lang b/htdocs/langs/sl_SI/printipp.lang deleted file mode 100644 index 741b5f6666c..00000000000 --- a/htdocs/langs/sl_SI/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Nastavitev modula za direktno tiskanje -PrintIPPDesc=Ta modul doda gumb za direktno pošiljanje dokumenta na tiskalnik. Zahteva nameščen sistem Linux z CUPS -PRINTIPP_ENABLED=Prikaži ikono za "Direktno tiskanje" na seznamu dokumentov -PRINTIPP_HOST=Tiskalniški strežnik -PRINTIPP_PORT=Vrata -PRINTIPP_USER=Uporabniško ime -PRINTIPP_PASSWORD=Geslo -NoPrinterFound=Ni najden noben tiskalnik (preveri nastavitve CUPS) -FileWasSentToPrinter=Datoteka %s je bila poslana na tiskalnik -NoDefaultPrinterDefined=Ni izbran privzet tiskalnik -DefaultPrinter=Privzet tiskalnik -Printer=Tiskalnik -CupsServer=CUPS Strežnik diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang index 093340ec142..0fadd5d3632 100644 --- a/htdocs/langs/sq_AL/main.lang +++ b/htdocs/langs/sq_AL/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/sq_AL/other.lang +++ b/htdocs/langs/sq_AL/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/sq_AL/printipp.lang b/htdocs/langs/sq_AL/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/sq_AL/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/sr_RS/admin.lang +++ b/htdocs/langs/sr_RS/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang index 8d1d1f9317a..82eb4c03445 100644 --- a/htdocs/langs/sr_RS/main.lang +++ b/htdocs/langs/sr_RS/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Jedinična cena PriceU=J.C. PriceUHT=J.C. (neto) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang index 4bec9af7580..7eb7523af91 100644 --- a/htdocs/langs/sr_RS/other.lang +++ b/htdocs/langs/sr_RS/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 88b8dcf4300..6ed1b7bb60b 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses FreeLegalTextOnProposal=Fri text på affärsförslag WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Pris begär leverantörer modul konfiguration -AskPriceSupplierNumberingModules=Pris förfrågningar leverantörer numrerings modeller -AskPriceSupplierPDFModules=Pris begär leverantörer dokument modeller -FreeLegalTextOnAskPriceSupplier=Fritext på förfrågningar pris leverantörer -WatermarkOnDraftAskPriceSupplier=Vattenstämpel om förslaget pris begär leverantörer (ingen om tom) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fråga efter bankkonto destination pris begäran +##### SupplierProposal ##### +SupplierProposalSetup=Pris begär leverantörer modul konfiguration +SupplierProposalNumberingModules=Pris förfrågningar leverantörer numrerings modeller +SupplierProposalPDFModules=Pris begär leverantörer dokument modeller +FreeLegalTextOnSupplierProposal=Fritext på förfrågningar pris leverantörer +WatermarkOnDraftSupplierProposal=Vattenstämpel om förslaget pris begär leverantörer (ingen om tom) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fråga efter bankkonto destination pris begäran ##### Orders ##### OrdersSetup=Beställ ledning setup OrdersNumberingModules=Beställningar numrering moduler diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index 6d893fb99e3..4f526cc8135 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Pris per enhet (netto) UnitPriceTTC=Pris per enhet PriceU=Styckpris PriceUHT=St.pris(net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Belopp AmountInvoice=Fakturabelopp diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index c94a0b49856..e1d6fe305e2 100644 --- a/htdocs/langs/sv_SE/other.lang +++ b/htdocs/langs/sv_SE/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Detta är en test post (ordet Provningen skall i f PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vi vill varna er att fakturan __FACREF__ tycks inte betalt. Så detta är fakturan i bilagan igen, som en påminnelse. __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ diff --git a/htdocs/langs/sv_SE/printipp.lang b/htdocs/langs/sv_SE/printipp.lang deleted file mode 100644 index 75e16c9f7be..00000000000 --- a/htdocs/langs/sv_SE/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Inställning av direktutskrift modul -PrintIPPDesc=Denna modul tillför en utskriftsknapp för att skicka dokument direkt till en skrivare. Det kräver ett Linux-system med CUPS installerade. -PRINTIPP_ENABLED=Visa "Direktutskrift" -ikonen i dokumentlistor -PRINTIPP_HOST=Skrivarserver -PRINTIPP_PORT=Port -PRINTIPP_USER=Inloggning -PRINTIPP_PASSWORD=Lösenord -NoPrinterFound=Inga skrivare hittades (kolla din CUPS inställningar) -FileWasSentToPrinter=Filen %s har skickats till skrivaren -NoDefaultPrinterDefined=Ingen standardskrivare definierad -DefaultPrinter=Standardskrivare -Printer=Skrivare -CupsServer=CUPS-server diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/sw_SW/admin.lang +++ b/htdocs/langs/sw_SW/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang index 49c2c3eec37..3eec2987d41 100644 --- a/htdocs/langs/sw_SW/main.lang +++ b/htdocs/langs/sw_SW/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/sw_SW/other.lang +++ b/htdocs/langs/sw_SW/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/sw_SW/printipp.lang b/htdocs/langs/sw_SW/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/sw_SW/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index 6f74a027338..365af813b89 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=สายผลิตภัณฑ์ / บริกา FreeLegalTextOnProposal=ข้อความฟรีเกี่ยวกับข้อเสนอในเชิงพาณิชย์ WatermarkOnDraftProposal=ลายน้ำในร่างข้อเสนอในเชิงพาณิชย์ (ไม่มีถ้าว่างเปล่า) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=ขอปลายทางบัญชีธนาคารของข้อเสนอ -##### AskPriceSupplier ##### -AskPriceSupplierSetup=ราคาขอซัพพลายเออร์ที่ติดตั้งโมดูล -AskPriceSupplierNumberingModules=ราคาผู้ผลิตร้องขอหมายเลขรุ่น -AskPriceSupplierPDFModules=ราคาขอซัพพลายเออร์รูปแบบเอกสาร -FreeLegalTextOnAskPriceSupplier=ข้อความฟรีในราคาผู้ผลิตร้องขอ -WatermarkOnDraftAskPriceSupplier=ลายน้ำราคาร่างซัพพลายเออร์ขอ (ไม่เลยถ้าว่างเปล่า) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=ขอบัญชีธนาคารปลายทางของการร้องขอราคา +##### SupplierProposal ##### +SupplierProposalSetup=ราคาขอซัพพลายเออร์ที่ติดตั้งโมดูล +SupplierProposalNumberingModules=ราคาผู้ผลิตร้องขอหมายเลขรุ่น +SupplierProposalPDFModules=ราคาขอซัพพลายเออร์รูปแบบเอกสาร +FreeLegalTextOnSupplierProposal=ข้อความฟรีในราคาผู้ผลิตร้องขอ +WatermarkOnDraftSupplierProposal=ลายน้ำราคาร่างซัพพลายเออร์ขอ (ไม่เลยถ้าว่างเปล่า) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=ขอบัญชีธนาคารปลายทางของการร้องขอราคา ##### Orders ##### OrdersSetup=การตั้งค่าการจัดการการสั่งซื้อ OrdersNumberingModules=สั่งซื้อจำนวนรุ่น diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang index 6c57ed16d58..9632798efb3 100644 --- a/htdocs/langs/th_TH/main.lang +++ b/htdocs/langs/th_TH/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=ราคาต่อหน่วย (สุทธิ) UnitPriceTTC=ราคาต่อหน่วย PriceU=UP PriceUHT=UP (สุทธิ) -AskPriceSupplierUHT=ขอขึ้นสุทธิ +SupplierProposalUHT=ขอขึ้นสุทธิ PriceUTTC=UP (รวมภาษี). Amount=จำนวน AmountInvoice=จำนวนใบแจ้งหนี้ diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang index 1ae66888047..33978f11aeb 100644 --- a/htdocs/langs/th_TH/other.lang +++ b/htdocs/langs/th_TH/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=นี่คือจดหมายทดสอบdeneme postası (deneme sözcüğü koyu ol PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nFiyat isteği sunulmuştur__ASKREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nFiyat isteği sunulmuştur__ASKREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ diff --git a/htdocs/langs/tr_TR/printipp.lang b/htdocs/langs/tr_TR/printipp.lang deleted file mode 100644 index 98cbc00f503..00000000000 --- a/htdocs/langs/tr_TR/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Doğrudan Yazdırma modülü ayarı -PrintIPPDesc=Bu modül belgeleri doğrudan yazıcıya gönderecek bir Yazdır düğmesi ekler. CUPS kurulmuş bir Linux sistemi gerektirir. -PRINTIPP_ENABLED=Belge listelerinde "Doğrudan yazdır" simgesini göster -PRINTIPP_HOST=Yazıcı sunucusu -PRINTIPP_PORT=Port -PRINTIPP_USER=Oturum açma -PRINTIPP_PASSWORD=Parola -NoPrinterFound=Hiç yazıcı bulunamadı (CUPS ayarlarınızı denetleyin) -FileWasSentToPrinter=%s Dosyası yazıcıya gönderildi -NoDefaultPrinterDefined=Tanımlı varsayılan yazıcı yok -DefaultPrinter=Varsayılan yazıcı -Printer=Yazıcı -CupsServer=CUPS Sunucusu diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index c495f6d0577..7cb4fccc447 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang index 25ffcd26a05..9e481ed67da 100644 --- a/htdocs/langs/uk_UA/main.lang +++ b/htdocs/langs/uk_UA/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/uk_UA/other.lang +++ b/htdocs/langs/uk_UA/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/uk_UA/printipp.lang b/htdocs/langs/uk_UA/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/uk_UA/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index a5ee8d10ba5..887ba75d0e0 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang index 56822a74f6a..f8de4e342c7 100644 --- a/htdocs/langs/uz_UZ/main.lang +++ b/htdocs/langs/uz_UZ/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Amount AmountInvoice=Invoice amount diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang index c49606b8f75..d6972e16de4 100644 --- a/htdocs/langs/uz_UZ/other.lang +++ b/htdocs/langs/uz_UZ/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a test mail (the word test must be in bold PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/uz_UZ/printipp.lang b/htdocs/langs/uz_UZ/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/uz_UZ/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index 74b61805ca6..872e047e1fc 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Yêu cầu tài khoản ngân hàng của đơn hàng đề xuất -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Cài đặt module đề nghị giá nhà cung cấp -AskPriceSupplierNumberingModules=Kiểu đánh số cho đề nghị giá nhà cung cấp -AskPriceSupplierPDFModules=Kiểu chứng từ đề nghị giá nhà cung cấp -FreeLegalTextOnAskPriceSupplier=Free text trên đề nghị giá nhà cung cấp -WatermarkOnDraftAskPriceSupplier=Watermark trên dự thảo đề nghị giá nhà cung cấp (không nếu rỗng) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Yêu cầu số tài khoản ngân hàng trên đề nghị giá +##### SupplierProposal ##### +SupplierProposalSetup=Cài đặt module đề nghị giá nhà cung cấp +SupplierProposalNumberingModules=Kiểu đánh số cho đề nghị giá nhà cung cấp +SupplierProposalPDFModules=Kiểu chứng từ đề nghị giá nhà cung cấp +FreeLegalTextOnSupplierProposal=Free text trên đề nghị giá nhà cung cấp +WatermarkOnDraftSupplierProposal=Watermark trên dự thảo đề nghị giá nhà cung cấp (không nếu rỗng) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Yêu cầu số tài khoản ngân hàng trên đề nghị giá ##### Orders ##### OrdersSetup=Cài đặt quản lý đơn hàng OrdersNumberingModules=Mô hình đánh số đơn hàng diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index 5beffb5b17b..cc431a8aa4d 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=Đơn giá (chưa thuế) UnitPriceTTC=Đơn giá PriceU=U.P. PriceUHT=U.P. (net) -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=Số tiền AmountInvoice=Số tiền hóa đơn diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index 9dc00dcec59..a66de0efc5d 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Đây là một thư kiểm tra (kiểm tra từ p PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chúng tôi muốn cảnh báo bạn rằng __FACREF__ hóa đơn dường như không được payed. Vì vậy, đây là hóa đơn kèm một lần nữa, như một lời nhắc nhở. __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây đề nghị thương mại __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây thứ tự __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây để chúng tôi __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ diff --git a/htdocs/langs/vi_VN/printipp.lang b/htdocs/langs/vi_VN/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/vi_VN/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 27687ff2ba2..4ba0751573e 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=定量为0的产品或服务项视为可选项* FreeLegalTextOnProposal=报价单中的额外说明文本 WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=询问银行账户 -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=订单管理设置 OrdersNumberingModules=订单编号模块 diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index ef87967004a..b54f4ee9cbf 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=单位价格（净值） UnitPriceTTC=单价 PriceU=向上 PriceUHT=不含税价格 -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=金额 AmountInvoice=发票金额 diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang index e34b3180862..d50b2620cc4 100644 --- a/htdocs/langs/zh_CN/other.lang +++ b/htdocs/langs/zh_CN/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=这是一个测试邮件（单词测试必须大 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/zh_CN/printipp.lang b/htdocs/langs/zh_CN/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/zh_CN/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index cd2186c3ca9..49d421adb14 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=一個產品線/服務的，是作為一個選項視 FreeLegalTextOnProposal=可在下面輸入額外的建議書資訊 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal -##### AskPriceSupplier ##### -AskPriceSupplierSetup=Price requests suppliers module setup -AskPriceSupplierNumberingModules=Price requests suppliers numbering models -AskPriceSupplierPDFModules=Price requests suppliers documents models -FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers -WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) -BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### SupplierProposal ##### +SupplierProposalSetup=Price requests suppliers module setup +SupplierProposalNumberingModules=Price requests suppliers numbering models +SupplierProposalPDFModules=Price requests suppliers documents models +FreeLegalTextOnSupplierProposal=Free text on price requests suppliers +WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=設定訂單管理模組 OrdersNumberingModules=訂單編號模組 diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang index 0f136e0feed..2206ccdfcce 100644 --- a/htdocs/langs/zh_TW/main.lang +++ b/htdocs/langs/zh_TW/main.lang @@ -303,7 +303,7 @@ UnitPriceHT=單位價格（凈值） UnitPriceTTC=單價 PriceU=向上 PriceUHT=不含稅價格 -AskPriceSupplierUHT=U.P. net Requested +SupplierProposalUHT=U.P. net Requested PriceUTTC=U.P. (inc. tax) Amount=總額 AmountInvoice=發票金額 diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang index acd7930df6e..cae93cb4da6 100644 --- a/htdocs/langs/zh_TW/other.lang +++ b/htdocs/langs/zh_TW/other.lang @@ -61,7 +61,7 @@ PredefinedMailTestHtml=這是一個測試郵件（單詞測試必須大 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/zh_TW/printipp.lang b/htdocs/langs/zh_TW/printipp.lang deleted file mode 100644 index 835e6827f12..00000000000 --- a/htdocs/langs/zh_TW/printipp.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of Direct Print module -PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. -PRINTIPP_ENABLED=Show "Direct print" icon in document lists -PRINTIPP_HOST=Print server -PRINTIPP_PORT=Port -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your CUPS setup) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 8943ca95821..05c96f38e07 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -927,11 +927,11 @@ if (! function_exists("llxHeader")) // top menu and left menu area if (empty($conf->dol_hide_topmenu)) { - top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring); + top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url); } if (empty($conf->dol_hide_leftmenu)) { - left_menu('', $help_url, '', '', 1, $title); + left_menu('', $help_url, '', '', 1, $title, 1); } // main area @@ -1327,9 +1327,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs * @param array $arrayofjs Array of js files to add in header * @param array $arrayofcss Array of css files to add in header * @param string $morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails) + * @param string $helppagename Name of wiki page for help ('' by default). + * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage + * For other external page: http://server/url * @return void */ -function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') +function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $helppagename='') { global $user, $conf, $langs, $db; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -1401,13 +1404,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a ' . "\n"; } - // Wrapper to show tooltips - print '' . "\n"; - // Raven.js for client-side Sentry logging support if (array_key_exists('mod_syslog_sentry', $conf->loghandlers) && ! empty($conf->global->SYSLOG_SENTRY_DSN)) { @@ -1454,7 +1450,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a else $appli.=" ".DOL_VERSION; } else $appli.=" ".DOL_VERSION; - if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="
".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL; + + if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="
".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL; $logouttext=''; $logouthtmltext=$appli.'
'; @@ -1507,6 +1504,44 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $toprightmenu.=Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2); } + // Link to Dolibarr wiki pages + if (empty($conf->global->MAIN_HELP_DISABLELINK)) + { + $langs->load("help"); + + $helpbaseurl=''; + $helppage=''; + $mode=''; + + if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios'; + + // Get helpbaseurl, helppage and mode from helppagename and langs + $arrayres=getHelpParamFor($helppagename,$langs); + $helpbaseurl=$arrayres['helpbaseurl']; + $helppage=$arrayres['helppage']; + $mode=$arrayres['mode']; + + // Link to help pages + if ($helpbaseurl && $helppage) + { + $text=''; + $title=''; + //$text.='
'; + $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage'); + if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' "'.dol_escape_htmltag(strtr($helppage,'_',' ')).'"'; + $text.=''; + $text.=img_picto('', 'helpdoc').' '; + //$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help'); + //if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')'; + $text.=''; + //$toprightmenu.='
'."\n"; + $toprightmenu.=Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2); + } + } + // Logout link $toprightmenu.=Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2); @@ -1539,9 +1574,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a * @param array $menu_array_after Table of menu entries to show after entries of menu handler * @param int $leftmenuwithoutmainarea Must be set to 1. 0 by default for backward compatibility with old modules. * @param string $title Title of web page + * @param string $acceptdelayedhtml 1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect) * @return void */ -function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='') +function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0) { global $user, $conf, $langs, $db, $form; global $hookmanager, $menumanager; @@ -1563,7 +1599,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra { if (! is_object($form)) $form=new Form($db); $selected=-1; - $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search")); + $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1); } else { @@ -1611,17 +1647,17 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra $langs->load("users"); $searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'user', 'sall', 'M', 'searchleftuser', img_object('','user')); } - - // Execute hook printSearchForm - $parameters=array(); - $reshook=$hookmanager->executeHooks('printSearchForm',$parameters); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) - { - $searchform.=$hookmanager->resPrint; - } - else $searchform=$hookmanager->resPrint; } + // Execute hook printSearchForm + $parameters=array('searchform'=>$searchform); + $reshook=$hookmanager->executeHooks('printSearchForm',$parameters); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + $searchform.=$hookmanager->resPrint; + } + else $searchform=$hookmanager->resPrint; + // Define $bookmarks if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire) { @@ -1694,39 +1730,6 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra if ($doliurl) print ''; print '
'."\n"; - // Link to Dolibarr wiki pages - if ($helppagename && empty($conf->global->MAIN_HELP_DISABLELINK)) - { - $langs->load("help"); - - $helpbaseurl=''; - $helppage=''; - $mode=''; - - // Get helpbaseurl, helppage and mode from helppagename and langs - $arrayres=getHelpParamFor($helppagename,$langs); - $helpbaseurl=$arrayres['helpbaseurl']; - $helppage=$arrayres['helppage']; - $mode=$arrayres['mode']; - - // Link to help pages - if ($helpbaseurl && $helppage) - { - print ''."\n"; - } - } - // Link to bugtrack if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) { @@ -1770,7 +1773,6 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra print "\n"; print ''."\n"; - if (empty($leftmenuwithoutmainarea)) main_area($title); } @@ -1862,7 +1864,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput } $ret=''; - $ret.='
'; + $ret.=''; $ret.='
global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="display: inline-block"'; $ret.='>'; @@ -1892,6 +1894,7 @@ if (! function_exists("llxFooter")) /** * Show HTML footer * Close div /DIV data-role=page + /DIV class=fiche + /DIV /DIV main layout + /BODY + /HTML. + * If global var $delayedhtmlcontent was filled, we output it just before closing the body. * * @param string $comment A text to add as HTML comment into HTML generated page * @param string $zone 'private' (for private pages) or 'public' (for public pages) @@ -1900,7 +1903,8 @@ if (! function_exists("llxFooter")) function llxFooter($comment='',$zone='private') { global $conf, $langs; - + global $delayedhtmlcontent; + // Global html output events ($mesgs, $errors, $warnings) dol_htmloutput_events(); @@ -1937,6 +1941,18 @@ if (! function_exists("llxFooter")) //var_dump($langs); // Uncommment to see the property _tab_loaded to see which language file were loaded if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile) && empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print '
'."\n"; // End div container + + if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent; + + // Wrapper to show tooltips + print "\n\n"; + print '' . "\n"; + + print "\n"; print "\n"; } diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 934be1f5a41..b409d0c752f 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -82,31 +82,16 @@ if ($id > 0 || ! empty($ref)) $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'margin', $titre, 0, $picto); - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + + print '
'; + + print '
'; + print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $object->getLibStatut(2,0); - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $object->getLibStatut(2,1); - print '
'; // Total Margin - print ''; @@ -125,7 +110,11 @@ if ($id > 0 || ! empty($ref)) } print "
'.$langs->trans("TotalMargin").''; + print '
'.$langs->trans("TotalMargin").''; print ''; // set by jquery (see below) print '
"; - print ''; + + print ''; + print '
'; + + dol_fiche_end(); if ($user->rights->facture->lire) { diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index bd2730edda0..147afc124fc 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -73,21 +73,21 @@ if ($socid > 0) dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"),0,'company'); - print ''; - - print ''; - print ''; - - if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field - { - print ''; - } + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print '
'.$langs->trans('ThirdPartyName').''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'.$langs->trans('Prefix').''.$object->prefix_comm.'
'; + + // Alias names (commercial, trademark or alias names) + print '"; if ($object->client) { - print ''; @@ -123,9 +123,14 @@ if ($socid > 0) } print "
'.$langs->trans('AliasNames').''; + print $object->name_alias; + print "
'; + print '
'; print $langs->trans('CustomerCode').''; print $object->code_client; if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; @@ -96,7 +96,7 @@ if ($socid > 0) if ($object->fournisseur) { - print '
'; + print '
'; print $langs->trans('SupplierCode').''; print $object->code_fournisseur; if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; @@ -104,7 +104,7 @@ if ($socid > 0) } // Total Margin - print '
'.$langs->trans("TotalMargin").''; + print '
'.$langs->trans("TotalMargin").''; print ''; // set by jquery (see below) print '
"; + print ''; + print '
'; - + dol_fiche_end(); + + print '
'; + $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,"; $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,"; $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,"; diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index ce87a5c7178..ea051113faa 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -45,6 +45,7 @@ if (! empty($driver)) $langs->load($driver); if (!$mode) $mode='config'; + /* * Action */ @@ -155,25 +156,18 @@ if ($mode == 'setup' && $user->admin) print '
 '.($key['example']!=''?$langs->trans("Example").' : '.$key['example']:'').'
'.$langs->trans($key['varname']).''.$langs->trans('RequestAccess').' 
'.$langs->trans($key['varname']).''.$langs->trans('DeleteAccess').' 
'.$langs->trans($key['info']).' '; + if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') + { + if (! empty($key['delete'])) print ''.$langs->trans('DeleteAccess').'

'; + print ''.$langs->trans('RequestAccess').'

'; + print $langs->trans("ToCheckDeleteTokenOnProvider", 'Google').': https://security.google.com/settings/security/permissions'; + } + print '
'.img_picto('', $printer->picto).$langs->trans($printer->desc).''.img_picto('', $printer->picto).' '.$langs->trans($printer->desc).''; if (! empty($conf->use_javascript_ajax)) { diff --git a/htdocs/printing/lib/printing.lib.php b/htdocs/printing/lib/printing.lib.php index 59e2e1e0048..697e986cd56 100644 --- a/htdocs/printing/lib/printing.lib.php +++ b/htdocs/printing/lib/printing.lib.php @@ -43,7 +43,7 @@ function printingadmin_prepare_head($mode) if ($mode == 'setup') { - $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=setup"; + $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=setup&driver=".GETPOST('driver','alpha'); $head[$h][1] = $langs->trans("SetupDriver"); $head[$h][2] = 'setup'; $h++; @@ -51,7 +51,7 @@ function printingadmin_prepare_head($mode) if ($mode == 'test') { - $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=test"; + $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=test&driver=".GETPOST('driver','alpha'); $head[$h][1] = $langs->trans("TargetedPrinter"); $head[$h][2] = 'test'; $h++; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index a7291cc1895..4c30691318f 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1038,7 +1038,7 @@ else require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $type = $langs->trans('Product'); - if ($object->isservice()) $type = $langs->trans('Service'); + if ($object->isService()) $type = $langs->trans('Service'); //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), ""); // Main official, simple, and not duplicated code @@ -1144,7 +1144,7 @@ else // Stock /* - if ($object->isproduct() && ! empty($conf->stock->enabled)) + if ($object->isProduct() && ! empty($conf->stock->enabled)) { print "
'.$langs->trans("StockLimit").''; print ''; @@ -1169,7 +1169,7 @@ else print '
'.$langs->trans("Duration").''; @@ -1435,7 +1435,7 @@ else print '
'.$langs->trans("Duration").''.$object->duration_value.' '; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index ba4dc432d36..fea8ccb8e62 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -44,7 +44,7 @@ class Product extends CommonObject public $element='product'; public $table_element='product'; public $fk_element='fk_product'; - protected $childtables=array('askpricesupplierdet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object + protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object protected $isnolinkedbythird = 1; // No field fk_soc protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe @@ -2193,11 +2193,12 @@ class Product extends CommonObject /** * Return nb of units or customers invoices in which product is included * - * @param int $socid Limit count on a particular third party id - * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities - * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 + * @param int $socid Limit count on a particular third party id + * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities + * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only + * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_vente($socid,$mode) + function get_nb_vente($socid, $mode, $filteronproducttype=-1) { global $conf; global $user; @@ -2205,9 +2206,11 @@ class Product extends CommonObject $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')"; if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)"; $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s"; + if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE f.rowid = d.fk_facture"; - $sql.= " AND d.fk_product =".$this->id; + if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id; + if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype; $sql.= " AND f.fk_soc = s.rowid"; $sql.= " AND f.entity IN (".getEntity('facture', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -2222,11 +2225,12 @@ class Product extends CommonObject /** * Return nb of units or supplier invoices in which product is included * - * @param int $socid Limit count on a particular third party id - * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities - * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 + * @param int $socid Limit count on a particular third party id + * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities + * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only + * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_achat($socid,$mode) + function get_nb_achat($socid, $mode, $filteronproducttype=-1) { global $conf; global $user; @@ -2234,9 +2238,11 @@ class Product extends CommonObject $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')"; if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s"; - if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p"; + if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE f.rowid = d.fk_facture_fourn"; - $sql.= " AND d.fk_product =".$this->id; + if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id; + if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype; $sql.= " AND f.fk_soc = s.rowid"; $sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -2251,11 +2257,12 @@ class Product extends CommonObject /** * Return nb of units or proposals in which product is included * - * @param int $socid Limit count on a particular third party id - * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities - * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 + * @param int $socid Limit count on a particular third party id + * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities + * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only + * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_propal($socid,$mode) + function get_nb_propal($socid, $mode, $filteronproducttype=-1) { global $conf; global $user; @@ -2263,9 +2270,11 @@ class Product extends CommonObject $sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')"; if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)"; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s"; + if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.rowid = d.fk_propal"; - $sql.= " AND d.fk_product =".$this->id; + if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id; + if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype; $sql.= " AND p.fk_soc = s.rowid"; $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -2279,20 +2288,23 @@ class Product extends CommonObject /** * Return nb of units or orders in which product is included * - * @param int $socid Limit count on a particular third party id - * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities - * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 + * @param int $socid Limit count on a particular third party id + * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities + * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only + * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_order($socid,$mode) + function get_nb_order($socid, $mode, $filteronproducttype=-1) { global $conf, $user; $sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')"; if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)"; $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s"; - if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p"; + if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.rowid = d.fk_commande"; - $sql.= " AND d.fk_product =".$this->id; + if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id; + if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype; $sql.= " AND c.fk_soc = s.rowid"; $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -2306,20 +2318,23 @@ class Product extends CommonObject /** * Return nb of units or orders in which product is included * - * @param int $socid Limit count on a particular third party id - * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities - * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 + * @param int $socid Limit count on a particular third party id + * @param string $mode 'byunit'=number of unit, 'bynumber'=nb of entities + * @param int $filteronproducttype 0=To filter on product only, 1=To filter on services only + * @return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_ordersupplier($socid,$mode) + function get_nb_ordersupplier($socid, $mode, $filteronproducttype=-1) { global $conf, $user; $sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')"; if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s"; + if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.rowid = d.fk_commande"; - $sql.= " AND d.fk_product =".$this->id; + if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id; + if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype; $sql.= " AND c.fk_soc = s.rowid"; $sql.= " AND c.entity IN (".getEntity('commande_fournisseur', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -3789,7 +3804,7 @@ class Product extends CommonObject * * @return boolean True if it's a product */ - function isproduct() + function isProduct() { return ($this->type == Product::TYPE_PRODUCT ? true : false); } @@ -3799,7 +3814,7 @@ class Product extends CommonObject * * @return boolean True if it's a service */ - function isservice() + function isService() { return ($this->type == Product::TYPE_SERVICE ? true : false); } @@ -4073,4 +4088,19 @@ class Product extends CommonObject return 1; } + + /** + * Returns the rights used for this class + * @return stdClass + */ + public function getRights() + { + global $user; + + if ($this->isProduct()) { + return $user->rights->produit; + } else { + return $user->rights->service; + } + } } diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 276356d8bca..86dfb8a8fd4 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -193,8 +193,8 @@ if ($id > 0 || ! empty($ref)) print "
'.$langs->trans("Ref").''; diff --git a/htdocs/product/document.php b/htdocs/product/document.php index baf736b47e5..ecb3d12bb52 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -195,33 +195,21 @@ if ($object->id) } - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
'; - // Ref - print ''; - print ''; - print ''; - - // Label - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; - - print ''; + print ''; print ''; print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $object->getLibStatut(2,0); - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $object->getLibStatut(2,1); - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
'; print ''; + print '
'; + + dol_fiche_end(); $modulepart = 'produit'; $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer)); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 526b67b123c..96aa9aa6311 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -264,21 +264,15 @@ if ($id > 0 || $ref) $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'suppliers', $titre, 0, $picto); - - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Label - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$object->label.'
'; // Minimum Price - print ''; + print ''; print ''; - // Status (to buy) - print ''; - print '
'.$langs->trans("BuyingPriceMin").'
'.$langs->trans("BuyingPriceMin").''; $product_fourn = new ProductFournisseur($db); if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0) @@ -288,14 +282,13 @@ if ($id > 0 || $ref) } print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $object->getLibStatut(2,1); - print '
'; - print "\n"; + print ''; + print '
'; + + dol_fiche_end(); + // Form to add or update a price if (($action == 'add_price' || $action == 'updateprice' ) && ($user->rights->produit->creer || $user->rights->service->creer)) @@ -528,7 +521,7 @@ if ($id > 0 || $ref) { // Suppliers list title print ''; - if ($object->isproduct()) $nblignefour=4; + if ($object->isProduct()) $nblignefour=4; else $nblignefour=4; $param="&id=".$object->id; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 781db3fda3f..b656b88efc6 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -112,7 +112,31 @@ if (! empty($conf->barcode->enabled)) { $fieldstosearchall['p.barcode']='Gencod'; } +// Definition of fields for lists +$arrayfields=array( + 'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1), + 'p.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1), + 'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))), + 'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))), + 'p.sellprice'=>array('label'=>$titlesellprice, 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)), + 'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))), + 'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')), + 'p.stock'=>array('label'=>$langs->trans("PhysicalStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')), + 'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), + 'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), + 'p.tosell'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked'=>1, 'position'=>1000), + 'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Purchases").')', 'checked'=>1, 'position'=>1000) +); +// Extra fields +if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) +{ + foreach($extrafields->attribute_label as $key => $val) + { + $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]); + } +} + /* * Actions */ @@ -364,31 +388,10 @@ else } } - $arrayfields=array( - 'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1), - 'p.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1), - 'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))), - 'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))), - 'p.sellprice'=>array('label'=>$titlesellprice, 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)), - 'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))), - 'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')), - 'p.stock'=>array('label'=>$langs->trans("PhysicalStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')), - 'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), - 'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), - 'p.tosell'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked'=>1, 'position'=>1000), - 'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Purchases").')', 'checked'=>1, 'position'=>1000) - ); - // Extra fields - if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) - { - foreach($extrafields->attribute_label as $key => $val) - { - $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]); - } - } - $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; - $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields - print '
'; + $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; + $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields + + print '
'; print ''; if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder); if (! empty($arrayfields['p.label']['checked'])) print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"],"p.label","",$param,"",$sortfield,$sortorder); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index c8da665dd98..aad606627cb 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -38,18 +38,16 @@ $type=GETPOST("type","int"); if (! empty($user->societe_id)) $socid=$user->societe_id; $result=restrictedArea($user,'produit|service'); +$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit; $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); -if ($page < 0) $page = 0; +if ($page == -1) { $page = 0; } if (! $sortfield) $sortfield="c"; if (! $sortorder) $sortorder="DESC"; - -$conf->liste_limit = 3; - -if ($page == -1) $page = 0; -$limit = $conf->liste_limit; $offset = $limit * $page ; +$pageprev = $page - 1; +$pagenext = $page + 1; $staticproduct=new Product($db); @@ -69,7 +67,13 @@ if ($type == '0') else if ($type == '1') { $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; - $title=$langs->trans("StatisticsOfServices"); + //$title=$langs->trans("StatisticsOfServices"); + $title=$langs->trans("Statistics"); +} +else +{ + $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + //$title=$langs->trans("StatisticsOfProductsOrServices"); $title=$langs->trans("Statistics"); } @@ -80,24 +84,30 @@ print load_fiche_titre($title, $mesg,'title_products.png'); $param = ''; $title = $langs->trans("ListProductServiceByPopularity"); -if ($type != '') { - $param = '&type='.$type; - - if ($type == 1) { - $title = $langs->trans("ListServiceByPopularity"); - } else { - $title = $langs->trans("ListProductByPopularity"); - } +if ((string) $type == '1') { + $title = $langs->trans("ListServiceByPopularity"); } +if ((string) $type == '0') { + $title = $langs->trans("ListProductByPopularity"); +} + +if ($type != '') $param .= '&type='.$type; + $h=0; $head = array(); -$head[$h][0] = $_SERVER['PHP_SELF']; -$head[$h][1] = $title; -$head[$h][2] = 'product'; + +$head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php?id=all'; +$head[$h][1] = $langs->trans("Chart"); +$head[$h][2] = 'chart'; $h++; -dol_fiche_head($head,'product',$langs->trans("Statistics")); +$head[$h][0] = $_SERVER['PHP_SELF']; +$head[$h][1] = $title; +$head[$h][2] = 'popularityprop'; +$h++; + +dol_fiche_head($head,'popularityprop',$langs->trans("Statistics")); @@ -127,15 +137,15 @@ if ($result) $num = $db->num_rows($result); $i = 0; - print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num, $totalnboflines, ''); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $totalnboflines, ''); print '
'; print ""; - print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', '', '', $sortfield, $sortorder); - print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.type', '', '', '', $sortfield, $sortorder); - print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', '', '', $sortfield, $sortorder); - print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', '', 'align="right"', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.fk_product_type', '', $param, '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', $param, 'align="right"', $sortfield, $sortorder); print "\n"; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 69802f51d57..3f16a20d98b 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -113,86 +113,114 @@ if (empty($reshook)) $action=''; } - if (($action == 'update_price') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) + if (($action == 'update_price') && !$cancel && $object->getRights()->creer) { - $newprice = ''; - $newprice_min = ''; - $newpricebase = ''; - $newvat = ''; - + $error = 0; + $pricestoupdate = array(); + + $psq = GETPOST('psqflag'); + $psq = empty($newpsq) ? 0 : $newpsq; $maxpricesupplier = $object->min_recommended_price(); - $object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression - // MultiPrix - if (!empty($conf->global->PRODUIT_MULTIPRICES)) { - - //Shall we generate prices using price rules? - $object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false; - $object->update($object->id, $user); - - for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) { - if (isset($_POST ["price_".$i])) { - $level = $i; - $newprice = price2num($_POST ["price_".$i], 'MU'); - $newprice_min = price2num($_POST ["price_min_".$i], 'MU'); - $newpricebase = $_POST ["multiprices_base_type_".$i]; - $newnpr = (preg_match('/\*/', $_POST ["tva_tx_".$i]) ? 1 : 0); - $newvat = str_replace('*', '', $_POST ["tva_tx_".$i]); - $newpsq = GETPOST('psqflag'); - $newpsq = empty($newpsq) ? 0 : $newpsq; - break; // We found submited price - } - } - } else { - $level = 0; - $newprice = price2num($_POST ["price"], 'MU'); - $newprice_min = price2num($_POST ["price_min"], 'MU'); - $newpricebase = $_POST ["price_base_type"]; - $newnpr = (preg_match('/\*/', $_POST ["tva_tx"]) ? 1 : 0); - $newvat = str_replace('*', '', $_POST ["tva_tx"]); - $newpsq = GETPOST('psqflag'); - $newpsq = empty($newpsq) ? 0 : $newpsq; - } - - if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) { - setEventMessage($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), 'errors'); - $error ++; - $action = 'edit_price'; - } - - if ($newprice < $newprice_min && !empty($object->fk_price_expression)) { - $newprice = $newprice_min; //Set price same as min, the user will not see the - } - - $res = $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq); - - if ($res) { + if (!empty($conf->dynamicprices->enabled)) { + $object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression if ($object->fk_price_expression != 0) { //Check the expression validity by parsing it $priceparser = new PriceParser($db); - $price_result = $priceparser->parseProduct($object); - if ($price_result < 0) { //Expression is not valid + + if ($priceparser->parseProduct($object) < 0) { $error ++; - $action = 'edit_price'; setEventMessage($priceparser->translatedError(), 'errors'); } } - if (empty($error) && !empty($conf->dynamicprices->enabled)) { - $ret = $object->setPriceExpression($object->fk_price_expression); - if ($ret < 0) { - $error ++; - $action = 'edit_price'; - setEventMessage($object->error, 'errors'); + } + + // Multiprices + if (!$error && !empty($conf->global->PRODUIT_MULTIPRICES)) { + + $newprice = GETPOST('price', 'array'); + $newprice_min = GETPOST('price_min', 'array'); + $newpricebase = GETPOST('multiprices_base_type', 'array'); + $newvattx = GETPOST('tva_tx', 'array'); + + //Shall we generate prices using price rules? + $object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false; + + for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) { + + if (!isset($newprice[$i])) { + continue; + } + + $newnpr = (preg_match('/\*/', $newvattx[$i] ? 1 : 0)); + $newvat = str_replace('*', '', $newvattx[$i]); + + $pricestoupdate[$i] = array( + 'price' => $newprice[$i], + 'price_min' => $newprice_min[$i], + 'price_base_type' => $newpricebase[$i], + 'vat_tx' => $newvat, + 'npr' => $newnpr + ); + + //If autogeneration is enabled, then we only set the first level + if ($object->price_autogen) { + break; } } - if (empty($error)) { - $action = ''; - setEventMessage($langs->trans("RecordSaved")); + } else { + $pricestoupdate[0] = array( + 'price' => $_POST ["price"], + 'price_min' => $_POST ["price_min"], + 'price_base_type' => $_POST ["price_base_type"], + 'vat_tx' => str_replace('*', '', $_POST ["tva_tx"]), + 'npr' => preg_match('/\*/', $_POST ["tva_tx"]) ? 1 : 0 + ); + } + + if (!$error) { + $db->begin(); + + foreach ($pricestoupdate as $key => $val) { + + $newprice = $val['price']; + + if ($val['price'] < $val['price_min'] && !empty($object->fk_price_expression)) { + $newprice = $val['price_min']; //Set price same as min, the user will not see the + } + + $newprice = price2num($newprice, 'MU'); + $newprice_min = price2num($val['price_min'], 'MU'); + + if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) { + setEventMessage($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), 'errors'); + $error ++; + break; + } + + $res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq); + + if ($res < 0) { + $error ++; + setEventMessage($object->error, 'errors'); + break; + } } + } + + if (!$error && $object->update($object->id, $user) < 0) { + $error++; + setEventMessage($object->error, 'errors'); + } + + if (empty($error)) { + $action = ''; + setEventMessage($langs->trans("RecordSaved")); + $db->commit(); } else { $action = 'edit_price'; - setEventMessage($object->error, 'errors'); + $db->rollback(); } } @@ -402,34 +430,13 @@ $titre = $langs->trans("CardProduct" . $object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'price', $titre, 0, $picto); -print '
'; +dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); -// Ref -print ''; -print ''; -print ''; -// Label -print ''; +print '
'; -$isphoto = $object->is_photo_available($conf->product->multidir_output [$object->entity]); - -$nblignes = 5; -if ($isphoto) { - // Photo - print '
'; -} - -print ''; - -// Status (to sell) -print ''; +print '
'; +print '
' . $langs->trans("Ref") . ''; -print $form->showrefnav($object, 'ref', '', 1, 'ref'); -print '
' . $langs->trans("Label") . '' . $object->label . ''; - print $object->show_photos($conf->product->multidir_output [$object->entity], 1, 1, 0, 0, 0, 80); - print '
' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; -print $object->getLibStatut(2, 0); -print '
'; // MultiPrix if (! empty($conf->global->PRODUIT_MULTIPRICES)) @@ -442,15 +449,15 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) $soc->fetch($socid); // Selling price - print '' . $langs->trans("SellingPrice") . ''; + print ''; print ''; if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility { // TVA - print ''; + print ''; } else { @@ -483,12 +490,12 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility { // We show only vat for level 1 - print ''; + print ''; } else { // TVA - print ''; + print ''; } print ''; @@ -503,28 +510,28 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) if (! empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel); print ''; - if ($object->multiprices_base_type ["$i"] == 'TTC') { - print '';; + if ($object->multiprices_base_type[$i]) { + print ' '.$langs->trans($object->multiprices_base_type [$i]).''; } else { - print ' '.$langs->trans($object->price_base_type).'';; + print ' '.$langs->trans($object->price_base_type).''; } // Prix min print ''; @@ -605,7 +612,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) else { // TVA - print ''; + print ''; // Price print '
' . $langs->trans("SellingPrice") . ''; - if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') { - print price($object->multiprices_ttc["$soc->price_level"]); + if ($object->multiprices_base_type[$soc->price_level] == 'TTC') { + print price($object->multiprices_ttc[$soc->price_level]); } else { - print price($object->multiprices["$soc->price_level"]); + print price($object->multiprices[$soc->price_level]); } - if ($object->multiprices_base_type["$soc->price_level"]) { - print ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]); + if ($object->multiprices_base_type[$soc->price_level]) { + print ' ' . $langs->trans($object->multiprices_base_type[$soc->price_level]); } else { print ' ' . $langs->trans($object->price_base_type); } @@ -458,18 +465,18 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) // Price min print '
' . $langs->trans("MinPrice") . ''; - if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') + if ($object->multiprices_base_type[$soc->price_level] == 'TTC') { - print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]); + print price($object->multiprices_min_ttc[$soc->price_level]) . ' ' . $langs->trans($object->multiprices_base_type[$soc->price_level]); } else { - print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]); + print price($object->multiprices_min[$soc->price_level]) . ' ' . $langs->trans(empty($object->multiprices_base_type[$soc->price_level])?'HT':$object->multiprices_base_type[$soc->price_level]); } print '
' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . '
' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx[$soc->price_level], true) . '
' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx [1], true) . '
' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx [1], true) . '
' . $langs->trans("VATRate") . '' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '
' . $langs->trans("VATRate") . '' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '
'.$langs->trans("PriceLevel").''.$langs->trans("SellingPrice").''.$langs->trans("MinPrice").'
' . price($object->multiprices_ttc["$i"]); + if ($object->multiprices_base_type [$i] == 'TTC') { + print '' . price($object->multiprices_ttc[$i]); } else { - print '' . price($object->multiprices["$i"]); + print '' . price($object->multiprices[$i]); } - if ($object->multiprices_base_type["$i"]) { - print ' '.$langs->trans($object->multiprices_base_type ["$i"]).''; - if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT"; - if ($object->multiprices_base_type["$i"] == 'TTC') + if (empty($object->multiprices_base_type[$i])) $object->multiprices_base_type[$i]="HT"; + if ($object->multiprices_base_type[$i] == 'TTC') { - print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); + print price($object->multiprices_min_ttc[$i]) . ' ' . $langs->trans($object->multiprices_base_type[$i]); } else { - print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); + print price($object->multiprices_min[$i]) . ' ' . $langs->trans($object->multiprices_base_type[$i]); } print '
' . $langs->trans("VATRate") . '' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '
' . $langs->trans("VATRate") . '' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '
' . $langs->trans("SellingPrice") . ''; @@ -703,6 +710,10 @@ else print "
\n"; +print ''; +print '
'; + + dol_fiche_end(); @@ -781,7 +792,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se print '

'; } -if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer)) +if ($action == 'edit_price' && $object->getRights()->creer) { print load_fiche_titre($langs->trans("NewPrice"), ''); @@ -797,7 +808,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> print ''; // VAT - print ''; @@ -805,7 +816,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> print ''; - print ''; print ''; @@ -813,7 +824,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> // Only show price mode and expression selector if module is enabled if (! empty($conf->dynamicprices->enabled)) { // Price mode selector - print ''; + // This code hides the numeric price input if is not selected, loads the editor page if editor button is pressed - print ''; + + rights->produit->creer || $user->rights-> print 'global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { + print ' colspan="2"'; } + print '>'; + if ($object->price_base_type == 'TTC') { + print ''; + } else { + print ''; + } + print ''; if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { print ''; } - print ''; + print ''; print '
' . $langs->trans("VATRate") . ''; + print '
' . $langs->trans("VATRate") . ''; print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr); print '
'; print $langs->trans('PriceBase'); print ''; + print ''; print $form->selectPriceBaseType($object->price_base_type, "price_base_type"); print '
'.$langs->trans("PriceMode").''; + print '
'.$langs->trans("PriceMode").''; $price_expression = new PriceExpression($db); $price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option foreach ($price_expression->list_price_expression() as $entry) { @@ -823,17 +834,18 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> print $form->selectarray('eid', $price_expression_list, $price_expression_preselection); print ' 
'.$langs->trans("PriceExpressionEditor").'
'; print '
'; $text = $langs->trans('SellingPrice'); print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1); - print ''; + print ''; if ($object->price_base_type == 'TTC') { print ''; } else { @@ -862,16 +875,22 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> print '
'; $text = $langs->trans('MinPrice'); print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1); - if ($object->price_base_type == 'TTC') { - print ''; - } else { - print ''; + print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'
'; @@ -894,8 +913,8 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> global->PRODUIT_MULTIPRICES_LIMIT; $i ++) - { - - print '
'; - if ($i > 1) print '
'; - elseif (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) { - print $langs->trans('UseMultipriceRules'). ' price_autogen ? 'checked' : '').'>

'; - } - print ''; - print ''; - print ''; - if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) - { - print ''; - } - - print ''; + print ''; + print ''; + print ''; + print ''; + + if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) { + print $langs->trans('UseMultipriceRules'). ' price_autogen ? 'checked' : '').'>

'; + } + + print '
'; + print ' + '; + if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) { + print ''; + } + print ' + '; + if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { + print ''; + } + print ''; + + for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) { + $var = !$var; + + print ''; + print ''; // VAT - if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // This option is kept for backward compatibility but has no sense - { - print ''; - } - - // Selling price - print ''; } - print $form->selectPriceBaseType($object->multiprices_base_type ["$i"], "multiprices_base_type_" . $i); - print ''; + + // Selling price + print ''; // Min price - print ''; } - print ''; + print ''; - print ''; - - print '
'.$langs->trans("PriceLevel").''.$langs->trans("VATRate").''.$langs->trans("SellingPrice").''.$langs->trans("MinPrice").'
'; + print $form->textwithpicto($langs->trans('SellingPrice') . ' ' . $i, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1); + print '
' . $langs->trans("VATRate") . ''; - print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx["$i"], $mysoc, '', $object->id); - print '
'; - $text = $langs->trans('SellingPrice') . ' ' . $i; - print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1); - print ''; - if ($object->multiprices_base_type ["$i"] == 'TTC') { - print ''; + if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) { + print ''; } else { - print ''; + // This option is kept for backward compatibility but has no sense + print ''; + print $form->load_tva("tva_tx[" . $i.']', $object->multiprices_tva_tx[$i], $mysoc, '', $object->id); + print '
'; + if ($object->multiprices_base_type [$i] == 'TTC') { + print ''; + } else { + print ''; + } + print ' '.$form->selectPriceBaseType($object->multiprices_base_type [$i], "multiprices_base_type[" . $i."]"); + print '
'; - $text = $langs->trans('MinPrice') . ' ' . $i; - print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1); - if ($object->multiprices_base_type ["$i"] == 'TTC') { - print ''; + print ''; + if ($object->multiprices_base_type [$i] == 'TTC') { + print ''; } else { - print ''; + print ''; } if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'
'; - print '   '; - print '
'; - - print '
'; + print '

'; + print ''; + print '   '; + print '
'; + print ''; + dol_fiche_end(); } } diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 5fe6d5a4be3..79d33b1d884 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -27,6 +27,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; @@ -38,7 +39,7 @@ $langs->load("products"); $langs->load("bills"); $langs->load("other"); -$id = GETPOST('id','int'); +$id = GETPOST('id','int'); // For this page, id can also be 'all' $ref = GETPOST('ref'); $mode = (GETPOST('mode') ? GETPOST('mode') : 'byunit'); $error = 0; @@ -56,16 +57,48 @@ $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','', /* * View */ + $form = new Form($db); -if (! empty($id) || ! empty($ref)) +if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all') { $object = new Product($db); - $result = $object->fetch($id,$ref); + if (GETPOST('id') == 'all') + { + llxHeader("",$langs->trans("ProductStatistics")); - llxHeader("","",$langs->trans("CardProduct".$object->type)); - - if ($result) + $type = GETPOST('type'); + + $helpurl=''; + if ($type == '0') + { + $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; + //$title=$langs->trans("StatisticsOfProducts"); + $title=$langs->trans("Statistics"); + } + else if ($type == '1') + { + $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + //$title=$langs->trans("StatisticsOfServices"); + $title=$langs->trans("Statistics"); + } + else + { + $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + //$title=$langs->trans("StatisticsOfProductsOrServices"); + $title=$langs->trans("Statistics"); + } + + print load_fiche_titre($title, $mesg,'title_products.png'); + } + else + { + $result = $object->fetch($id,$ref); + llxHeader("",$langs->trans("CardProduct".$object->type)); + } + + + if ($result && (! empty($id) || ! empty($ref))) { $head=product_prepare_head($object); $titre=$langs->trans("CardProduct".$object->type); @@ -73,37 +106,74 @@ if (! empty($id) || ! empty($ref)) dol_fiche_head($head, 'stats', $titre, 0, $picto); - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Label - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; - - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $object->getLibStatut(2,0); - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $object->getLibStatut(2,1); - print '
'; - + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + dol_fiche_end(); - - + } + if (GETPOST('id') == 'all') + { + $h=0; + $head = array(); + + $head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php?id=all'; + $head[$h][1] = $langs->trans("Chart"); + $head[$h][2] = 'chart'; + $h++; + + $title = $langs->trans("ListProductServiceByPopularity"); + if ((string) $type == '1') { + $title = $langs->trans("ListServiceByPopularity"); + } + if ((string) $type == '0') { + $title = $langs->trans("ListProductByPopularity"); + } + + $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != ''?'?type='.$type:''); + $head[$h][1] = $title; + $head[$h][2] = 'popularityprop'; + $h++; + + dol_fiche_head($head,'chart',$langs->trans("Statistics")); + } + + + if ($result || GETPOST('id') == 'all') + { + if (GETPOST('id') == 'all') + { + // Choice of type of product + if (! empty($conf->dol_use_jmobile)) print "\n".'
'."\n"; + + if ((string) $type != '0') print 'id).'&type=0">'; + else print img_picto('','tick').' '; + print $langs->trans("Products"); + if ((string) $type != '0') print ''; + + if (! empty($conf->dol_use_jmobile)) print '
'."\n".'
'."\n"; + else print '   /   '; + + if ((string) $type != '1') print 'id).'&type=1">'; + else print img_picto('','tick').' '; + print $langs->trans("Services"); + if ((string) $type != '1') print ''; + + if (! empty($conf->dol_use_jmobile)) print '
'."\n".'
'."\n"; + else print '   /   '; + + if ((string) $type == '0' || (string) $type == '1') print 'id).'">'; + else print img_picto('','tick').' '; + print $langs->trans("ProductsAndServices"); + if ((string) $type == '0' || (string) $type == '1') print ''; + + if (! empty($conf->dol_use_jmobile)) print '
'; + else print '
'; + print '
'; + } + // Choice of stats if (! empty($conf->dol_use_jmobile)) print "\n".'
'."\n"; - if ($mode == 'bynumber') print ''; + if ($mode == 'bynumber') print 'id).($type != '' ? '&type='.$type:'').'&mode=byunit">'; else print img_picto('','tick').' '; print $langs->trans("StatsByNumberOfUnits"); if ($mode == 'bynumber') print ''; @@ -111,7 +181,7 @@ if (! empty($id) || ! empty($ref)) if (! empty($conf->dol_use_jmobile)) print '
'."\n".'
'."\n"; else print '   /   '; - if ($mode == 'byunit') print ''; + if ($mode == 'byunit') print 'id).($type != '' ? '&type='.$type:'').'&mode=bynumber">'; else print img_picto('','tick').' '; print $langs->trans("StatsByNumberOfEntities"); if ($mode == 'byunit') print ''; @@ -135,19 +205,19 @@ if (! empty($id) || ! empty($ref)) $graphfiles=array( 'propal' =>array('modulepart'=>'productstats_proposals', - 'file' => $object->id.'/propal12m.png', + 'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png', 'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals"))), 'orders' =>array('modulepart'=>'productstats_orders', - 'file' => $object->id.'/orders12m.png', + 'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png', 'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders"))), 'invoices' =>array('modulepart'=>'productstats_invoices', - 'file' => $object->id.'/invoices12m.png', + 'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png', 'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices"))), 'orderssuppliers'=>array('modulepart'=>'productstats_orderssuppliers', - 'file' => $object->id.'/orderssuppliers12m.png', + 'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png', 'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders"))), 'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers', - 'file' => $object->id.'/invoicessuppliers12m.png', + 'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png', 'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices"))), ); @@ -164,13 +234,21 @@ if (! empty($id) || ! empty($ref)) $graph_data = array(); - // TODO Test si deja existant et recent, on ne genere pas - if ($key == 'propal') $graph_data = $object->get_nb_propal($socid,$mode); - if ($key == 'orders') $graph_data = $object->get_nb_order($socid,$mode); - if ($key == 'invoices') $graph_data = $object->get_nb_vente($socid,$mode); - if ($key == 'invoicessuppliers') $graph_data = $object->get_nb_achat($socid,$mode); - if ($key == 'orderssuppliers') $graph_data = $object->get_nb_ordersupplier($socid,$mode); - + if (dol_is_file($dir . '/' . $graphfiles[$key]['file'])) + { + // TODO Load cachefile $graphfiles[$key]['file'] + } + else + { + if ($key == 'propal') $graph_data = $object->get_nb_propal($socid,$mode,((string) $type != '' ? $type : -1)); + if ($key == 'orders') $graph_data = $object->get_nb_order($socid,$mode,((string) $type != '' ? $type : -1)); + if ($key == 'invoices') $graph_data = $object->get_nb_vente($socid,$mode,((string) $type != '' ? $type : -1)); + if ($key == 'invoicessuppliers') $graph_data = $object->get_nb_achat($socid,$mode,((string) $type != '' ? $type : -1)); + if ($key == 'orderssuppliers') $graph_data = $object->get_nb_ordersupplier($socid,$mode,((string) $type != '' ? $type : -1)); + + // TODO Save cachefile $graphfiles[$key]['file'] + } + if (is_array($graph_data)) { $px->SetData($graph_data); @@ -237,13 +315,13 @@ if (! empty($id) || ! empty($ref)) if ($graphfiles[$key]['output'] && ! $px->isGraphKo()) { if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) print '
'.$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).''.$langs->trans("GeneratedOn",dol_print_date(dol_now()),"dayhour").''.$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour")).''.($mesg?''.$mesg.'':$langs->trans("ChartNotGenerated")).''.img_picto($langs->trans("ReCalculate"),'refresh').'id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'
'; @@ -266,10 +344,11 @@ if (! empty($id) || ! empty($ref)) print "\n".''; print '

'."\n"; } - - print '
'; - print '
'; - + } + + if (GETPOST('id') == 'all') + { + dol_fiche_end(); } } else diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index cdf571d7c75..69334976141 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -81,6 +81,8 @@ if ($id > 0 || ! empty($ref)) $product = new Product($db); $result = $product->fetch($id, $ref); + $object = $product; + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -97,34 +99,22 @@ if ($id > 0 || ! empty($ref)) $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
'.$langs->trans("Ref").''; - print $form->showrefnav($product,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$product->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $product->getLibStatut(2,0); - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $product->getLibStatut(2,1); - print '
'; show_stats_for_company($product,$socid); print "
"; - print ''; + print ''; + print '
'; + + dol_fiche_end(); + if ($user->rights->commande->lire) { diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index ef5352892c6..83f0912b3ee 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -86,16 +86,17 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - $parameters = array ( - 'id' => $id - ); + $object = $product; + + $parameters = array ('id' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); llxHeader("", "", $langs->trans("CardProduct" . $product->type)); - if ($result > 0) { + if ($result > 0) + { $head = product_prepare_head($product); $titre = $langs->trans("CardProduct" . $product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); @@ -105,34 +106,22 @@ if ($id > 0 || ! empty($ref)) { if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
' . $langs->trans("Ref") . ''; - print $form->showrefnav($product, 'ref', '', 1, 'ref'); - print '
' . $langs->trans("Label") . '' . $product->label . '
' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; - print $product->getLibStatut(2, 0); - print '
' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')'; - print $product->getLibStatut(2, 1); - print '
'; show_stats_for_company($product, $socid); print "
"; - print ''; + print ''; + print '
'; + + dol_fiche_end(); + if ($user->rights->fournisseur->commande->lire) { diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 9d4d7d53abc..c2e6b25f7ab 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -71,6 +71,8 @@ if ($id > 0 || ! empty($ref)) $product = new Product($db); $result = $product->fetch($id, $ref); + $object = $product; + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -87,34 +89,22 @@ if ($id > 0 || ! empty($ref)) $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
'; - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; - - show_stats_for_company($product,$socid); + show_stats_for_company($product,$socid); print "
'.$langs->trans("Ref").''; - print $form->showrefnav($product,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$product->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $product->getLibStatut(2,0); - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $product->getLibStatut(2,1); - print '
"; - print ''; + print ''; + print '
'; + + dol_fiche_end(); + $now=dol_now(); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index da39d5d67c1..590830702bb 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -81,7 +81,9 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + + $object = $product; + $parameters=array('id'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -98,34 +100,21 @@ if ($id > 0 || ! empty($ref)) $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
'.$langs->trans("Ref").''; - print $form->showrefnav($product,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$product->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $product->getLibStatut(2,0); - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $product->getLibStatut(2,1); - print '
'; show_stats_for_company($product,$socid); print "
"; - print ''; + print ''; + print '
'; + + dol_fiche_end(); if ($user->rights->facture->lire) diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 3d5cbcbe455..27e5495a771 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -83,6 +83,8 @@ if ($id > 0 || ! empty($ref)) $product = new Product($db); $result = $product->fetch($id, $ref); + $object = $product; + $parameters = array('id' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -99,34 +101,22 @@ if ($id > 0 || ! empty($ref)) $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
' . $langs->trans("Ref") . ''; - print $form->showrefnav($product, 'ref', '', 1, 'ref'); - print '
' . $langs->trans("Label") . '' . $product->label . '
' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; - print $product->getLibStatut(2, 0); - print '
' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')'; - print $product->getLibStatut(2, 1); - print '
'; show_stats_for_company($product, $socid); print "
"; - print ''; + print ''; + print '
'; + + dol_fiche_end(); + if ($user->rights->fournisseur->facture->lire) { diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 44101d72e52..2fa69740e8b 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -81,6 +81,8 @@ if ($id > 0 || ! empty($ref)) $product = new Product($db); $result = $product->fetch($id, $ref); + $object = $product; + $parameters = array ('id' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -97,34 +99,22 @@ if ($id > 0 || ! empty($ref)) $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print '
' . $langs->trans("Ref") . ''; - print $form->showrefnav($product, 'ref', '', 1, 'ref'); - print '
' . $langs->trans("Label") . '' . $product->label . '
' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; - print $product->getLibStatut(2, 0); - print '
' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')'; - print $product->getLibStatut(2, 1); - print '
'; show_stats_for_company($product, $socid); print "
"; - print ''; + print ''; + print '
'; + + dol_fiche_end(); + if ($user->rights->propale->lire) { diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index dfa0cf0c55c..0476a459f60 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -72,24 +72,24 @@ if ($cancel) $action=''; // Set stock limit if ($action == 'setstocklimit') { - $product = new Product($db); - $result=$product->fetch($id); - $product->seuil_stock_alerte=$stocklimit; - $result=$product->update($product->id,$user,0,'update'); + $object = new Product($db); + $result=$object->fetch($id); + $object->seuil_stock_alerte=$stocklimit; + $result=$object->update($object->id,$user,0,'update'); if ($result < 0) - setEventMessage($product->error, 'errors'); + setEventMessage($object->error, 'errors'); $action=''; } // Set desired stock if ($action == 'setdesiredstock') { - $product = new Product($db); - $result=$product->fetch($id); - $product->desiredstock=$desiredstock; - $result=$product->update($product->id,$user,0,'update'); + $object = new Product($db); + $result=$object->fetch($id); + $object->desiredstock=$desiredstock; + $result=$object->update($object->id,$user,0,'update'); if ($result < 0) - setEventMessage($product->error, 'errors'); + setEventMessage($object->error, 'errors'); $action=''; } @@ -112,10 +112,10 @@ if ($action == "correct_stock" && ! $cancel) if (! empty($conf->productbatch->enabled)) { - $product = new Product($db); - $result=$product->fetch($id); + $object = new Product($db); + $result=$object->fetch($id); - if ($product->hasbatch() && (! GETPOST("sellby")) && (! GETPOST("eatby")) && (! GETPOST("batch_number"))) { + if ($object->hasbatch() && (! GETPOST("sellby")) && (! GETPOST("eatby")) && (! GETPOST("batch_number"))) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors'); $error++; $action='correction'; @@ -127,13 +127,13 @@ if ($action == "correct_stock" && ! $cancel) $priceunit=price2num(GETPOST("unitprice")); if (is_numeric(GETPOST("nbpiece")) && $id) { - if (empty($product)) { - $product = new Product($db); - $result=$product->fetch($id); + if (empty($object)) { + $object = new Product($db); + $result=$object->fetch($id); } - if ($product->hasbatch()) + if ($object->hasbatch()) { - $result=$product->correct_stock_batch( + $result=$object->correct_stock_batch( $user, GETPOST("id_entrepot"), GETPOST("nbpiece"), @@ -148,7 +148,7 @@ if ($action == "correct_stock" && ! $cancel) } else { - $result=$product->correct_stock( + $result=$object->correct_stock( $user, GETPOST("id_entrepot"), GETPOST("nbpiece"), @@ -168,13 +168,13 @@ if ($action == "correct_stock" && ! $cancel) } else { - header("Location: ".$_SERVER["PHP_SELF"]."?id=".$product->id); + header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; } } else { - setEventMessage($product->error,'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $action='correction'; } } @@ -198,7 +198,7 @@ if ($action == "transfert_stock" && ! $cancel) } if (GETPOST("id_entrepot_source",'int') == GETPOST("id_entrepot_destination",'int')) { - setEventMessage($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), 'errors'); + setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors'); $error++; $action='transfert'; } @@ -207,20 +207,20 @@ if ($action == "transfert_stock" && ! $cancel) { if ($id) { - $product = new Product($db); - $result=$product->fetch($id); + $object = new Product($db); + $result=$object->fetch($id); $db->begin(); - $product->load_stock(); // Load array product->stock_warehouse + $object->load_stock(); // Load array product->stock_warehouse // Define value of products moved $pricesrc=0; - //if (isset($product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp; - if (isset($product->pmp)) $pricesrc=$product->pmp; + //if (isset($object->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$object->stock_warehouse[GETPOST("id_entrepot_source")]->pmp; + if (isset($object->pmp)) $pricesrc=$object->pmp; $pricedest=$pricesrc; - if ($product->hasbatch()) + if ($object->hasbatch()) { $pdluo = new Productbatch($db); @@ -251,7 +251,7 @@ if ($action == "transfert_stock" && ! $cancel) if (! $error) { // Remove stock - $result1=$product->correct_stock_batch( + $result1=$object->correct_stock_batch( $user, $srcwarehouseid, GETPOST("nbpiece",'int'), @@ -262,7 +262,7 @@ if ($action == "transfert_stock" && ! $cancel) GETPOST('inventorycode') ); // Add stock - $result2=$product->correct_stock_batch( + $result2=$object->correct_stock_batch( $user, GETPOST("id_entrepot_destination",'int'), GETPOST("nbpiece",'int'), @@ -277,7 +277,7 @@ if ($action == "transfert_stock" && ! $cancel) else { // Remove stock - $result1=$product->correct_stock( + $result1=$object->correct_stock( $user, GETPOST("id_entrepot_source"), GETPOST("nbpiece"), @@ -288,7 +288,7 @@ if ($action == "transfert_stock" && ! $cancel) ); // Add stock - $result2=$product->correct_stock( + $result2=$object->correct_stock( $user, GETPOST("id_entrepot_destination"), GETPOST("nbpiece"), @@ -309,13 +309,13 @@ if ($action == "transfert_stock" && ! $cancel) } else { - header("Location: product.php?id=".$product->id); + header("Location: product.php?id=".$object->id); exit; } } else { - setEventMessages($product->error, $product->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); $action='transfert'; } @@ -370,70 +370,46 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save')) * View */ +$form = new Form($db); $formproduct=new FormProduct($db); if ($id > 0 || $ref) { - $product = new Product($db); - $result = $product->fetch($id,$ref); - $product->load_stock(); + $object = new Product($db); + $result = $object->fetch($id,$ref); + $object->load_stock(); $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks'; - llxHeader("",$langs->trans("CardProduct".$product->type),$help_url); + llxHeader("",$langs->trans("CardProduct".$object->type),$help_url); if ($result > 0) { - $head=product_prepare_head($product); - $titre=$langs->trans("CardProduct".$product->type); - $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); + $head=product_prepare_head($object); + $titre=$langs->trans("CardProduct".$object->type); + $picto=($object->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'stock', $titre, 0, $picto); dol_htmloutput_events(); - $form = new Form($db); - - print ''; - - // Ref - print ''; - print ''; - print ''; - - // Label - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; - - if ($conf->productbatch->enabled) { - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($product,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$product->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { - print ajax_object_onoff($product, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); - } else { - print $product->getLibStatut(2,0); - } - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { - print ajax_object_onoff($product, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); - } else { - print $product->getLibStatut(2,1); - } - print '
'.$langs->trans("ManageLotSerial").''; - print $product->getLibStatut(0,2); + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + print '
'; + + print '
'; + print ''; + + if ($conf->productbatch->enabled) + { + print ''; } // PMP - print ''; + print ''; print ''; print ''; @@ -441,14 +417,13 @@ if ($id > 0 || $ref) print ''; print ''; - $object = $product; if (empty($conf->global->PRODUIT_MULTIPRICES)) { // Price @@ -483,17 +458,17 @@ if ($id > 0 || $ref) } // Stock alert threshold - print ''; // Desired stock - print ''; // Real stock - $product->load_stock(); + $object->load_stock(); $text_stock_options = ''; $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)?$langs->trans("DeStockOnShipment").'
':''); $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'
':''); @@ -504,15 +479,15 @@ if ($id > 0 || $ref) print ''; - print ''; print ''; // Calculating a theorical value print ''; - print "'; @@ -528,36 +503,36 @@ if ($id > 0 || $ref) if (! empty($conf->commande->enabled)) { if ($found) print '
'; else $found=1; - print $langs->trans("ProductQtyInCustomersOrdersRunning").': '.$product->stats_commande['qty']; - $result=$product->load_stats_commande(0,'0'); - if ($result < 0) dol_print_error($db,$product->error); - print ' ('.$langs->trans("ProductQtyInDraft").': '.$product->stats_commande['qty'].')'; + print $langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty']; + $result=$object->load_stats_commande(0,'0'); + if ($result < 0) dol_print_error($db,$object->error); + print ' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')'; } // Number of product from customer order already sent (partial shipping) if (! empty($conf->expedition->enabled)) { if ($found) print '
'; else $found=1; - $result=$product->load_stats_sending(0,'2'); - print $langs->trans("ProductQtyInShipmentAlreadySent").': '.$product->stats_expedition['qty']; + $result=$object->load_stats_sending(0,'2'); + print $langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty']; } // Number of supplier order running if (! empty($conf->fournisseur->enabled)) { if ($found) print '
'; else $found=1; - $result=$product->load_stats_commande_fournisseur(0,'3,4'); - print $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty']; - $result=$product->load_stats_commande_fournisseur(0,'0,1,2'); - if ($result < 0) dol_print_error($db,$product->error); - print ' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')'; + $result=$object->load_stats_commande_fournisseur(0,'3,4'); + print $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty']; + $result=$object->load_stats_commande_fournisseur(0,'0,1,2'); + if ($result < 0) dol_print_error($db,$object->error); + print ' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')'; } // Number of product from supplier order already received (partial receipt) if (! empty($conf->fournisseur->enabled)) { if ($found) print '
'; else $found=1; - print $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$product->stats_reception['qty']; + print $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty']; } print ''; @@ -565,7 +540,7 @@ if ($id > 0 || $ref) // Last movement $sql = "SELECT max(m.datem) as datem"; $sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m"; - $sql.= " WHERE m.fk_product = '".$product->id."'"; + $sql.= " WHERE m.fk_product = '".$object->id."'"; $resqlbis = $db->query($sql); if ($resqlbis) { @@ -580,18 +555,21 @@ if ($id > 0 || $ref) if ($lastmovementdate) { print dol_print_date($lastmovementdate,'dayhour').' '; - print '('.$langs->trans("FullList").')'; + print '('.$langs->trans("FullList").')'; } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print ""; print "
'.$langs->trans("ManageLotSerial").''; + print $object->getLibStatut(0,2); print '
'.$langs->trans("AverageUnitPricePMP").'
'.$langs->trans("AverageUnitPricePMP").''; - if ($product->pmp > 0) print price($product->pmp).' '.$langs->trans("HT"); + if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT"); print '
'.$langs->trans("BuyingPriceMin").''; $product_fourn = new ProductFournisseur($db); - if ($product_fourn->find_min_price_product_fournisseur($product->id) > 0) + if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0) { if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(); else print $langs->trans("NotDefined"); } print '
'.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).''; - print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer); + print '
'.$form->editfieldkey("StockLimit",'stocklimit',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).''; + print $form->editfieldval("StockLimit",'stocklimit',$object->seuil_stock_alerte,$object,$user->rights->produit->creer); print '
'.$form->editfieldkey("DesiredStock",'desiredstock',$product->desiredstock,$product,$user->rights->produit->creer).''; - print $form->editfieldval("DesiredStock",'desiredstock',$product->desiredstock,$product,$user->rights->produit->creer); + print '
'.$form->editfieldkey("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer).''; + print $form->editfieldval("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer); print '
'; print $form->textwithtooltip($langs->trans("PhysicalStock"), $text_stock_options, 2, 1, img_picto('', 'info'), '', 2); print ''.$product->stock_reel; - if ($product->seuil_stock_alerte && ($product->stock_reel < $product->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit")); + print ''.$object->stock_reel; + if ($object->seuil_stock_alerte && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit")); print '
'.$langs->trans("VirtualStock").'".(empty($product->stock_theorique)?0:$product->stock_theorique); - if ($product->stock_theorique < $product->seuil_stock_alerte) { + print "".(empty($object->stock_theorique)?0:$object->stock_theorique); + if ($object->stock_theorique < $object->seuil_stock_alerte) { print ' '.img_warning($langs->trans("StockLowerThanLimit")); } print '
"; + print '
'; + print '
'; + + dol_fiche_end(); } - print ''; /* * Correct stock @@ -618,7 +596,7 @@ if ($id > 0 || $ref) if ($_GET["action"] == "definir") { print load_fiche_titre($langs->trans("SetStock")); - print "
id\" method=\"post\">\n"; + print "id\" method=\"post\">\n"; print ''; print ''; print ''; @@ -645,19 +623,19 @@ else /* ************************************************************************** */ -if (empty($action) && $product->id) +if (empty($action) && $object->id) { print "
\n"; if ($user->rights->stock->mouvement->creer) { - print ''.$langs->trans("StockCorrection").''; + print ''.$langs->trans("StockCorrection").''; } - //if (($user->rights->stock->mouvement->creer) && ! $product->hasbatch()) + //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch()) if ($user->rights->stock->mouvement->creer) { - print ''.$langs->trans("StockMovement").''; + print ''.$langs->trans("StockMovement").''; } print '
'; @@ -678,7 +656,7 @@ print ''; print ''; print ''; print ''; -if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) +if ((! empty($conf->productbatch->enabled)) && $object->hasbatch()) { print ''; print ''; @@ -695,7 +673,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product"; $sql.= " WHERE ps.reel != 0"; $sql.= " AND ps.fk_entrepot = e.rowid"; $sql.= " AND e.entity IN (".getEntity('stock', 1).")"; -$sql.= " AND ps.fk_product = ".$product->id; +$sql.= " AND ps.fk_product = ".$object->id; $sql.= " ORDER BY e.label"; $entrepotstatic=new Entrepot($db); @@ -718,25 +696,25 @@ if ($resql) print ''; print ''; // PMP - print ''; + print ''; // Value purchase - print ''; + print ''; // Sell price print ''; // Value sell print ''; + if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).''; else print $langs->trans("Variable"); print ''; ; $total += $obj->reel; - if (price2num($product->pmp)) $totalwithpmp += $obj->reel; - $totalvalue = $totalvalue + ($product->pmp*$obj->reel); - $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); + if (price2num($object->pmp)) $totalwithpmp += $obj->reel; + $totalvalue = $totalvalue + ($object->pmp*$obj->reel); + $totalvaluesell = $totalvaluesell + ($object->price*$obj->reel); //Batch Detail - if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) + if ((! empty($conf->productbatch->enabled)) && $object->hasbatch()) { $details=Productbatch::findAll($db,$obj->product_stock_id); if ($details<0) dol_print_error($db); @@ -762,7 +740,7 @@ if ($resql) { print "\n".'
'.$langs->trans("EstimatedStockValueShort").''.$langs->trans("SellPriceMin").''.$langs->trans("EstimatedStockValueSellShort").'
'.$langs->trans("batch_number").''.$entrepotstatic->getNomUrl(1).''.$obj->reel.($obj->reel<0?' '.img_warning():'').''.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').''.(price2num($object->pmp)?price2num($object->pmp,'MU'):'').''.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').''.(price2num($object->pmp)?price(price2num($object->pmp*$obj->reel,'MT')):'').''; - if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1); + if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price,'MU'),1); else print $langs->trans("Variable"); print ''; - if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'
'; print img_picto($langs->trans("Tranfer"),'uparrow','class="hideonsmartphone"').' '; - print 'id.'">'.$langs->trans("StockMovement").''; + print 'id.'">'.$langs->trans("StockMovement").''; // Disabled, because edition of stock content must use the "Correct stock menu". // Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ... //print 'id.'#'.$pdluo->id.'">'; diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index dc102d8eb05..b1121731293 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -21,7 +21,9 @@ load("productbatch"); + if (! is_object($product)) $product=$object; + + $langs->load("productbatch"); if (empty($id)) $id = $object->id; diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index de947a75014..93c3135e5f1 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -21,7 +21,11 @@ load("productbatch"); + + $pdluoid=GETPOST('pdluoid','int'); $pdluo = new Productbatch($db); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 413cb589dff..96187fad8dd 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -58,9 +58,9 @@ if ($cancel == $langs->trans("Cancel")) if ($action == 'delete' && GETPOST('langtodelete','alpha')) { - $product = new Product($db); - $product->fetch($id); - $product->delMultiLangs(GETPOST('langtodelete','alpha')); + $object = new Product($db); + $object->fetch($id); + $object->delMultiLangs(GETPOST('langtodelete','alpha')); } // Add translation @@ -68,33 +68,33 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) { - $product = new Product($db); - $product->fetch($id); + $object = new Product($db); + $object->fetch($id); $current_lang = $langs->getDefaultLang(); // update de l'objet if ( $_POST["forcelangprod"] == $current_lang ) { - $product->label = $_POST["libelle"]; - $product->description = dol_htmlcleanlastbr($_POST["desc"]); - $product->note = dol_htmlcleanlastbr($_POST["note"]); + $object->label = $_POST["libelle"]; + $object->description = dol_htmlcleanlastbr($_POST["desc"]); + $object->note = dol_htmlcleanlastbr($_POST["note"]); } else { - $product->multilangs[$_POST["forcelangprod"]]["label"] = $_POST["libelle"]; - $product->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]); - $product->multilangs[$_POST["forcelangprod"]]["note"] = dol_htmlcleanlastbr($_POST["note"]); + $object->multilangs[$_POST["forcelangprod"]]["label"] = $_POST["libelle"]; + $object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]); + $object->multilangs[$_POST["forcelangprod"]]["note"] = dol_htmlcleanlastbr($_POST["note"]); } // sauvegarde en base - if ( $product->setMultiLangs() > 0 ) + if ( $object->setMultiLangs() > 0 ) { $action = ''; } else { $action = 'add'; - setEventMessage($product->error,'errors'); + setEventMessage($object->error,'errors'); } } @@ -103,34 +103,34 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) { - $product = new Product($db); - $product->fetch($id); + $object = new Product($db); + $object->fetch($id); $current_lang = $langs->getDefaultLang(); - foreach ( $product->multilangs as $key => $value ) // enregistrement des nouvelles valeurs dans l'objet + foreach ( $object->multilangs as $key => $value ) // enregistrement des nouvelles valeurs dans l'objet { if ( $key == $current_lang ) { - $product->label = $_POST["libelle-".$key]; - $product->description = dol_htmlcleanlastbr($_POST["desc-".$key]); - $product->note = dol_htmlcleanlastbr($_POST["note-".$key]); + $object->label = $_POST["libelle-".$key]; + $object->description = dol_htmlcleanlastbr($_POST["desc-".$key]); + $object->note = dol_htmlcleanlastbr($_POST["note-".$key]); } else { - $product->multilangs[$key]["label"] = $_POST["libelle-".$key]; - $product->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]); - $product->multilangs[$key]["note"] = dol_htmlcleanlastbr($_POST["note-".$key]); + $object->multilangs[$key]["label"] = $_POST["libelle-".$key]; + $object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]); + $object->multilangs[$key]["note"] = dol_htmlcleanlastbr($_POST["note-".$key]); } } - if ( $product->setMultiLangs() > 0 ) + if ( $object->setMultiLangs() > 0 ) { $action = ''; } else { $action = 'edit'; - setEventMessage($product->error,'errors'); + setEventMessage($object->error,'errors'); } } @@ -139,24 +139,24 @@ if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) { - $product = new Product($db); - $product->fetch($id); + $object = new Product($db); + $object->fetch($id); $langtodelete=GETPOST('langdel','alpha'); - if ( $product->delMultiLangs($langtodelete) > 0 ) + if ( $object->delMultiLangs($langtodelete) > 0 ) { $action = ''; } else { $action = 'edit'; - setEventMessage($product->error,'errors'); + setEventMessage($object->error,'errors'); } } -$product = new Product($db); -$result = $product->fetch($id,$ref); +$object = new Product($db); +$result = $object->fetch($id,$ref); /* @@ -168,20 +168,10 @@ llxHeader("","",$langs->trans("Translation")); $form = new Form($db); $formadmin=new FormAdmin($db); -$head=product_prepare_head($product); -$titre=$langs->trans("CardProduct".$product->type); -$picto=($product->type==Product::TYPE_SERVICE?'service':'product'); -dol_fiche_head($head, 'translation', $titre, 0, $picto); +$head=product_prepare_head($object); +$titre=$langs->trans("CardProduct".$object->type); +$picto=($object->type==Product::TYPE_SERVICE?'service':'product'); -print ''; - -// Reference -print ''; -print ''; -print ''; -print '
'.$langs->trans("Ref").''; -print $form->showrefnav($product,'ref','',1,'ref'); -print '
'; if ($action == 'edit') { @@ -191,33 +181,40 @@ if ($action == 'edit') print ''; print ''; print ''; - print ''; + print ''; - if (! empty($product->multilangs)) + dol_fiche_head($head, 'translation', $titre, 0, $picto); + + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + if (! empty($object->multilangs)) { - foreach ($product->multilangs as $key => $value) + foreach ($object->multilangs as $key => $value) { - print "
".$langs->trans('Language_'.$key)." :
"; + $s=picto_from_langcode($key); + print "
".($s?$s.' ':'')." ".$langs->trans('Language_'.$key).": ".''.img_delete('', '')."
"; + print ''; - print ''; + print ''; print ''; print ''; - print ''; print '
'.$langs->trans('Label').'
'.$langs->trans('Label').'
'.$langs->trans('Description').''; - $doleditor = new DolEditor("desc-$key", $product->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80); + $doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80); $doleditor->Create(); print '
'.$langs->trans('Note').''; - $doleditor = new DolEditor("note-$key", $product->multilangs[$key]["note"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80); + $doleditor = new DolEditor("note-$key", $object->multilangs[$key]["note"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80); $doleditor->Create(); print '
'.$langs->trans("Delete").'
'; } } - print '
'; + dol_fiche_end(); + + print '
'; print ''; print '     '; print ''; @@ -228,25 +225,30 @@ if ($action == 'edit') } else { - $cnt_trans = 0; - if (! empty($product->multilangs)) + dol_fiche_head($head, 'translation', $titre, 0, $picto); + + dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref'); + + $cnt_trans = 0; + if (! empty($object->multilangs)) { - foreach ($product->multilangs as $key => $value) + foreach ($object->multilangs as $key => $value) { $cnt_trans++; $s=picto_from_langcode($key); - print "
".($s?$s.' ':'')." ".$langs->trans('Language_'.$key).": ".''.img_delete('', '')."
"; + print "
".($s?$s.' ':'')." ".$langs->trans('Language_'.$key).": ".''.img_delete('', '')."
"; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print '
'.$langs->trans('Label').''.$product->multilangs[$key]["label"].'
'.$langs->trans('Description').''.$product->multilangs[$key]["description"].'
'.$langs->trans('Note').''.$product->multilangs[$key]["note"].'
'.$langs->trans('Label').''.$object->multilangs[$key]["label"].'
'.$langs->trans('Description').''.$object->multilangs[$key]["description"].'
'.$langs->trans('Note').''.$object->multilangs[$key]["note"].'
'; } } if (! $cnt_trans) print '
'. $langs->trans('NoTranslation'); + + dol_fiche_end(); } -print "
\n"; /* ************************************************************************** */ @@ -260,8 +262,8 @@ print "\n
\n"; if ($action == '') if ($user->rights->produit->creer || $user->rights->service->creer) { - print ''.$langs->trans("Add").''; - print ''.$langs->trans("Update").''; + print ''.$langs->trans("Add").''; + print ''.$langs->trans("Update").''; } print "\n
\n"; @@ -284,7 +286,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print ''; print ''; print ''; print ''; + $suggestedref=($_POST["ref"]?$_POST["ref"]:$defaultref); + print ''; // Label - print ''; + print ''; // Thirdparty print '
'.$langs->trans('Language').''; - print $formadmin->select_language('','forcelangprod',0,$product->multilangs,1); + print $formadmin->select_language('','forcelangprod',0,$object->multilangs,1); print '
'.$langs->trans('Label').'
'.$langs->trans('Description').''; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 686e764978a..f42fc7c4720 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -104,7 +104,7 @@ else if ($action == 'specimen') $project = new Project($db); $project->initAsSpecimen(); - + // Search template files $file=''; $classname=''; $filefound=0; $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 748f91dbefe..c05cb6948a5 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -450,10 +450,13 @@ if ($action == 'create' && $user->rights->projet->creer) if (is_numeric($defaultref) && $defaultref <= 0) $defaultref=''; // Ref - print '
'.$langs->trans("Ref").'
'.$langs->trans("Ref").''; + print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref)); + print '
'.$langs->trans("Label").'
'.$langs->trans("Label").'
'.$langs->trans("ThirdParty").''; @@ -617,12 +620,15 @@ else print ''; // Ref + $suggestedref=$object->ref; print ''; - print ''; + print ''; // Label print ''; - print ''; + print ''; // Thirdparty print '
'.$langs->trans("Ref").'
'; + print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref)); + print '
'.$langs->trans("Label").'
'.$langs->trans("ThirdParty").''; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 7ac7fa66cea..aca5fe67d0d 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -453,7 +453,9 @@ class Project extends CommonObject function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='') { $elements = array(); - + + if ($this->id <= 0) return $elements; + if ($type == 'agenda') { $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id; @@ -929,6 +931,7 @@ class Project extends CommonObject $this->date_c = $now; $this->date_m = $now; $this->date_start = $now; + $this->date_end = $now + (3600 * 24 * 365); $this->note_public = 'SPECIMEN'; $this->fk_ele = 20000; $this->opp_amount = 20000; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 42ea013eade..481fd17f049 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -583,7 +583,7 @@ if (GETPOST("source") == 'contractline' && $valid) $duration=''; if ($contractline->fk_product) { - if ($product->isservice() && $product->duration_value > 0) + if ($product->isService() && $product->duration_value > 0) { $label=$langs->trans("Duration"); diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 23f81c4295b..dcb43c07170 100644 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -720,7 +720,7 @@ if (GETPOST("source") == 'contractline' && $valid) $duration=''; if ($contractline->fk_product) { - if ($product->isservice() && $product->duration_value > 0) + if ($product->isService() && $product->duration_value > 0) { $label=$langs->trans("Duration"); diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php index f1c00f94acf..7fec8e895b6 100644 --- a/htdocs/public/test/test_forms.php +++ b/htdocs/public/test/test_forms.php @@ -68,7 +68,6 @@ print "Test 4d: a select with ajax refresh and with onchange call of url
\n"; $selected=-1; print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '', 1); - print '

'."\n"; // Test5a: form->select_thirdparty diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 57049610390..0c84826cf47 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -43,7 +43,7 @@ class Societe extends CommonObject public $element='societe'; public $table_element = 'societe'; public $fk_element='fk_soc'; - protected $childtables=array("askpricesupplier","propal","commande","facture","contrat","facture_fourn","commande_fournisseur","projet"); // To test if we can delete object + protected $childtables=array("supplier_proposal","propal","commande","facture","contrat","facture_fourn","commande_fournisseur","projet"); // To test if we can delete object /** * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 3d234728a70..8477eb97788 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -37,6 +37,7 @@ $langs->load("companies"); $langs->load("customers"); $langs->load("suppliers"); $langs->load("bills"); +$langs->load("compta"); // Security check $socid = GETPOST('socid','int'); @@ -121,6 +122,55 @@ if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof6']='ProfId6'; if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode']='Gencod'; +// Define list of fields to show into list +$checkedcustomercode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0); +$checkedsuppliercode=(in_array($contextpage, array('supplierlist')) ? 1 : 0); +$checkedcustomeraccountcode=(in_array($contextpage, array('customerlist')) ? 1 : 0); +$checkedsupplieraccountcode=(in_array($contextpage, array('supplierlist')) ? 1 : 0); +$checkedtypetiers=1; +$checkedprofid1=0; +$checkedprofid2=0; +$checkedprofid3=0; +$checkedprofid4=0; +$checkedprofid5=0; +$checkedprofid6=0; +//$checkedprofid4=((($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') ? 1 : 0); +//$checkedprofid5=((($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') ? 1 : 0); +//$checkedprofid6=((($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') ? 1 : 0); +$checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0); +$checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0); +$arrayfields=array( + 's.nom'=>array('label'=>$langs->trans("Company"), 'checked'=>1), + 's.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))), + 's.code_client'=>array('label'=>$langs->trans("CustomerCodeShort"), 'checked'=>$checkedcustomercode), + 's.code_fournisseur'=>array('label'=>$langs->trans("SupplierCodeShort"), 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))), + 's.code_compta'=>array('label'=>$langs->trans("CustomerAccountancyCodeShort"), 'checked'=>$checkedcustomeraccountcode), + 's.code_compta_fournisseur'=>array('label'=>$langs->trans("SupplierAccountancyCodeShort"), 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))), + 's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1), + 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1), + 'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0), + 'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers), + 's.siren'=>array('label'=>$langs->trans("ProfId1Short"), 'checked'=>$checkedprofid1), + 's.siret'=>array('label'=>$langs->trans("ProfId2Short"), 'checked'=>$checkedprofid2), + 's.ape'=>array('label'=>$langs->trans("ProfId3Short"), 'checked'=>$checkedprofid3), + 's.idprof4'=>array('label'=>$langs->trans("ProfId4Short"), 'checked'=>$checkedprofid4), + 's.idprof5'=>array('label'=>$langs->trans("ProfId5Short"), 'checked'=>$checkedprofid5), + 's.idprof6'=>array('label'=>$langs->trans("ProfId6Short"), 'checked'=>$checkedprofid6), + 's.fk_prospectlevel'=>array('label'=>$langs->trans("ProspectLevelShort"), 'checked'=>$checkprospectlevel), + 's.fk_stcomm'=>array('label'=>$langs->trans("StatusProsp"), 'checked'=>$checkstcomm), + 's.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), + 's.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), + 's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), +); +// Extra fields +if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) +{ + foreach($extrafields->attribute_label as $key => $val) + { + $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); + } +} + /* @@ -489,56 +539,9 @@ if ($resql) print ''; } - // Define list of fields to show into list - $checkedcustomercode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0); - $checkedsuppliercode=(in_array($contextpage, array('supplierlist')) ? 1 : 0); - $checkedcustomeraccountcode=(in_array($contextpage, array('customerlist')) ? 1 : 0); - $checkedsupplieraccountcode=(in_array($contextpage, array('supplierlist')) ? 1 : 0); - $checkedtypetiers=1; - $checkedprofid1=0; - $checkedprofid2=0; - $checkedprofid3=0; - $checkedprofid4=0; - $checkedprofid5=0; - $checkedprofid6=0; - //$checkedprofid4=((($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') ? 1 : 0); - //$checkedprofid5=((($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') ? 1 : 0); - //$checkedprofid6=((($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') ? 1 : 0); - $checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0); - $checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0); - $arrayfields=array( - 's.nom'=>array('label'=>$langs->trans("Company"), 'checked'=>1), - 's.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))), - 's.code_client'=>array('label'=>$langs->trans("CustomerCodeShort"), 'checked'=>$checkedcustomercode), - 's.code_fournisseur'=>array('label'=>$langs->trans("SupplierCodeShort"), 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))), - 's.code_compta'=>array('label'=>$langs->trans("CustomerAccountancyCodeShort"), 'checked'=>$checkedcustomeraccountcode), - 's.code_compta_fournisseur'=>array('label'=>$langs->trans("SupplierAccountancyCodeShort"), 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))), - 's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1), - 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1), - 'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0), - 'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers), - 's.siren'=>array('label'=>$langs->trans("ProfId1Short"), 'checked'=>$checkedprofid1), - 's.siret'=>array('label'=>$langs->trans("ProfId2Short"), 'checked'=>$checkedprofid2), - 's.ape'=>array('label'=>$langs->trans("ProfId3Short"), 'checked'=>$checkedprofid3), - 's.idprof4'=>array('label'=>$langs->trans("ProfId4Short"), 'checked'=>$checkedprofid4), - 's.idprof5'=>array('label'=>$langs->trans("ProfId5Short"), 'checked'=>$checkedprofid5), - 's.idprof6'=>array('label'=>$langs->trans("ProfId6Short"), 'checked'=>$checkedprofid6), - 's.fk_prospectlevel'=>array('label'=>$langs->trans("ProspectLevelShort"), 'checked'=>$checkprospectlevel), - 's.fk_stcomm'=>array('label'=>$langs->trans("StatusProsp"), 'checked'=>$checkstcomm), - 's.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), - 's.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), - 's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), - ); - // Extra fields - if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) - { - foreach($extrafields->attribute_label as $key => $val) - { - $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); - } - } $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields + print ''; print ''; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 8b640040b80..b7465abe85b 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -2138,6 +2138,14 @@ else print ''; print ''; + print '
'.$langs->trans("ThirdPartyType").''.$object->typent.'
'.$langs->trans("Staff").''.$object->effectif.'
'; + + print ''; + print '
'; + + print '
'; + print ''; + // Legal print ''; @@ -2147,14 +2155,6 @@ else else print ' '; print ''; - print '
'.$langs->trans('JuridicalStatus').''.$object->forme_juridique.'
'; - - print '
'; - print '
'; - - print '
'; - print ''; - // Default language if (! empty($conf->global->MAIN_MULTILANGS)) { diff --git a/htdocs/comm/admin/askpricesupplier_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php similarity index 92% rename from htdocs/comm/admin/askpricesupplier_extrafields.php rename to htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php index 0fb0554203f..a7589566175 100644 --- a/htdocs/comm/admin/askpricesupplier_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php @@ -19,12 +19,12 @@ */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("companies"); $langs->load("admin"); -$langs->load('askpricesupplier'); +$langs->load('supplier_proposal'); $extrafields = new ExtraFields($db); $form = new Form($db); @@ -36,7 +36,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); $action=GETPOST('action', 'alpha'); $attrname=GETPOST('attrname', 'alpha'); -$elementtype='askpricesupplier'; //Must be the $table_element of the class that manage extrafield +$elementtype='supplier_proposal'; //Must be the $table_element of the class that manage extrafield if (!$user->admin) accessforbidden(); @@ -56,16 +56,16 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; $textobject=$langs->transnoentitiesnoconv("CommRequests"); -llxHeader('',$langs->trans("AskPriceSupplierSetup")); +llxHeader('',$langs->trans("SupplierProposalSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SupplierProposalSetup"),$linkback,'title_setup'); -$head = askpricesupplier_admin_prepare_head(); +$head = supplier_proposal_admin_prepare_head(); -dol_fiche_head($head, 'attributes', $langs->trans("CommRequests"), 0, 'askpricesupplier'); +dol_fiche_head($head, 'attributes', $langs->trans("CommRequests"), 0, 'supplier_proposal'); print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; diff --git a/htdocs/comm/admin/askpricesupplierdet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php similarity index 92% rename from htdocs/comm/admin/askpricesupplierdet_extrafields.php rename to htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php index 09c215d1f3d..12e5d2c23e6 100644 --- a/htdocs/comm/admin/askpricesupplierdet_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php @@ -22,7 +22,7 @@ */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; @@ -31,7 +31,7 @@ if (!$user->admin) $langs->load("admin"); $langs->load("other"); -$langs->load("askpricesupplier"); +$langs->load("supplier_proposal"); $extrafields = new ExtraFields($db); $form = new Form($db); @@ -44,7 +44,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); $action=GETPOST('action', 'alpha'); $attrname=GETPOST('attrname', 'alpha'); -$elementtype='askpricesupplierdet'; //Must be the $table_element of the class that manage extrafield +$elementtype='supplier_proposaldet'; //Must be the $table_element of the class that manage extrafield if (!$user->admin) accessforbidden(); @@ -63,14 +63,14 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; $textobject=$langs->transnoentitiesnoconv("CommRequests"); -llxHeader('',$langs->trans("AskPriceSupplierSetup")); +llxHeader('',$langs->trans("SupplierProposalSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup'); +print load_fiche_titre($langs->trans("SupplierProposalSetup"),$linkback,'title_setup'); -$head = askpricesupplier_admin_prepare_head(); +$head = supplier_proposal_admin_prepare_head(); -dol_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), 0, 'askpricesupplier'); +dol_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), 0, 'supplier_proposal'); print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/supplier_proposal/card.php similarity index 91% rename from htdocs/comm/askpricesupplier/card.php rename to htdocs/supplier_proposal/card.php index 389905c3d94..878d1c0df01 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/supplier_proposal/card.php @@ -25,15 +25,15 @@ * along with this program. If not, see . */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; -require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaskpricesupplier.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsupplier_proposal.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php'; -require_once DOL_DOCUMENT_ROOT . '/comm/askpricesupplier/class/askpricesupplier.class.php'; +require_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php'; require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; -require_once DOL_DOCUMENT_ROOT . '/core/modules/askpricesupplier/modules_askpricesupplier.php'; -require_once DOL_DOCUMENT_ROOT . '/core/lib/askpricesupplier.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_proposal/modules_supplier_proposal.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_proposal.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; if (! empty($conf->projet->enabled)) { @@ -42,7 +42,7 @@ if (! empty($conf->projet->enabled)) { } $langs->load('companies'); -$langs->load('askpricesupplier'); +$langs->load('supplier_proposal'); $langs->load('compta'); $langs->load('bills'); $langs->load('orders'); @@ -74,9 +74,9 @@ $NBLINES = 4; // Security check if (! empty($user->societe_id)) $socid = $user->societe_id; -$result = restrictedArea($user, 'askpricesupplier', $id); +$result = restrictedArea($user, 'supplier_proposal', $id); -$object = new AskPriceSupplier($db); +$object = new SupplierProposal($db); $extrafields = new ExtraFields($db); // fetch optionals attributes and labels @@ -92,9 +92,9 @@ if ($id > 0 || ! empty($ref)) { } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('askpricesuppliercard','globalcard')); +$hookmanager->initHooks(array('supplier_proposalcard','globalcard')); -$permissionnote = $user->rights->askpricesupplier->creer; // Used by the include of actions_setnotes.inc.php +$permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php /* @@ -134,11 +134,11 @@ if (empty($reshook)) } // Delete askprice - else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->askpricesupplier->supprimer) + else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->supplier_proposal->supprimer) { $result = $object->delete($user); if ($result > 0) { - header('Location: ' . DOL_URL_ROOT . '/comm/askpricesupplier/list.php'); + header('Location: ' . DOL_URL_ROOT . '/supplier_proposal/list.php'); exit(); } else { $langs->load("errors"); @@ -147,7 +147,7 @@ if (empty($reshook)) } // Remove line - else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->askpricesupplier->creer) + else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->supplier_proposal->creer) { $result = $object->deleteline($lineid); // reorder lines @@ -172,8 +172,8 @@ if (empty($reshook)) // Validation else if ($action == 'confirm_validate' && $confirm == 'yes' && - ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->creer)) - || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->validate))) + ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer)) + || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate))) ) { $result = $object->valid($user); @@ -205,7 +205,7 @@ if (empty($reshook)) } } - else if ($action == 'setdate_livraison' && $user->rights->askpricesupplier->creer) + else if ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer) { $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year'])); if ($result < 0) @@ -213,7 +213,7 @@ if (empty($reshook)) } // Create askprice - else if ($action == 'add' && $user->rights->askpricesupplier->creer) + else if ($action == 'add' && $user->rights->supplier_proposal->creer) { $object->socid = $socid; $object->fetch_thirdparty(); @@ -231,9 +231,9 @@ if (empty($reshook)) $db->begin(); // Si on a selectionne une demande a copier, on realise la copie - if (GETPOST('createmode') == 'copy' && GETPOST('copie_askpricesupplier')) + if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal')) { - if ($object->fetch(GETPOST('copie_askpricesupplier')) > 0) { + if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) { $object->ref = GETPOST('ref'); $object->date_livraison = $date_delivery; $object->shipping_method_id = GETPOST('shipping_method_id', 'int'); @@ -251,7 +251,7 @@ if (empty($reshook)) $id = $object->create_from($user); } else { - setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_askpricesupplier')), null, 'errors'); + setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_supplier_proposal')), null, 'errors'); } } else { $object->ref = GETPOST('ref'); @@ -291,8 +291,8 @@ if (empty($reshook)) { if ($origin && $originid) { - $element = 'comm/askpricesupplier'; - $subelement = 'askpricesupplier'; + $element = 'supplier_proposal'; + $subelement = 'supplier_proposal'; $object->origin = $origin; $object->origin_id = $originid; @@ -426,7 +426,7 @@ if (empty($reshook)) } // Reopen proposal - else if ($action == 'confirm_reopen' && $user->rights->askpricesupplier->cloturer && ! GETPOST('cancel')) { + else if ($action == 'confirm_reopen' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) { // prevent browser refresh from reopening proposal several times if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) { $object->reopen($user, 1); @@ -434,7 +434,7 @@ if (empty($reshook)) } // Close proposal - else if ($action == 'setstatut' && $user->rights->askpricesupplier->cloturer && ! GETPOST('cancel')) { + else if ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) { if (! GETPOST('statut')) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CloseAs")), null, 'errors'); $action = 'statut'; @@ -455,15 +455,15 @@ if (empty($reshook)) // Actions to send emails $actiontypecode='AC_ASKPRICE'; - $trigger_name='ASKPRICESUPPLIER_SENTBYMAIL'; + $trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL'; $paramname='id'; - $mode='emailfromaskpricesupplier'; + $mode='emailfromsupplier_proposal'; include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; // Go back to draft - if ($action == 'modif' && $user->rights->askpricesupplier->creer) + if ($action == 'modif' && $user->rights->supplier_proposal->creer) { $object->set_draft($user); @@ -481,7 +481,7 @@ if (empty($reshook)) } } - else if ($action == "setabsolutediscount" && $user->rights->askpricesupplier->creer) { + else if ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) { if ($_POST["remise_id"]) { if ($object->id > 0) { $result = $object->insert_discount($_POST["remise_id"]); @@ -493,7 +493,7 @@ if (empty($reshook)) } // Add line - else if ($action == 'addline' && $user->rights->askpricesupplier->creer) { + else if ($action == 'addline' && $user->rights->supplier_proposal->creer) { // Set if we used free entry or predefined product $predef=''; @@ -725,7 +725,7 @@ if (empty($reshook)) } // Mise a jour d'une ligne dans la demande de prix - else if ($action == 'updateligne' && $user->rights->askpricesupplier->creer && GETPOST('save') == $langs->trans("Save")) { + else if ($action == 'updateligne' && $user->rights->supplier_proposal->creer && GETPOST('save') == $langs->trans("Save")) { // Define info_bits $info_bits = 0; if (preg_match('/\*/', GETPOST('tva_tx'))) @@ -830,13 +830,13 @@ if (empty($reshook)) } } - else if ($action == 'updateligne' && $user->rights->askpricesupplier->creer && GETPOST('cancel') == $langs->trans('Cancel')) { + else if ($action == 'updateligne' && $user->rights->supplier_proposal->creer && GETPOST('cancel') == $langs->trans('Cancel')) { header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition exit(); } // Generation doc (depuis lien ou depuis cartouche doc) - else if ($action == 'builddoc' && $user->rights->askpricesupplier->creer) { + else if ($action == 'builddoc' && $user->rights->supplier_proposal->creer) { if (GETPOST('model')) { $object->setDocModel($user, GETPOST('model')); } @@ -858,12 +858,12 @@ if (empty($reshook)) } // Remove file in doc form - else if ($action == 'remove_file' && $user->rights->askpricesupplier->creer) { + else if ($action == 'remove_file' && $user->rights->supplier_proposal->creer) { if ($object->id > 0) { require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $langs->load("other"); - $upload_dir = $conf->askpricesupplier->dir_output; + $upload_dir = $conf->supplier_proposal->dir_output; $file = $upload_dir . '/' . GETPOST('file'); $ret = dol_delete_file($file, 0, 0, 0, $object); if ($ret) @@ -874,30 +874,30 @@ if (empty($reshook)) } // Set project - else if ($action == 'classin' && $user->rights->askpricesupplier->creer) { + else if ($action == 'classin' && $user->rights->supplier_proposal->creer) { $object->setProject($_POST['projectid']); } // Delai de livraison - else if ($action == 'setavailability' && $user->rights->askpricesupplier->creer) { + else if ($action == 'setavailability' && $user->rights->supplier_proposal->creer) { $result = $object->availability($_POST['availability_id']); } // Conditions de reglement - else if ($action == 'setconditions' && $user->rights->askpricesupplier->creer) { + else if ($action == 'setconditions' && $user->rights->supplier_proposal->creer) { $result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int')); } - else if ($action == 'setremisepercent' && $user->rights->askpricesupplier->creer) { + else if ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) { $result = $object->set_remise_percent($user, $_POST['remise_percent']); } - else if ($action == 'setremiseabsolue' && $user->rights->askpricesupplier->creer) { + else if ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) { $result = $object->set_remise_absolue($user, $_POST['remise_absolue']); } // Mode de reglement - else if ($action == 'setmode' && $user->rights->askpricesupplier->creer) { + else if ($action == 'setmode' && $user->rights->supplier_proposal->creer) { $result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int')); } @@ -905,7 +905,7 @@ if (empty($reshook)) * Ordonnancement des lignes */ - else if ($action == 'up' && $user->rights->askpricesupplier->creer) { + else if ($action == 'up' && $user->rights->supplier_proposal->creer) { $object->line_up(GETPOST('rowid')); if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { @@ -924,7 +924,7 @@ if (empty($reshook)) exit(); } - else if ($action == 'down' && $user->rights->askpricesupplier->creer) { + else if ($action == 'down' && $user->rights->supplier_proposal->creer) { $object->line_down(GETPOST('rowid')); if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { @@ -950,7 +950,7 @@ if (empty($reshook)) if (! $error) { // Actions on extra fields (by external module or standard code) - $hookmanager->initHooks(array('askpricesupplierdao')); + $hookmanager->initHooks(array('supplier_proposaldao')); $parameters = array('id' => $object->id); $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been // modified by @@ -979,7 +979,7 @@ llxHeader('', $langs->trans('CommRequests'), 'EN:Ask_Price_Supplier|FR:Demande_d $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); -$formaskpricesupplier = new FormAskPriceSupplier($db); +$formsupplier_proposal = new FormSupplierProposal($db); $formmargin = new FormMargin($db); $companystatic = new Societe($db); @@ -997,8 +997,8 @@ if ($action == 'create') // Load objectsrc if (! empty($origin) && ! empty($originid)) { - $element = 'comm/askpricesupplier'; - $subelement = 'askpricesupplier'; + $element = 'supplier_proposal'; + $subelement = 'supplier_proposal'; dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); @@ -1025,7 +1025,7 @@ if ($action == 'create') } - $object = new AskPriceSupplier($db); + $object = new SupplierProposal($db); print ''; print ''; @@ -1100,8 +1100,8 @@ if ($action == 'create') print ''; print ''; print '"; // Project @@ -1177,10 +1177,10 @@ if ($action == 'create') * Combobox pour la fonction de copie */ - if (empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE)) print ''; + if (empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print ''; - if (! empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '
' . $langs->trans("DefaultModel") . ''; - $liste = ModelePDFAskPriceSupplier::liste_modeles($db); - print $form->selectarray('model', $liste, ($conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_DEFAULT ? $conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_DEFAULT : $conf->global->ASKPRICESUPPLIER_ADDON_PDF)); + $liste = ModelePDFSupplierProposal::liste_modeles($db); + print $form->selectarray('model', $liste, ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)); print "
'; - if (! empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE)) + if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '
'; + if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) { // For backward compatibility print ''; @@ -1191,7 +1191,7 @@ if ($action == 'create') $liste_ask [0] = ''; $sql = "SELECT p.rowid as id, p.ref, s.nom"; - $sql .= " FROM " . MAIN_DB_PREFIX . "askpricesupplier p"; + $sql .= " FROM " . MAIN_DB_PREFIX . "supplier_proposal p"; $sql .= ", " . MAIN_DB_PREFIX . "societe s"; $sql .= " WHERE s.rowid = p.fk_soc"; $sql .= " AND p.entity = " . $conf->entity; @@ -1208,7 +1208,7 @@ if ($action == 'create') $liste_ask [$row [0]] = $askPriceSupplierRefAndSocName; $i ++; } - print $form->selectarray("copie_askpricesupplier", $liste_ask, 0); + print $form->selectarray("copie_supplier_proposal", $liste_ask, 0); } else { dol_print_error($db); } @@ -1249,7 +1249,7 @@ if ($action == 'create') } print ''; } - if (! empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '
'; + if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '
'; dol_fiche_end(); @@ -1284,8 +1284,8 @@ if ($action == 'create') $soc = new Societe($db); $soc->fetch($object->socid); - $head = askpricesupplier_prepare_head($object); - dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), 0, 'askpricesupplier'); + $head = supplier_proposal_prepare_head($object); + dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), 0, 'supplier_proposal'); $formconfirm = ''; @@ -1338,7 +1338,7 @@ if ($action == 'create') require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php'; $notify = new Notify($db); $text .= '
'; - $text .= $notify->confirmMessage('ASKPRICESUPPLIER_VALIDATE', $object->socid, $object); + $text .= $notify->confirmMessage('SUPPLIER_PROPOSAL_VALIDATE', $object->socid, $object); } if (! $error) @@ -1357,7 +1357,7 @@ if ($action == 'create') print ''; - $linkback = '' . $langs->trans("BackToList") . ''; + $linkback = '' . $langs->trans("BackToList") . ''; // Ref print '
' . $langs->trans('Ref') . ''; @@ -1431,7 +1431,7 @@ if ($action == 'create') print '
'; print ''; - if ($user->rights->askpricesupplier->creer) { + if ($user->rights->supplier_proposal->creer) { if ($action != 'classify') print ''; print '
'; print $langs->trans('Project') . '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '
'; @@ -1479,7 +1479,7 @@ if ($action == 'create') print ''; - if ($action != 'editbankaccount' && $user->rights->askpricesupplier->creer) + if ($action != 'editbankaccount' && $user->rights->supplier_proposal->creer) print ''; print '
'; print $langs->trans('BankAccount'); print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'
'; print '		'; @@ -1574,7 +1574,7 @@ if ($action == 'create') $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1); // Form to add new line - if ($object->statut == 0 && $user->rights->askpricesupplier->creer) + if ($object->statut == 0 && $user->rights->supplier_proposal->creer) { if ($action != 'editline') { @@ -1600,7 +1600,7 @@ if ($action == 'create') * Form to close proposal (signed or not) */ $form_close = ''; - $form_close .= '

'.$langs->trans('AskPriceSupplierRefFournNotice').'

'; + $form_close .= '

'.$langs->trans('SupplierProposalRefFournNotice').'

'; $form_close .= ''; $form_close .= ''; $form_close .= '
' . $langs->trans("CloseAs") . ''; @@ -1639,8 +1639,8 @@ if ($action == 'create') { // Validate if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 && - ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->creer)) - || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->validate))) + ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer)) + || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate))) ) { if (count($object->lines) > 0) print '
' . $langs->trans('Validate') . '
'; @@ -1648,19 +1648,19 @@ if ($action == 'create') } // Edit - if ($object->statut == 1 && $user->rights->askpricesupplier->creer) { + if ($object->statut == 1 && $user->rights->supplier_proposal->creer) { print '
' . $langs->trans('Modify') . '
'; } // ReOpen - if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->askpricesupplier->cloturer) { + if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->supplier_proposal->cloturer) { print '
global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"'; print '>' . $langs->trans('ReOpen') . '
'; } // Send if ($object->statut == 1 || $object->statut == 2) { - if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->askpricesupplier->send) { + if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send) { print '
' . $langs->trans('SendByMail') . '
'; } else print '
' . $langs->trans('SendByMail') . '
'; @@ -1674,18 +1674,18 @@ if ($action == 'create') } // Close - if ($object->statut == 1 && $user->rights->askpricesupplier->cloturer) { + if ($object->statut == 1 && $user->rights->supplier_proposal->cloturer) { print '
global->MAIN_JUMP_TAG) ? '' : '#close') . '"'; print '>' . $langs->trans('Close') . '
'; } // Clone - if ($user->rights->askpricesupplier->creer) { + if ($user->rights->supplier_proposal->creer) { print '
' . $langs->trans("ToClone") . '
'; } // Delete - if ($user->rights->askpricesupplier->supprimer) { + if ($user->rights->supplier_proposal->supprimer) { print '
' . $langs->trans('Delete') . '
'; } @@ -1704,14 +1704,14 @@ if ($action == 'create') * Documents generes */ $filename = dol_sanitizeFileName($object->ref); - $filedir = $conf->askpricesupplier->dir_output . "/" . dol_sanitizeFileName($object->ref); + $filedir = $conf->supplier_proposal->dir_output . "/" . dol_sanitizeFileName($object->ref); $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id; - $genallowed = $user->rights->askpricesupplier->creer; - $delallowed = $user->rights->askpricesupplier->supprimer; + $genallowed = $user->rights->supplier_proposal->creer; + $delallowed = $user->rights->supplier_proposal->supprimer; $var = true; - $somethingshown = $formfile->show_documents('askpricesupplier', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); + $somethingshown = $formfile->show_documents('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); // Linked object block $somethingshown = $form->showLinkedObjectBlock($object); @@ -1725,7 +1725,7 @@ if ($action == 'create') // List of actions on element include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; $formactions = new FormActions($db); - $somethingshown = $formactions->showactions($object, 'askpricesupplier', $socid); + $somethingshown = $formactions->showactions($object, 'supplier_proposal', $socid); print ''; } @@ -1742,7 +1742,7 @@ if ($action == 'create') $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($conf->askpricesupplier->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); + $fileparams = dol_most_recent_file($conf->supplier_proposal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); $file = $fileparams['fullname']; // Define output language @@ -1768,7 +1768,7 @@ if ($action == 'create') dol_print_error($db, $object->error, $object->errors); exit(); } - $fileparams = dol_most_recent_file($conf->askpricesupplier->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); + $fileparams = dol_most_recent_file($conf->supplier_proposal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); $file = $fileparams['fullname']; } @@ -1786,6 +1786,16 @@ if ($action == 'create') $formmail->fromid = $user->id; $formmail->fromname = $user->getFullName($langs); $formmail->frommail = $user->email; + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set + { + $formmail->trackid='spr'.$object->id; + } + if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set + { + include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'spr'.$object->id); + } + $formmail->withfrom = 1; $liste = array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) @@ -1811,7 +1821,7 @@ if ($action == 'create') // Tableau des parametres complementaires $formmail->param['action'] = 'send'; - $formmail->param['models'] = 'askpricesupplier_send'; + $formmail->param['models'] = 'supplier_proposal_send'; $formmail->param['models_id']=GETPOST('modelmailselected','int'); $formmail->param['id'] = $object->id; $formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id; diff --git a/htdocs/core/modules/askpricesupplier/index.html b/htdocs/supplier_proposal/class/index.html similarity index 100% rename from htdocs/core/modules/askpricesupplier/index.html rename to htdocs/supplier_proposal/class/index.html diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php similarity index 88% rename from htdocs/comm/askpricesupplier/class/askpricesupplier.class.php rename to htdocs/supplier_proposal/class/supplier_proposal.class.php index 2f563a17b1b..57fc7e50838 100644 --- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -27,8 +27,8 @@ */ /** - * \file htdocs/comm/propal/class/propal.class.php - * \brief File of class to manage proposals + * \file htdocs/supplier_proposal/class/supplier_propal.class.php + * \brief File of class to manage supplier proposals */ require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.product.class.php'; @@ -40,12 +40,12 @@ require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php'; /** * Class to manage price ask supplier */ -class AskPriceSupplier extends CommonObject +class SupplierProposal extends CommonObject { - public $element='askpricesupplier'; - public $table_element='askpricesupplier'; - public $table_element_line='askpricesupplierdet'; - public $fk_element='fk_askpricesupplier'; + public $element='supplier_proposal'; + public $table_element='supplier_proposal'; + public $table_element_line='supplier_proposaldet'; + public $fk_element='fk_supplier_proposal'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe /** @@ -136,31 +136,31 @@ class AskPriceSupplier extends CommonObject * * @param DoliDB $db Database handler * @param int $socid Id third party - * @param int $askpricesupplierid Id askpricesupplier + * @param int $supplier_proposalid Id supplier_proposal */ - function __construct($db, $socid="", $askpricesupplierid=0) + function __construct($db, $socid="", $supplier_proposalid=0) { global $conf,$langs; $this->db = $db; $this->socid = $socid; - $this->id = $askpricesupplierid; + $this->id = $supplier_proposalid; $this->products = array(); $this->remise = 0; $this->remise_percent = 0; $this->remise_absolue = 0; - $langs->load("askpricesupplier"); - $this->labelstatut[0]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_DRAFT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_DRAFT_LABEL : $langs->trans("AskpricesupplierStatusDraft")); - $this->labelstatut[1]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_VALIDATED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_VALIDATED_LABEL : $langs->trans("AskpricesupplierStatusValidated")); - $this->labelstatut[2]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_SIGNED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_SIGNED_LABEL : $langs->trans("AskpricesupplierStatusSigned")); - $this->labelstatut[3]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNED_LABEL : $langs->trans("AskpricesupplierStatusNotSigned")); - $this->labelstatut[4]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_BILLED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_BILLED_LABEL : $langs->trans("AskpricesupplierStatusBilled")); - $this->labelstatut_short[0]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_DRAFTSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_DRAFTSHORT_LABEL : $langs->trans("AskpricesupplierStatusDraftShort")); - $this->labelstatut_short[1]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened")); - $this->labelstatut_short[2]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_SIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusSignedShort")); - $this->labelstatut_short[3]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusNotSignedShort")); - $this->labelstatut_short[4]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_BILLEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_BILLEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusBilledShort")); + $langs->load("supplier_proposal"); + $this->labelstatut[0]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFT_LABEL : $langs->trans("AskpricesupplierStatusDraft")); + $this->labelstatut[1]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATED_LABEL : $langs->trans("AskpricesupplierStatusValidated")); + $this->labelstatut[2]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNED_LABEL : $langs->trans("AskpricesupplierStatusSigned")); + $this->labelstatut[3]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNED_LABEL : $langs->trans("AskpricesupplierStatusNotSigned")); + $this->labelstatut[4]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_BILLED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_BILLED_LABEL : $langs->trans("AskpricesupplierStatusBilled")); + $this->labelstatut_short[0]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("AskpricesupplierStatusDraftShort")); + $this->labelstatut_short[1]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened")); + $this->labelstatut_short[2]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusSignedShort")); + $this->labelstatut_short[3]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusNotSignedShort")); + $this->labelstatut_short[4]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusBilledShort")); } @@ -205,7 +205,7 @@ class AskPriceSupplier extends CommonObject $price = $prod->price; } - $line = new AskPriceSupplierLine($this->db); + $line = new SupplierProposalLine($this->db); $line->fk_product=$idproduct; $line->desc=$productdesc; @@ -245,27 +245,27 @@ class AskPriceSupplier extends CommonObject return -5; } - $askpricesupplierligne=new AskPriceSupplierLine($this->db); - $askpricesupplierligne->fk_askpricesupplier=$this->id; - $askpricesupplierligne->fk_remise_except=$remise->id; - $askpricesupplierligne->desc=$remise->description; // Description ligne - $askpricesupplierligne->tva_tx=$remise->tva_tx; - $askpricesupplierligne->subprice=-$remise->amount_ht; - $askpricesupplierligne->fk_product=0; // Id produit predefini - $askpricesupplierligne->qty=1; - $askpricesupplierligne->remise=0; - $askpricesupplierligne->remise_percent=0; - $askpricesupplierligne->rang=-1; - $askpricesupplierligne->info_bits=2; + $supplier_proposalligne=new SupplierProposalLine($this->db); + $supplier_proposalligne->fk_supplier_proposal=$this->id; + $supplier_proposalligne->fk_remise_except=$remise->id; + $supplier_proposalligne->desc=$remise->description; // Description ligne + $supplier_proposalligne->tva_tx=$remise->tva_tx; + $supplier_proposalligne->subprice=-$remise->amount_ht; + $supplier_proposalligne->fk_product=0; // Id produit predefini + $supplier_proposalligne->qty=1; + $supplier_proposalligne->remise=0; + $supplier_proposalligne->remise_percent=0; + $supplier_proposalligne->rang=-1; + $supplier_proposalligne->info_bits=2; // TODO deprecated - $askpricesupplierligne->price=-$remise->amount_ht; + $supplier_proposalligne->price=-$remise->amount_ht; - $askpricesupplierligne->total_ht = -$remise->amount_ht; - $askpricesupplierligne->total_tva = -$remise->amount_tva; - $askpricesupplierligne->total_ttc = -$remise->amount_ttc; + $supplier_proposalligne->total_ht = -$remise->amount_ht; + $supplier_proposalligne->total_tva = -$remise->amount_tva; + $supplier_proposalligne->total_ttc = -$remise->amount_ttc; - $result=$askpricesupplierligne->insert(); + $result=$supplier_proposalligne->insert(); if ($result > 0) { $result=$this->update_price(1); @@ -282,7 +282,7 @@ class AskPriceSupplier extends CommonObject } else { - $this->error=$askpricesupplierligne->error; + $this->error=$supplier_proposalligne->error; $this->db->rollback(); return -2; } @@ -329,7 +329,7 @@ class AskPriceSupplier extends CommonObject { global $mysoc; - dol_syslog(get_class($this)."::addline askpricesupplierid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type"); + dol_syslog(get_class($this)."::addline supplier_proposalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type"); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters @@ -369,7 +369,8 @@ class AskPriceSupplier extends CommonObject // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, '', $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -396,9 +397,9 @@ class AskPriceSupplier extends CommonObject } // Insert line - $this->line=new AskPriceSupplierLine($this->db); + $this->line=new SupplierProposalLine($this->db); - $this->line->fk_askpricesupplier=$this->id; + $this->line->fk_supplier_proposal=$this->id; $this->line->label=$label; $this->line->desc=$desc; $this->line->qty=$qty; @@ -528,7 +529,8 @@ class AskPriceSupplier extends CommonObject // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc); - + $txtva = preg_replace('/\s*\(.*\)/','',$txtva); // Remove code into vatrate. + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type,'', $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; @@ -545,10 +547,10 @@ class AskPriceSupplier extends CommonObject } // Update line - $this->line=new AskPriceSupplierLine($this->db); + $this->line=new SupplierProposalLine($this->db); // Stock previous line records - $staticline=new AskPriceSupplierLine($this->db); + $staticline=new SupplierProposalLine($this->db); $staticline->fetch($rowid); $this->line->oldline = $staticline; @@ -610,7 +612,7 @@ class AskPriceSupplier extends CommonObject $this->update_price(1); - $this->fk_askpricesupplier = $this->id; + $this->fk_supplier_proposal = $this->id; $this->rowid = $rowid; $this->db->commit(); @@ -641,7 +643,7 @@ class AskPriceSupplier extends CommonObject { if ($this->statut == 0) { - $line=new AskPriceSupplierLine($this->db); + $line=new SupplierProposalLine($this->db); // For triggers $line->fetch($lineid); @@ -706,7 +708,7 @@ class AskPriceSupplier extends CommonObject $this->db->begin(); // Insert into database - $sql = "INSERT INTO ".MAIN_DB_PREFIX."askpricesupplier ("; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal ("; $sql.= "fk_soc"; $sql.= ", price"; $sql.= ", remise"; @@ -755,12 +757,12 @@ class AskPriceSupplier extends CommonObject $resql=$this->db->query($sql); if ($resql) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."askpricesupplier"); + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."supplier_proposal"); if ($this->id) { $this->ref='(PROV'.$this->id.')'; - $sql = 'UPDATE '.MAIN_DB_PREFIX."askpricesupplier SET ref='".$this->ref."' WHERE rowid=".$this->id; + $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->ref."' WHERE rowid=".$this->id; dol_syslog(get_class($this)."::create", LOG_DEBUG); $resql=$this->db->query($sql); @@ -834,7 +836,7 @@ class AskPriceSupplier extends CommonObject $action='update'; // Actions on extra fields (by external module or standard code) - $hookmanager->initHooks(array('askpricesupplierdao')); + $hookmanager->initHooks(array('supplier_proposaldao')); $parameters=array('socid'=>$this->id); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if (empty($reshook)) @@ -853,7 +855,7 @@ class AskPriceSupplier extends CommonObject if (! $notrigger) { // Call trigger - $result=$this->call_trigger('ASKPRICESUPPLIER_CREATE',$user); + $result=$this->call_trigger('SUPPLIER_PROPOSAL_CREATE',$user); if ($result < 0) { $error++; } // End call triggers } @@ -893,7 +895,7 @@ class AskPriceSupplier extends CommonObject /** - * Insert into DB a askpricesupplier object completely defined by its data members (ex, results from copy). + * Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy). * * @param User $user User that create * @return int Id of the new object if ok, <0 if ko @@ -951,7 +953,7 @@ class AskPriceSupplier extends CommonObject $this->id=0; $this->statut=0; - if (empty($conf->global->ASKPRICESUPPLIER_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/askpricesupplier/".$conf->global->ASKPRICESUPPLIER_ADDON.".php")) + if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php")) { $this->error='ErrorSetupNotComplete'; return -1; @@ -963,10 +965,10 @@ class AskPriceSupplier extends CommonObject $this->date = $now; // Set ref - require_once DOL_DOCUMENT_ROOT ."/core/modules/askpricesupplier/".$conf->global->ASKPRICESUPPLIER_ADDON.'.php'; - $obj = $conf->global->ASKPRICESUPPLIER_ADDON; - $modAskPriceSupplier = new $obj; - $this->ref = $modAskPriceSupplier->getNextValue($objsoc,$this); + require_once DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php'; + $obj = $conf->global->SUPPLIER_PROPOSAL_ADDON; + $modSupplierProposal = new $obj; + $this->ref = $modSupplierProposal->getNextValue($objsoc,$this); // Create clone $result=$this->create($user); @@ -984,7 +986,7 @@ class AskPriceSupplier extends CommonObject } // Call trigger - $result=$this->call_trigger('ASKPRICESUPPLIER_CLONE',$user); + $result=$this->call_trigger('SUPPLIER_PROPOSAL_CLONE',$user); if ($result < 0) { $error++; } // End call triggers } @@ -1029,7 +1031,7 @@ class AskPriceSupplier extends CommonObject $sql.= ", c.label as statut_label"; $sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc"; $sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."askpricesupplier as p"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p"; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid'; $sql.= " WHERE p.fk_statut = c.id"; @@ -1107,13 +1109,13 @@ class AskPriceSupplier extends CommonObject /* * Lignes askprice liees a un produit ou non */ - $sql = "SELECT d.rowid, d.fk_askpricesupplier, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,"; + $sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,"; $sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,"; $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,'; $sql.= ' d.ref_fourn as ref_produit_fourn'; - $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplierdet as d"; + $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid"; - $sql.= " WHERE d.fk_askpricesupplier = ".$this->id; + $sql.= " WHERE d.fk_supplier_proposal = ".$this->id; $sql.= " ORDER by d.rang"; $result = $this->db->query($sql); @@ -1126,10 +1128,10 @@ class AskPriceSupplier extends CommonObject { $objp = $this->db->fetch_object($result); - $line = new AskPriceSupplierLine($this->db); + $line = new SupplierProposalLine($this->db); $line->rowid = $objp->rowid; - $line->fk_askpricesupplier = $objp->fk_askpricesupplier; + $line->fk_supplier_proposal = $objp->fk_supplier_proposal; $line->fk_parent_line = $objp->fk_parent_line; $line->product_type = $objp->product_type; $line->label = $objp->custom_label; @@ -1211,7 +1213,7 @@ class AskPriceSupplier extends CommonObject $action='update'; // Actions on extra fields (by external module or standard code) - $hookmanager->initHooks(array('askpricesupplierdao')); + $hookmanager->initHooks(array('supplier_proposaldao')); $parameters=array('id'=>$this->id); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if (empty($reshook)) @@ -1254,8 +1256,8 @@ class AskPriceSupplier extends CommonObject $error=0; $now=dol_now(); - if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->creer)) - || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->validate))) + if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer)) + || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate))) { $this->db->begin(); @@ -1274,7 +1276,7 @@ class AskPriceSupplier extends CommonObject } $this->newref = $num; - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier"; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal"; $sql.= " SET ref = '".$num."',"; $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id; $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; @@ -1291,7 +1293,7 @@ class AskPriceSupplier extends CommonObject if (! $error && ! $notrigger) { // Call trigger - $result=$this->call_trigger('ASKPRICESUPPLIER_VALIDATE',$user); + $result=$this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE',$user); if ($result < 0) { $error++; } // End call triggers } @@ -1307,8 +1309,8 @@ class AskPriceSupplier extends CommonObject // to not lose the linked files $oldref = dol_sanitizeFileName($this->ref); $newref = dol_sanitizeFileName($num); - $dirsource = $conf->askpricesupplier->dir_output.'/'.$oldref; - $dirdest = $conf->askpricesupplier->dir_output.'/'.$newref; + $dirsource = $conf->supplier_proposal->dir_output.'/'.$oldref; + $dirdest = $conf->supplier_proposal->dir_output.'/'.$newref; if (file_exists($dirsource)) { @@ -1317,7 +1319,7 @@ class AskPriceSupplier extends CommonObject { dol_syslog("Rename ok"); // Rename docs starting with $oldref with $newref - $listoffiles=dol_dir_list($conf->askpricesupplier->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + $listoffiles=dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/')); foreach($listoffiles as $fileentry) { $dirsource=$fileentry['name']; @@ -1356,9 +1358,9 @@ class AskPriceSupplier extends CommonObject */ function set_date_livraison($user, $date_livraison) { - if (! empty($user->rights->askpricesupplier->creer)) + if (! empty($user->rights->supplier_proposal->creer)) { - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier "; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal "; $sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null'); $sql.= " WHERE rowid = ".$this->id; @@ -1387,11 +1389,11 @@ class AskPriceSupplier extends CommonObject { $remise=trim($remise)?trim($remise):0; - if (! empty($user->rights->askpricesupplier->creer)) + if (! empty($user->rights->supplier_proposal->creer)) { $remise = price2num($remise); - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier SET remise_percent = ".$remise; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise; $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; if ($this->db->query($sql) ) @@ -1420,11 +1422,11 @@ class AskPriceSupplier extends CommonObject { $remise=trim($remise)?trim($remise):0; - if (! empty($user->rights->askpricesupplier->creer)) + if (! empty($user->rights->supplier_proposal->creer)) { $remise = price2num($remise); - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier "; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal "; $sql.= " SET remise_absolue = ".$remise; $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; @@ -1460,7 +1462,7 @@ class AskPriceSupplier extends CommonObject $this->statut = $statut; $error=0; - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier"; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal"; $sql.= " SET fk_statut = ".$this->statut.","; if (! empty($note)) $sql.= " note_private = '".$this->db->escape($note)."',"; $sql.= " date_cloture=NULL, fk_user_cloture=NULL"; @@ -1478,7 +1480,7 @@ class AskPriceSupplier extends CommonObject if (! $notrigger) { // Call trigger - $result=$this->call_trigger('ASKPRICESUPPLIER_REOPEN',$user); + $result=$this->call_trigger('SUPPLIER_PROPOSAL_REOPEN',$user); if ($result < 0) { $error++; } // End call triggers } @@ -1524,20 +1526,20 @@ class AskPriceSupplier extends CommonObject $this->db->begin(); - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier"; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal"; $sql.= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id; $sql.= " WHERE rowid = ".$this->id; $resql=$this->db->query($sql); if ($resql) { - $modelpdf=$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_CLOSED?$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_CLOSED:$this->modelpdf; - $trigger_name='ASKPRICESUPPLIER_CLOSE_REFUSED'; + $modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED:$this->modelpdf; + $trigger_name='SUPPLIER_PROPOSAL_CLOSE_REFUSED'; if ($statut == 2) { - $trigger_name='ASKPRICESUPPLIER_CLOSE_SIGNED'; - $modelpdf=$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_TOBILL?$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_TOBILL:$this->modelpdf; + $trigger_name='SUPPLIER_PROPOSAL_CLOSE_SIGNED'; + $modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf; // The connected company is classified as a client $soc=new Societe($this->db); @@ -1557,7 +1559,7 @@ class AskPriceSupplier extends CommonObject } if ($statut == 4) { - $trigger_name='ASKPRICESUPPLIER_CLASSIFY_BILLED'; + $trigger_name='SUPPLIER_PROPOSAL_CLASSIFY_BILLED'; } if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) @@ -1695,7 +1697,7 @@ class AskPriceSupplier extends CommonObject { global $conf,$langs; - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier SET fk_statut = 0"; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET fk_statut = 0"; $sql.= " WHERE rowid = ".$this->id; if ($this->db->query($sql)) @@ -1731,10 +1733,10 @@ class AskPriceSupplier extends CommonObject $ga = array(); $sql = "SELECT s.rowid, s.nom as name, s.client,"; - $sql.= " p.rowid as askpricesupplierid, p.fk_statut, p.total_ht, p.ref, p.remise, "; + $sql.= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, "; $sql.= " p.datep as dp, p.fin_validite as datelimite"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user"; - $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."askpricesupplier as p, ".MAIN_DB_PREFIX."c_propalst as c"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.entity = ".$conf->entity; $sql.= " AND p.fk_soc = s.rowid"; @@ -1762,15 +1764,15 @@ class AskPriceSupplier extends CommonObject if ($shortlist == 1) { - $ga[$obj->askpricesupplierid] = $obj->ref; + $ga[$obj->supplier_proposalid] = $obj->ref; } else if ($shortlist == 2) { - $ga[$obj->askpricesupplierid] = $obj->ref.' ('.$obj->name.')'; + $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')'; } else { - $ga[$i]['id'] = $obj->askpricesupplierid; + $ga[$i]['id'] = $obj->supplier_proposalid; $ga[$i]['ref'] = $obj->ref; $ga[$i]['name'] = $obj->name; } @@ -1806,17 +1808,17 @@ class AskPriceSupplier extends CommonObject if (! $notrigger) { // Call trigger - $result=$this->call_trigger('ASKPRICESUPPLIER_DELETE',$user); + $result=$this->call_trigger('SUPPLIER_PROPOSAL_DELETE',$user); if ($result < 0) { $error++; } // End call triggers } if (! $error) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplierdet WHERE fk_askpricesupplier = ".$this->id; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id; if ($this->db->query($sql)) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplier WHERE rowid = ".$this->id; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal WHERE rowid = ".$this->id; if ($this->db->query($sql)) { // Delete linked object @@ -1827,9 +1829,9 @@ class AskPriceSupplier extends CommonObject { // We remove directory $ref = dol_sanitizeFileName($this->ref); - if ($conf->askpricesupplier->dir_output && !empty($this->ref)) + if ($conf->supplier_proposal->dir_output && !empty($this->ref)) { - $dir = $conf->askpricesupplier->dir_output . "/" . $ref ; + $dir = $conf->supplier_proposal->dir_output . "/" . $ref ; $file = $dir . "/" . $ref . ".pdf"; if (file_exists($file)) { @@ -1907,7 +1909,7 @@ class AskPriceSupplier extends CommonObject } /** - * Object AskPriceSupplier Information + * Object SupplierProposal Information * * @param int $id Proposal id * @return void @@ -1917,7 +1919,7 @@ class AskPriceSupplier extends CommonObject $sql = "SELECT c.rowid, "; $sql.= " c.datec, c.date_valid as datev, c.date_cloture as dateo,"; $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture"; - $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c"; + $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c"; $sql.= " WHERE c.rowid = ".$id; $result = $this->db->query($sql); @@ -1985,7 +1987,7 @@ class AskPriceSupplier extends CommonObject function LibStatut($statut,$mode=1) { global $langs; - $langs->load("askpricesupplier"); + $langs->load("supplier_proposal"); if ($statut==0) $statuttrans='statut0'; if ($statut==1) $statuttrans='statut1'; @@ -2019,7 +2021,7 @@ class AskPriceSupplier extends CommonObject $clause = " WHERE"; $sql = "SELECT p.rowid, p.ref, p.datec as datec"; - $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as p"; + $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p"; if (!$user->rights->societe->client->voir && !$user->societe_id) { $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc"; @@ -2034,8 +2036,8 @@ class AskPriceSupplier extends CommonObject $resql=$this->db->query($sql); if ($resql) { - if ($mode == 'opened') $delay_warning=$conf->askpricesupplier->cloture->warning_delay; - if ($mode == 'signed') $delay_warning=$conf->askpricesupplier->facturation->warning_delay; + if ($mode == 'opened') $delay_warning=$conf->supplier_proposal->cloture->warning_delay; + if ($mode == 'signed') $delay_warning=$conf->supplier_proposal->facturation->warning_delay; // This assignment in condition is not a bug. It allows walking the results. while ($obj=$this->db->fetch_object($resql)) @@ -2108,7 +2110,7 @@ class AskPriceSupplier extends CommonObject $xnbp = 0; while ($xnbp < $nbp) { - $line=new AskPriceSupplierLine($this->db); + $line=new SupplierProposalLine($this->db); $line->desc=$langs->trans("Description")." ".$xnbp; $line->qty=1; $line->subprice=100; @@ -2157,7 +2159,7 @@ class AskPriceSupplier extends CommonObject $clause = "WHERE"; $sql = "SELECT count(p.rowid) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as p"; + $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid"; if (!$user->rights->societe->client->voir && !$user->societe_id) { @@ -2189,7 +2191,7 @@ class AskPriceSupplier extends CommonObject /** * Returns the reference to the following non used Proposal used depending on the active numbering module - * defined into ASKPRICESUPPLIER_ADDON + * defined into SUPPLIER_PROPOSAL_ADDON * * @param Societe $soc Object thirdparty * @return string Reference libre pour la propale @@ -2197,20 +2199,20 @@ class AskPriceSupplier extends CommonObject function getNextNumRef($soc) { global $conf, $db, $langs; - $langs->load("askpricesupplier"); + $langs->load("supplier_proposal"); - if (! empty($conf->global->ASKPRICESUPPLIER_ADDON)) + if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON)) { $mybool=false; - $file = $conf->global->ASKPRICESUPPLIER_ADDON.".php"; - $classname = $conf->global->ASKPRICESUPPLIER_ADDON; + $file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php"; + $classname = $conf->global->SUPPLIER_PROPOSAL_ADDON; // Include file with class $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); foreach ($dirmodels as $reldir) { - $dir = dol_buildpath($reldir."core/modules/askpricesupplier/"); + $dir = dol_buildpath($reldir."core/modules/supplier_proposal/"); // Load file with numbering class (if found) $mybool|=@include_once $dir.$file; @@ -2260,14 +2262,14 @@ class AskPriceSupplier extends CommonObject $label=$langs->trans("ShowAskpricesupplier").': '.$this->ref; $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; if ($option == '') { - $link = 'load("supplier_proposal"); // Positionne le modele sur le nom du modele a utiliser if (! dol_strlen($modele)) { - if (! empty($conf->global->ASKPRICESUPPLIER_ADDON_PDF)) + if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) { - $modele = $conf->global->ASKPRICESUPPLIER_ADDON_PDF; + $modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF; } else { @@ -2380,7 +2382,7 @@ class AskPriceSupplier extends CommonObject } } - $modelpath = "core/modules/askpricesupplier/doc/"; + $modelpath = "core/modules/supplier_proposal/doc/"; return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } @@ -2432,22 +2434,22 @@ class AskPriceSupplier extends CommonObject /** - * \class AskPriceSupplierLine - * \brief Class to manage askpricesupplier lines + * \class SupplierProposalLine + * \brief Class to manage supplier_proposal lines */ -class AskPriceSupplierLine extends CommonObject +class SupplierProposalLine extends CommonObject { var $db; var $error; - public $element='askpricesupplierdet'; - public $table_element='askpricesupplierdet'; + public $element='supplier_proposaldet'; + public $table_element='supplier_proposaldet'; var $oldline; - // From llx_askpricesupplierdet + // From llx_supplier_proposaldet var $rowid; - var $fk_askpricesupplier; + var $fk_supplier_proposal; var $fk_parent_line; var $desc; // Description ligne var $fk_product; // Id produit predefini @@ -2556,13 +2558,13 @@ class AskPriceSupplierLine extends CommonObject */ function fetch($rowid) { - $sql = 'SELECT pd.rowid, pd.fk_askpricesupplier, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,'; + $sql = 'SELECT pd.rowid, pd.fk_supplier_proposal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,'; $sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,'; $sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,'; $sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,'; $sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,'; $sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn'; - $sql.= ' FROM '.MAIN_DB_PREFIX.'askpricesupplierdet as pd'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid'; $sql.= ' WHERE pd.rowid = '.$rowid; @@ -2572,7 +2574,7 @@ class AskPriceSupplierLine extends CommonObject $objp = $this->db->fetch_object($result); $this->rowid = $objp->rowid; - $this->fk_askpricesupplier = $objp->fk_askpricesupplier; + $this->fk_supplier_proposal = $objp->fk_supplier_proposal; $this->fk_parent_line = $objp->fk_parent_line; $this->label = $objp->custom_label; $this->desc = $objp->description; @@ -2668,14 +2670,14 @@ class AskPriceSupplierLine extends CommonObject $this->db->begin(); // Insert line into database - $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'askpricesupplierdet'; - $sql.= ' (fk_askpricesupplier, fk_parent_line, label, description, fk_product, product_type,'; + $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet'; + $sql.= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,'; $sql.= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,'; $sql.= ' subprice, remise_percent, '; $sql.= ' info_bits, '; $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,'; $sql.= ' ref_fourn)'; - $sql.= " VALUES (".$this->fk_askpricesupplier.","; + $sql.= " VALUES (".$this->fk_supplier_proposal.","; $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").","; $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").","; $sql.= " '".$this->db->escape($this->desc)."',"; @@ -2707,7 +2709,7 @@ class AskPriceSupplierLine extends CommonObject $resql=$this->db->query($sql); if ($resql) { - $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'askpricesupplierdet'); + $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet'); if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used { @@ -2722,7 +2724,7 @@ class AskPriceSupplierLine extends CommonObject if (! $notrigger) { // Call trigger - $result=$this->call_trigger('LINEASKPRICESUPPLIER_INSERT',$user); + $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT',$user); if ($result < 0) { $this->db->rollback(); @@ -2754,8 +2756,8 @@ class AskPriceSupplierLine extends CommonObject $error=0; $this->db->begin(); - $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplierdet WHERE rowid = ".$this->rowid; - dol_syslog("AskPriceSupplierLine::delete", LOG_DEBUG); + $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->rowid; + dol_syslog("SupplierProposalLine::delete", LOG_DEBUG); if ($this->db->query($sql) ) { @@ -2772,7 +2774,7 @@ class AskPriceSupplierLine extends CommonObject } // Call trigger - $result=$this->call_trigger('LINEASKPRICESUPLLIER_DELETE',$user); + $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE',$user); if ($result < 0) { $this->db->rollback(); @@ -2840,7 +2842,7 @@ class AskPriceSupplierLine extends CommonObject $this->db->begin(); // Mise a jour ligne en base - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplierdet SET"; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET"; $sql.= " description='".$this->db->escape($this->desc)."'"; $sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null"); $sql.= " , product_type=".$this->product_type; @@ -2888,7 +2890,7 @@ class AskPriceSupplierLine extends CommonObject if (! $notrigger) { // Call trigger - $result=$this->call_trigger('LINEASKPRICESUPPLIER_UPDATE',$user); + $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE',$user); if ($result < 0) { $this->db->rollback(); @@ -2919,13 +2921,13 @@ class AskPriceSupplierLine extends CommonObject $this->db->begin(); // Mise a jour ligne en base - $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplierdet SET"; + $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET"; $sql.= " total_ht=".price2num($this->total_ht,'MT').""; $sql.= ",total_tva=".price2num($this->total_tva,'MT').""; $sql.= ",total_ttc=".price2num($this->total_ttc,'MT').""; $sql.= " WHERE rowid = ".$this->rowid; - dol_syslog("AskPriceSupplierLine::update_total", LOG_DEBUG); + dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/comm/askpricesupplier/document.php b/htdocs/supplier_proposal/document.php similarity index 81% rename from htdocs/comm/askpricesupplier/document.php rename to htdocs/supplier_proposal/document.php index f2558e826dc..ff1abaa2da1 100644 --- a/htdocs/comm/askpricesupplier/document.php +++ b/htdocs/supplier_proposal/document.php @@ -25,9 +25,9 @@ * \brief Management page of documents attached to a business proposal */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; @@ -47,7 +47,7 @@ if (! empty($user->societe_id)) $action=''; $socid = $user->societe_id; } -$result = restrictedArea($user, 'askpricesupplier', $id); +$result = restrictedArea($user, 'supplier_proposal', $id); // Get parameters $sortfield = GETPOST("sortfield",'alpha'); @@ -60,12 +60,12 @@ $pagenext = $page + 1; if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="name"; -$object = new AskPriceSupplier($db); +$object = new SupplierProposal($db); $object->fetch($id,$ref); if ($object->id > 0) { $object->fetch_thirdparty(); - $upload_dir = $conf->askpricesupplier->dir_output.'/'.dol_sanitizeFileName($object->ref); + $upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; } @@ -80,10 +80,10 @@ $form = new Form($db); if ($object->id > 0) { - $upload_dir = $conf->askpricesupplier->dir_output.'/'.dol_sanitizeFileName($object->ref); + $upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref); - $head = askpricesupplier_prepare_head($object); - dol_fiche_head($head, 'document', $langs->trans('CommRequest'), 0, 'askpricesupplier'); + $head = supplier_proposal_prepare_head($object); + dol_fiche_head($head, 'document', $langs->trans('CommRequest'), 0, 'supplier_proposal'); // Construit liste des fichiers $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); @@ -95,7 +95,7 @@ if ($object->id > 0) print ''; - $linkback=''.$langs->trans("BackToList").''; + $linkback=''.$langs->trans("BackToList").''; // Ref print '"; - print ''; + print ''; print ''; print "\n"; } @@ -149,10 +149,10 @@ else /* * Draft askprice */ -if (! empty($conf->askpricesupplier->enabled)) +if (! empty($conf->supplier_proposal->enabled)) { $sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client"; - $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c"; + $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; @@ -167,7 +167,7 @@ if (! empty($conf->askpricesupplier->enabled)) print '
'.$langs->trans('Ref').''; @@ -113,8 +113,8 @@ if ($object->id > 0) print ''; - $modulepart = 'askpricesupplier'; - $permission = $user->rights->askpricesupplier->creer; + $modulepart = 'supplier_proposal'; + $permission = $user->rights->supplier_proposal->creer; $param = '&id=' . $object->id; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; } diff --git a/htdocs/comm/askpricesupplier/index.php b/htdocs/supplier_proposal/index.php similarity index 79% rename from htdocs/comm/askpricesupplier/index.php rename to htdocs/supplier_proposal/index.php index 6936defda49..4c363ba32ac 100644 --- a/htdocs/comm/askpricesupplier/index.php +++ b/htdocs/supplier_proposal/index.php @@ -23,11 +23,11 @@ * \brief Home page of proposal area */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -require_once DOL_DOCUMENT_ROOT .'/comm/askpricesupplier/class/askpricesupplier.class.php'; +require_once DOL_DOCUMENT_ROOT .'/supplier_proposal/class/supplier_proposal.class.php'; -$langs->load("askpricesupplier"); +$langs->load("supplier_proposal"); $langs->load("companies"); // Security check @@ -37,22 +37,22 @@ if (isset($user->societe_id) && $user->societe_id > 0) $action = ''; $socid = $user->societe_id; } -$result = restrictedArea($user, 'askpricesupplier'); +$result = restrictedArea($user, 'supplier_proposal'); /* * View */ $now=dol_now(); -$askpricesupplierstatic=new AskPriceSupplier($db); +$supplier_proposalstatic=new SupplierProposal($db); $companystatic=new Societe($db); $form = new Form($db); $formfile = new FormFile($db); $help_url="EN:Module_Ask_Price_Supplier|FR:Module_Demande_de_prix_fournisseur"; -llxHeader("",$langs->trans("AskPriceSupplierArea"),$help_url); +llxHeader("",$langs->trans("SupplierProposalArea"),$help_url); -print load_fiche_titre($langs->trans("AskPriceSupplierArea")); +print load_fiche_titre($langs->trans("SupplierProposalArea")); print '
'; @@ -61,7 +61,7 @@ print '
'; * Search form */ $var=false; -print ''; +print ''; print ''; print ''; print ''; @@ -78,7 +78,7 @@ print "
'.$langs->trans("SearchRequest").'

\n"; $sql = "SELECT count(p.rowid), p.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; -$sql.= ", ".MAIN_DB_PREFIX."askpricesupplier as p"; +$sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.fk_soc = s.rowid"; $sql.= " AND p.entity = ".$conf->entity; @@ -119,12 +119,12 @@ if ($resql) $listofstatus=array(0,1,2,3,4); foreach ($listofstatus as $status) { - $dataseries[]=array('label'=>$askpricesupplierstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?(int) $vals[$status]:0)); + $dataseries[]=array('label'=>$supplier_proposalstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?(int) $vals[$status]:0)); if (! $conf->use_javascript_ajax) { $var=!$var; print "
'.$askpricesupplierstatic->LibStatut($status,0).''.$supplier_proposalstatic->LibStatut($status,0).''.(isset($vals[$status])?$vals[$status]:0).'
'; print ''; print ''; - $langs->load("askpricesupplier"); + $langs->load("supplier_proposal"); $num = $db->num_rows($resql); if ($num) { @@ -179,9 +179,9 @@ if (! empty($conf->askpricesupplier->enabled)) $obj = $db->fetch_object($resql); print ""; - $askpricesupplierstatic->id=$obj->rowid; - $askpricesupplierstatic->ref=$obj->ref; - print ''; + $supplier_proposalstatic->id=$obj->rowid; + $supplier_proposalstatic->ref=$obj->ref; + print ''; $companystatic->id=$obj->socid; $companystatic->name=$obj->socname; @@ -208,7 +208,7 @@ $max=5; $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,"; $sql.= " date_cloture as datec"; -$sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c"; +$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; @@ -239,12 +239,12 @@ if ($resql) print ""; print ''; @@ -267,7 +267,7 @@ if ($resql) print ''; print ''; - print ''; + print ''; print ''; $i++; } @@ -280,15 +280,15 @@ else dol_print_error($db); /* * Opened askprice */ -if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier->lire) +if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) { - $langs->load("askpricesupplier"); + $langs->load("supplier_proposal"); $now=dol_now(); - $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as askpricesupplierid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datec as dp"; + $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as supplier_proposalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datec as dp"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; - $sql.= ", ".MAIN_DB_PREFIX."askpricesupplier as p"; + $sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.fk_soc = s.rowid"; $sql.= " AND p.entity = ".$conf->entity; @@ -308,7 +308,7 @@ if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier $var=true; print '
'.$langs->trans("DraftRequests").'
'.$askpricesupplierstatic->getNomUrl(1).''.$supplier_proposalstatic->getNomUrl(1).'
'; - $askpricesupplierstatic->id=$obj->rowid; - $askpricesupplierstatic->ref=$obj->ref; + $supplier_proposalstatic->id=$obj->rowid; + $supplier_proposalstatic->ref=$obj->ref; print ''; print ''; print '
'; - print $askpricesupplierstatic->getNomUrl(1); + print $supplier_proposalstatic->getNomUrl(1); print ''; @@ -253,9 +253,9 @@ if ($resql) print ''; $filename=dol_sanitizeFileName($obj->ref); - $filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($obj->ref); + $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; - print $formfile->getDocumentsLink($askpricesupplierstatic->element, $filename, $filedir); + print $formfile->getDocumentsLink($supplier_proposalstatic->element, $filename, $filedir); print '
'; print '		'.$companystatic->getNomUrl(1,'customer').''.dol_print_date($db->jdate($obj->datec),'day').''.$askpricesupplierstatic->LibStatut($obj->fk_statut,5).''.$supplier_proposalstatic->LibStatut($obj->fk_statut,5).'
'; - print ''; + print ''; $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); while ($i < $nbofloop) @@ -320,21 +320,21 @@ if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier // Ref print '"; @@ -348,7 +348,7 @@ if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier print ''."\n"; print ''; - print ''."\n"; + print ''."\n"; print ''."\n"; $i++; $total += $obj->total_ttc; diff --git a/htdocs/comm/askpricesupplier/info.php b/htdocs/supplier_proposal/info.php similarity index 81% rename from htdocs/comm/askpricesupplier/info.php rename to htdocs/supplier_proposal/info.php index 3b8f95d45fa..9c3f8967bd5 100644 --- a/htdocs/comm/askpricesupplier/info.php +++ b/htdocs/supplier_proposal/info.php @@ -23,12 +23,12 @@ * \brief Page d'affichage des infos d'une proposition commerciale */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; -$langs->load('askpricesupplier'); +$langs->load('supplier_proposal'); $langs->load('compta'); $id=GETPOST('id','int'); @@ -36,7 +36,7 @@ $socid=GETPOST('socid','int'); // Security check if (! empty($user->societe_id)) $socid=$user->societe_id; -$result = restrictedArea($user, 'askpricesupplier', $id); +$result = restrictedArea($user, 'supplier_proposal', $id); /* @@ -45,12 +45,12 @@ $result = restrictedArea($user, 'askpricesupplier', $id); llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'); -$object = new AskPriceSupplier($db); +$object = new SupplierProposal($db); $object->fetch($id); $object->fetch_thirdparty(); -$head = askpricesupplier_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans('CommRequest'), 0, 'askpricesupplier'); +$head = supplier_proposal_prepare_head($object); +dol_fiche_head($head, 'info', $langs->trans('CommRequest'), 0, 'supplier_proposal'); $object->info($object->id); diff --git a/htdocs/comm/askpricesupplier/list.php b/htdocs/supplier_proposal/list.php similarity index 90% rename from htdocs/comm/askpricesupplier/list.php rename to htdocs/supplier_proposal/list.php index ae7ed58b29c..cfea07b1e48 100644 --- a/htdocs/comm/askpricesupplier/list.php +++ b/htdocs/supplier_proposal/list.php @@ -30,17 +30,17 @@ * \brief Page of commercial proposals card and list */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaskpricesupplier.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsupplier_proposal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php'; +require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('companies'); -$langs->load('askpricesupplier'); +$langs->load('supplier_proposal'); $langs->load('compta'); $langs->load('bills'); $langs->load('orders'); @@ -55,7 +55,7 @@ $search_societe=GETPOST('search_societe','alpha'); $search_montant_ht=GETPOST('search_montant_ht','alpha'); $search_author=GETPOST('search_author','alpha'); $viewstatut=$db->escape(GETPOST('viewstatut')); -$object_statut=$db->escape(GETPOST('askpricesupplier_statut')); +$object_statut=$db->escape(GETPOST('supplier_proposal_statut')); $sall=GETPOST("sall"); $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg")); @@ -66,7 +66,7 @@ $month=GETPOST("month"); $NBLINES=4; // Security check -$module='askpricesupplier'; +$module='supplier_proposal'; $dbtable=''; $objectid=''; if (! empty($user->societe_id)) $socid=$user->societe_id; @@ -98,7 +98,7 @@ $viewstatut=$object_statut; // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('askpricesupplierlist')); +$hookmanager->initHooks(array('supplier_proposallist')); @@ -122,7 +122,7 @@ llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_p $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); -$formaskpricesupplier = new FormAskPriceSupplier($db); +$formsupplier_proposal = new FormSupplierProposal($db); $companystatic=new Societe($db); $now=dol_now(); @@ -141,11 +141,11 @@ $limit = $conf->liste_limit; $sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,'; -$sql.= ' p.rowid as askpricesupplierid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_livraison as dp,'; +$sql.= ' p.rowid as supplier_proposalid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_livraison as dp,'; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,"; $sql.= ' u.login'; -$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'askpricesupplier as p'; -if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'askpricesupplierdet as pd ON p.rowid=pd.fk_askpricesupplier'; +$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'supplier_proposal as p'; +if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'supplier_proposaldet as pd ON p.rowid=pd.fk_supplier_proposal'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid'; // We'll need this table joined to the select in order to filter by sale if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -198,7 +198,7 @@ else if ($year > 0) if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale; if ($search_user > 0) { - $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='askpricesupplier' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user; + $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user; } @@ -217,7 +217,7 @@ $result=$db->query($sql); if ($result) { - $objectstatic=new AskPriceSupplier($db); + $objectstatic=new SupplierProposal($db); $userstatic=new User($db); $num = $db->num_rows($result); @@ -236,7 +236,7 @@ if ($result) if ($search_sale > 0) $param.='&search_sale='.$search_sale; if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; if ($search_author) $param.='&search_author='.$search_author; - print_barre_liste($langs->trans('ListOfAskPriceSupplier').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans('ListOfSupplierProposal').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); // Lignes des champs de filtre print ''; @@ -277,7 +277,7 @@ if ($result) print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('AskPriceSupplierDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('SupplierProposalDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder); @@ -310,7 +310,7 @@ if ($result) print ''; print ''; print ''; print ''; print '
'.$langs->trans("RequestsOpened").' '.$num.'
'.$langs->trans("RequestsOpened").' '.$num.'
'; - $askpricesupplierstatic->id=$obj->askpricesupplierid; - $askpricesupplierstatic->ref=$obj->ref; + $supplier_proposalstatic->id=$obj->supplier_proposalid; + $supplier_proposalstatic->ref=$obj->ref; print ''; print ''; print ''; print '
'; - print $askpricesupplierstatic->getNomUrl(1); + print $supplier_proposalstatic->getNomUrl(1); print ''; - if ($db->jdate($obj->dfv) < ($now - $conf->askpricesupplier->cloture->warning_delay)) print img_warning($langs->trans("Late")); + if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print ''; $filename=dol_sanitizeFileName($obj->ref); - $filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($obj->ref); - $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->askpricesupplierid; - print $formfile->getDocumentsLink($askpricesupplierstatic->element, $filename, $filedir); + $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref); + $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->supplier_proposalid; + print $formfile->getDocumentsLink($supplier_proposalstatic->element, $filename, $filedir); print '
'; print "		'; print dol_print_date($db->jdate($obj->dp),'day').''.price($obj->total_ttc).''.$askpricesupplierstatic->LibStatut($obj->fk_statut,3).''.$supplier_proposalstatic->LibStatut($obj->fk_statut,3).'
'; - $formaskpricesupplier->selectAskPriceSupplierStatus($viewstatut,1); + $formsupplier_proposal->selectSupplierProposalStatus($viewstatut,1); print ''; @@ -332,7 +332,7 @@ if ($result) print '
'; - $objectstatic->id=$objp->askpricesupplierid; + $objectstatic->id=$objp->supplier_proposalid; $objectstatic->ref=$objp->ref; print ''; @@ -341,11 +341,11 @@ if ($result) print ''; print ''; @@ -353,8 +353,8 @@ if ($result) // Ref print '
'; - if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->askpricesupplier->cloture->warning_delay)) print img_warning($langs->trans("Late")); + if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late")); if (! empty($objp->note_private)) { print ' '; - print ''.img_picto($langs->trans("ViewPrivateNote"),'object_generic').''; + print ''.img_picto($langs->trans("ViewPrivateNote"),'object_generic').''; print ''; } print ''; $filename=dol_sanitizeFileName($objp->ref); - $filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($objp->ref); - $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->askpricesupplierid; + $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($objp->ref); + $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->supplier_proposalid; print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); print '
'; diff --git a/htdocs/comm/askpricesupplier/note.php b/htdocs/supplier_proposal/note.php similarity index 80% rename from htdocs/comm/askpricesupplier/note.php rename to htdocs/supplier_proposal/note.php index 0ce89fe5e8b..4e9f3affa50 100644 --- a/htdocs/comm/askpricesupplier/note.php +++ b/htdocs/supplier_proposal/note.php @@ -25,11 +25,11 @@ * \brief Fiche d'information sur une proposition commerciale */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; -$langs->load('askpricesupplier'); +$langs->load('supplier_proposal'); $langs->load('compta'); $langs->load('bills'); @@ -39,9 +39,9 @@ $action=GETPOST('action','alpha'); // Security check if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'askpricesupplier', $id, 'askpricesupplier'); +$result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal'); -$object = new AskPriceSupplier($db); +$object = new SupplierProposal($db); @@ -49,7 +49,7 @@ $object = new AskPriceSupplier($db); /* Actions */ /******************************************************************************/ -$permissionnote=$user->rights->askpricesupplier->creer; // Used by the include of actions_setnotes.inc.php +$permissionnote=$user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once @@ -74,12 +74,12 @@ if ($id > 0 || ! empty($ref)) $societe = new Societe($db); if ( $societe->fetch($object->socid) ) { - $head = askpricesupplier_prepare_head($object); - dol_fiche_head($head, 'note', $langs->trans('CommRequest'), 0, 'askpricesupplier'); + $head = supplier_proposal_prepare_head($object); + dol_fiche_head($head, 'note', $langs->trans('CommRequest'), 0, 'supplier_proposal'); print ''; - $linkback = ''.$langs->trans('BackToList').''; + $linkback = ''.$langs->trans('BackToList').''; // Ref print '"; print ''; - print ''; print ''; diff --git a/htdocs/install/doctemplates/askpricesupplier/index.html b/htdocs/supplier_proposal/tpl/index.html similarity index 100% rename from htdocs/install/doctemplates/askpricesupplier/index.html rename to htdocs/supplier_proposal/tpl/index.html diff --git a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php similarity index 85% rename from htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php rename to htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php index bf16d01fa1e..76cf756128a 100644 --- a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php +++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; echo '
'; -print load_fiche_titre($langs->trans('RelatedAskPriceSupplier')); +print load_fiche_titre($langs->trans('RelatedSupplierProposal')); ?>
'.$langs->trans('Ref').''; @@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref)) print "
".$langs->trans("Supplier")."'.$object->client->getNomUrl(1).'
'.$langs->trans('AskPriceSupplierDate').''; + print '
'.$langs->trans('SupplierProposalDate').''; print dol_print_date($object->date_livraison,'daytext'); print '
@@ -48,11 +48,11 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?> @@ -66,7 +66,7 @@ foreach($linkedObjectBlock as $key => $objectlink) diff --git a/htdocs/theme/eldy/img/helpdoc.png b/htdocs/theme/eldy/img/helpdoc.png index 8cd950e7be1..435fbc77985 100644 Binary files a/htdocs/theme/eldy/img/helpdoc.png and b/htdocs/theme/eldy/img/helpdoc.png differ diff --git a/htdocs/theme/eldy/img/object_askpricesupplier.png b/htdocs/theme/eldy/img/object_supplier_proposal.png similarity index 100% rename from htdocs/theme/eldy/img/object_askpricesupplier.png rename to htdocs/theme/eldy/img/object_supplier_proposal.png diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c245fce73c8..c744a71c189 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -31,7 +31,7 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1); if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); if (! defined('NOLOGIN')) define('NOLOGIN',1); // File must be accessed by logon page so without login -if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); +//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); // We need top menu content if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); @@ -86,42 +86,38 @@ $colorbacktabcard1='255,255,255'; // card $colorbacktabactive='234,234,234'; $colorbacklineimpair1='255,255,255'; // line impair $colorbacklineimpair2='255,255,255'; // line impair -$colorbacklinepair1='250,250,250'; // line pair +$colorbacklinepair1='248,248,248'; // line pair $colorbacklinepair2='248,248,248'; // line pair $colorbacklinepairhover='238,246,252'; // line pair $colorbackbody='255,255,255'; -//$colortexttitlenotab='40,0,70'; $colortexttitlenotab='80,80,0'; -$colortexttitle=''; -$colortext=''; +$colortexttitle='0,0,0'; +$colortext='0,0,0'; +$colortextlink='0,0,120'; $fontsize='12'; $fontsizesmaller='11'; $usegradient=1; $useboldtitle=1; // Case of option always editable -if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; // topmenu (140,160,185) -//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185) -if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP -//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links +if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY='255,255,255'; +if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; +if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; +if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252'; +if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK='0,0,120'; -// Fields not yet editable by default +// Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { - // Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; - $conf->global->THEME_ELDY_LINEPAIR1='250,250,250'; + $conf->global->THEME_ELDY_LINEPAIR1='248,248,248'; $conf->global->THEME_ELDY_LINEPAIR2='248,248,248'; $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; - $conf->global->THEME_ELDY_USE_HOVER=='238,246,252'; - $conf->global->THEME_ELDY_BACKBODY='255,255,255'; - //$conf->global->THEME_ELDY_TEXTTITLE='0,0,0'; $conf->global->THEME_ELDY_TEXT='0,0,0'; - $conf->global->THEME_ELDY_FONT_SIZE1='12'; $conf->global->THEME_ELDY_FONT_SIZE2='11'; } @@ -142,6 +138,7 @@ $colorbacklinepairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empt $colorbackbody =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY) ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY) :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY); $colortexttitle =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE) ?$colortext:$conf->global->THEME_ELDY_TEXTTITLE) :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE); $colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT) ?$colortext:$conf->global->THEME_ELDY_TEXT) :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT); +$colortextlink =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK) ?$colortext:$conf->global->THEME_ELDY_TEXTLINK) :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK); $fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1) :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1); $fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2); @@ -191,6 +188,7 @@ if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringT $colorbackbody=join(',',colorStringToArray($colorbackbody)); $colortexttitle=join(',',colorStringToArray($colortexttitle)); $colortext=join(',',colorStringToArray($colortext)); +$colortextlink=join(',',colorStringToArray($colortextlink)); print '/*'."\n"; print 'colorbackbody='.$colorbackbody."\n"; @@ -204,6 +202,7 @@ print 'colorbacklinepair2='.$colorbacklinepair2."\n"; print 'colorbacklinepairhover='.$colorbacklinepairhover."\n"; print '$colortexttitle='.$colortexttitle."\n"; print '$colortext='.$colortext."\n"; +print '$colortextlink='.$colortextlink."\n"; print 'dol_hide_topmenu='.$dol_hide_topmenu."\n"; print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n"; print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n"; @@ -214,6 +213,11 @@ print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n"; print '*/'."\n"; if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11; + + +//$nb=$menumanager->showmenu('topnb'); +//print $nb; + ?> /* ============================================================================== */ @@ -227,7 +231,7 @@ body { background: rgb(); - color: #101010; + color: rgb(); font-size: px; font-family: ; margin-top: 0; @@ -237,9 +241,11 @@ body { trans("DIRECTION").";\n"; ?> } -a:link, a:visited, a:hover, a:active { font-family: ; font-weight: bold; color: #000; text-decoration: none; } +th a, .thumbstat, a.tab { color: rgb() !important; font-weight: bold !important; } +a.tab { font-weight: bold !important; } -a:hover { text-decoration: underline; color: #000000;} +a:link, a:visited, a:hover, a:active { font-family: ; font-weight: normal; color: rgb(); text-decoration: none; } +a:hover { text-decoration: underline; color: rgb(); } @@ -503,6 +509,7 @@ div.confirmmessage { .minwidth200 { min-width: 200px; } .minwidth300 { min-width: 300px; } .maxwidth100 { max-width: 100px; } +.maxwidth150 { max-width: 150px; } .maxwidth200 { max-width: 200px; } .maxwidth300 { max-width: 300px; } .titlefield { width: 30%; } @@ -641,7 +648,7 @@ div.divphotoref { div.statusref { float: right; padding-right: 12px; - margin-top: 7px; + margin-top: 6px; margin-bottom: 10px; } img.photoref { @@ -1154,6 +1161,8 @@ div.vmenu, td.vmenu { padding-bottom: 2px; } #menu_contenu_logo { padding-right: 4px; } +.companylogo { } +.searchform { padding-top: 4px; } a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; } font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #aaa; } @@ -3590,6 +3599,9 @@ a span.select2-chosen overflow: hidden; } +.noborderoncategories { + border: none !important; +} /* ============================================================================== */ /* Multiselect with checkbox */ diff --git a/htdocs/theme/md/img/helpdoc.png b/htdocs/theme/md/img/helpdoc.png index 8cd950e7be1..435fbc77985 100644 Binary files a/htdocs/theme/md/img/helpdoc.png and b/htdocs/theme/md/img/helpdoc.png differ diff --git a/htdocs/theme/md/img/logout.png b/htdocs/theme/md/img/logout.png index 26ae717bc1a..e2e2e5d973d 100644 Binary files a/htdocs/theme/md/img/logout.png and b/htdocs/theme/md/img/logout.png differ diff --git a/htdocs/theme/md/img/object_printer.png b/htdocs/theme/md/img/object_printer.png new file mode 100644 index 00000000000..8722632547c Binary files /dev/null and b/htdocs/theme/md/img/object_printer.png differ diff --git a/htdocs/theme/md/img/object_askpricesupplier.png b/htdocs/theme/md/img/object_supplier_proposal.png similarity index 100% rename from htdocs/theme/md/img/object_askpricesupplier.png rename to htdocs/theme/md/img/object_supplier_proposal.png diff --git a/htdocs/theme/md/img/printer.png b/htdocs/theme/md/img/printer.png index 3a5e7b2dfa0..a81e2fa0df6 100644 Binary files a/htdocs/theme/md/img/printer.png and b/htdocs/theme/md/img/printer.png differ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 45a4f755a05..7a57713337f 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -87,43 +87,40 @@ $colorbacktabcard1='255,255,255'; // card $colorbacktabactive='234,234,234'; $colorbacklineimpair1='255,255,255'; // line impair $colorbacklineimpair2='255,255,255'; // line impair -$colorbacklinepair1='242,242,242'; // line pair +$colorbacklinepair1='250,250,250'; // line pair $colorbacklinepair2='248,248,248'; // line pair -$colorbacklinepairhover='238,246,252'; // line pair +$colorbacklinepairhover='244,244,244'; // line pair $colorbackbody='255,255,255'; -//$colortexttitlenotab='40,0,70'; $colortexttitlenotab='80,80,0'; -$colortexttitle=''; -$colortext=''; +$colortexttitle='0,0,0'; +$colortext='0,0,0'; +$colortextlink='0,0,120'; $fontsize='13'; $fontsizesmaller='11'; $usegradient=1; $useboldtitle=1; // Case of option always editable +if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY='255,255,255'; if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu (140,160,185) if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185) -//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP -//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links - -// Fields not yet editable by default +if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252'; +if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK='0,0,120'; + +// Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { - // Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on // 90A4AE, 607D8B, 455A64, 37474F $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; - $conf->global->THEME_ELDY_LINEPAIR1='242,242,242'; + $conf->global->THEME_ELDY_LINEPAIR1='250,250,250'; $conf->global->THEME_ELDY_LINEPAIR2='248,248,248'; $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_USE_HOVER=='238,246,252'; - $conf->global->THEME_ELDY_BACKBODY='255,255,255'; - //$conf->global->THEME_ELDY_TEXTTITLE='0,0,0'; - $conf->global->THEME_ELDY_TEXT='50,50,130'; - + $conf->global->THEME_ELDY_TEXT='0,0,0'; $conf->global->THEME_ELDY_FONT_SIZE1='13'; $conf->global->THEME_ELDY_FONT_SIZE2='11'; } @@ -144,6 +141,7 @@ $colorbacklinepairhover =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(em $colorbackbody =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY) ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY) :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY); $colortexttitle =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE) ?$colortext:$conf->global->THEME_ELDY_TEXTTITLE) :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE); $colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT) ?$colortext:$conf->global->THEME_ELDY_TEXT) :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT); +$colortextlink =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK) ?$colortext:$conf->global->THEME_ELDY_TEXTLINK) :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK); $fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1) :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1); $fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2); @@ -158,15 +156,15 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) $tmppart=explode(',',$colorbackhmenu1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) $colortextbackhmenu='FFFFFF'; -else $colortextbackhmenu='111111'; +else $colortextbackhmenu='000000'; $tmppart=explode(',',$colorbackvmenu1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) { $colortextbackvmenu='FFFFFF'; } -else { $colortextbackvmenu='111111'; } +else { $colortextbackvmenu='000000'; } $tmppart=explode(',',$colorbacktitle1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 260) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; } -else { $colortexttitle='111111'; $colorshadowtitle='FFFFFF'; } +else { $colortexttitle='000000'; $colorshadowtitle='FFFFFF'; } $tmppart=explode(',',$colorbacktabcard1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 340) { $colortextbacktab='FFFFFF'; } @@ -185,7 +183,8 @@ $colorbacklinepair2=join(',',colorStringToArray($colorbacklinepair2)); if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringToArray($colorbacklinepairhover)); $colorbackbody=join(',',colorStringToArray($colorbackbody)); $colortexttitle=join(',',colorStringToArray($colortexttitle)); -$colortext=join(',',colorStringToArray($colorbackvmenu1)); +$colortext=join(',',colorStringToArray($colortext)); +$colortextlink=join(',',colorStringToArray($colortextlink)); print '/*'."\n"; print 'colorbackbody='.$colorbackbody."\n"; @@ -197,6 +196,9 @@ print 'colorbacklineimpair2='.$colorbacklineimpair2."\n"; print 'colorbacklinepair1='.$colorbacklinepair1."\n"; print 'colorbacklinepair2='.$colorbacklinepair2."\n"; print 'colorbacklinepairhover='.$colorbacklinepairhover."\n"; +print '$colortexttitle='.$colortexttitle."\n"; +print '$colortext='.$colortext."\n"; +print '$colortextlink='.$colortextlink."\n"; print 'dol_hide_topmenu='.$dol_hide_topmenu."\n"; print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n"; print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n"; @@ -220,7 +222,7 @@ body { background: rgb(); - color: #101010; + color: rgb(); font-size: px; font-family: ; margin-top: 0; @@ -230,9 +232,11 @@ body { trans("DIRECTION").";\n"; ?> } -a:link, a:visited, a:hover, a:active { font-family: ; font-weight: bold; color: #000; text-decoration: none; } +th a, .thumbstat, a.tab { color: rgb() !important; font-weight: bold !important; } +a.tab { font-weight: bold !important; } -a:hover { text-decoration: underline; color: #000000;} +a:link, a:visited, a:hover, a:active { font-family: ; font-weight: normal; color: rgb(); text-decoration: none; } +a:hover { text-decoration: underline; color: rgb(); } @@ -244,7 +248,7 @@ textarea.cke_source:focus box-shadow: none; } -input, input.flat, textarea, textarea.flat, form.flat select select, select.flat, .dataTables_length label select { +input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select { font-size: px; font-family: ; background: #FDFDFD; @@ -497,6 +501,7 @@ div.confirmmessage { .minwidth200 { min-width: 200px; } .minwidth300 { min-width: 300px; } .maxwidth100 { max-width: 100px; } +.maxwidth150 { max-width: 150px; } .maxwidth200 { max-width: 200px; } .maxwidth300 { max-width: 300px; } .titlefield { width: 30%; } @@ -616,6 +621,7 @@ div.fiche { margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; margin-: dol_optimize_smallscreen)?'12':'4')); ?>px; dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> + margin-bottom: 15px; } div.fichecenter { @@ -1185,6 +1191,8 @@ div.vmenu, td.vmenu { .menu_contenu { padding-top: 4px; padding-bottom: 3px;} #menu_contenu_logo { padding-right: 4px; } +.companylogo { padding-top: 4px; } +.searchform { padding-top: 8px; } a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; } font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #93a5aa; } diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php index aeb3f194daf..2301f109282 100644 --- a/htdocs/user/admin/group_extrafields.php +++ b/htdocs/user/admin/group_extrafields.php @@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); $head = user_admin_prepare_head(); -dol_fiche_head($head, 'attributes_group', $langs->trans("Group"), 0, 'user'); +dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), 0, 'user'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php index 8ebdcca9056..bb035d9f95f 100644 --- a/htdocs/user/admin/user_extrafields.php +++ b/htdocs/user/admin/user_extrafields.php @@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup'); $head = user_admin_prepare_head(); -dol_fiche_head($head, 'attributes', $langs->trans("User"), 0, 'user'); +dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), 0, 'user'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 42e1617e4c1..ffd2f878adf 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -194,7 +194,8 @@ if (empty($reshook)) { $object->note = GETPOST("note"); $object->ldap_sid = GETPOST("ldap_sid"); $object->fk_user = GETPOST("fk_user") > 0 ? GETPOST("fk_user") : 0; - + $object->employee = GETPOST('employee'); + $object->thm = GETPOST("thm") != '' ? GETPOST("thm") : ''; $object->tjm = GETPOST("tjm") != '' ? GETPOST("tjm") : ''; $object->salary = GETPOST("salary") != '' ? GETPOST("salary") : ''; @@ -324,7 +325,8 @@ if (empty($reshook)) { $object->accountancy_code = GETPOST("accountancy_code"); $object->openid = GETPOST("openid"); $object->fk_user = GETPOST("fk_user") > 0 ? GETPOST("fk_user") : 0; - + $object->employee = GETPOST('employee'); + $object->thm = GETPOST("thm") != '' ? GETPOST("thm") : ''; $object->tjm = GETPOST("tjm") != '' ? GETPOST("tjm") : ''; $object->salary = GETPOST("salary") != '' ? GETPOST("salary") : ''; @@ -697,7 +699,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print ''; // Lastname - print ''; + print ''; print '
- trans("ShowAskPriceSupplier"),"askpricesupplier").' '.$objectlink->ref; ?> datec,'day'); ?> rights->askpricesupplier->lire) { + if ($user->rights->supplier_proposal->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?>
trans('TotalHT'); ?> rights->askpricesupplier->lire) { + if ($user->rights->supplier_proposal->lire) { echo price($total); } ?>
'.$langs->trans("Lastname").''.$langs->trans("Lastname").''; if (! empty($ldap_lastname)) { @@ -1168,7 +1170,7 @@ else print ''; // Login - print ''; + print ''; if (! empty($object->ldap_sid) && $object->statut==0) { print ''; @@ -1362,7 +1364,7 @@ else print '
'; print '
'.$langs->trans("Login").'
'.$langs->trans("Login").''.$langs->trans("LoginAccountDisableInDolibarr").'
'; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 9c1828653ac..e19b7c8ab6a 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -40,21 +40,6 @@ $socid=0; if ($user->societe_id > 0) $socid = $user->societe_id; -$sall=GETPOST('sall','alpha'); -$search_user=GETPOST('search_user','alpha'); -$search_login=GETPOST('search_login','alpha'); -$search_lastname=GETPOST('search_lastname','alpha'); -$search_firstname=GETPOST('search_firstname','alpha'); -$search_accountancy_code=GETPOST('search_accountancy_code','alpha'); -$search_email=GETPOST('search_email','alpha'); -$search_statut=GETPOST('search_statut','alpha'); -$search_thirdparty=GETPOST('search_thirdparty','alpha'); -$search_supervisor=GETPOST('search_supervisor','alpha'); -$search_previousconn=GETPOST('search_previousconn','alpha'); -$optioncss = GETPOST('optioncss','alpha'); - -if ($search_statut == '') $search_statut='1'; - // Load variable for pagination $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit; $sortfield = GETPOST('sortfield','alpha'); @@ -89,6 +74,53 @@ $fieldstosearchall = array( 'u.note'=>"Note" ); +// Definition of fields for list +$arrayfields=array( + 'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1), + 'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), + 'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1), + 'u.gender'=>array('label'=>$langs->trans("Gender"), 'checked'=>0), + 'u.employee'=>array('label'=>$langs->trans("Employee"), 'checked'=>0), + 'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0), + 'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1), + 'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1), + 'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))), + 'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1), + 'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100), + 'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110), + 'u.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), + 'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), + 'u.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), +); +// Extra fields +if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) +{ + foreach($extrafields->attribute_label as $key => $val) + { + $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); + } +} + +// Init search fields +$sall=GETPOST('sall','alpha'); +$search_user=GETPOST('search_user','alpha'); +$search_login=GETPOST('search_login','alpha'); +$search_lastname=GETPOST('search_lastname','alpha'); +$search_firstname=GETPOST('search_firstname','alpha'); +$search_gender=GETPOST('search_gender','alpha'); +$search_employee=GETPOST('search_employee','alpha'); +$search_accountancy_code=GETPOST('search_accountancy_code','alpha'); +$search_email=GETPOST('search_email','alpha'); +$search_statut=GETPOST('search_statut','alpha'); +$search_thirdparty=GETPOST('search_thirdparty','alpha'); +$search_supervisor=GETPOST('search_supervisor','alpha'); +$search_previousconn=GETPOST('search_previousconn','alpha'); +$optioncss = GETPOST('optioncss','alpha'); + +// Default search +if ($search_statut == '') $search_statut='1'; + + /* * Actions @@ -106,6 +138,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPO $search_login=""; $search_lastname=""; $search_firstname=""; + $search_gender=""; + $search_employee=""; $search_accountancy_code=""; $search_email=""; $search_statut=""; @@ -130,7 +164,7 @@ $buttonviewhierarchy='= 0) $sql.= natural_search("u.employee", $search_employee); if ($search_accountancy_code != '') $sql.= natural_search("u.accountancy_code", $search_accountancy_code); if ($search_email != '') $sql.= natural_search("u.email", $search_email); if ($search_statut != '' && $search_statut >= 0) $sql.= " AND (u.statut=".$search_statut.")"; @@ -197,6 +233,8 @@ if ($result) if ($search_login != '') $param.="&search_login=".$search_login; if ($search_lastname != '') $param.="&search_lastname=".$search_lastname; if ($search_firstname != '') $param.="&search_firstname=".$search_firstname; + if ($search_gender != '') $param.="&search_gender=".$search_gender; + if ($search_employee != '') $param.="&search_employee=".$search_employee; if ($search_accountancy_code != '') $param.="&search_accountancy_code=".$search_accountancy_code; if ($search_email != '') $param.="&search_email=".$search_email; if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor; @@ -224,36 +262,16 @@ if ($result) print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall)); } - $arrayfields=array( - 'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1), - 'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), - 'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1), - 'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0), - 'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1), - 'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1), - 'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))), - 'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1), - 'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100), - 'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110), - 'u.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), - 'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), - 'u.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), - ); - // Extra fields - if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) - { - foreach($extrafields->attribute_label as $key => $val) - { - $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]); - } - } - $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; - $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields - print '
'.$langs->trans("LastConnexion").'
'.$langs->trans("LastConnexion").''.dol_print_date($object->datelastlogin,"dayhour").'
'; + $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; + $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields + + print '
'; print ''; if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder); if (! empty($arrayfields['u.lastname']['checked'])) print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder); if (! empty($arrayfields['u.firstname']['checked'])) print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.gender']['checked'])) print_liste_field_titre($langs->trans("Gender"),$_SERVER['PHP_SELF'],"u.gender",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.employee']['checked'])) print_liste_field_titre($langs->trans("Employee"),$_SERVER['PHP_SELF'],"u.employee",$param,"","",$sortfield,$sortorder); if (! empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER['PHP_SELF'],"u.accountancy_code",$param,"","",$sortfield,$sortorder); if (! empty($arrayfields['u.email']['checked'])) print_liste_field_titre($langs->trans("EMail"),$_SERVER['PHP_SELF'],"u.email",$param,"","",$sortfield,$sortorder); if (! empty($arrayfields['u.fk_soc']['checked'])) print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder); @@ -297,6 +315,19 @@ if ($result) { print ''; } + if (! empty($arrayfields['u.gender']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.employee']['checked'])) + { + print ''; + } if (! empty($arrayfields['u.accountancy_code']['checked'])) { print ''; @@ -382,6 +413,7 @@ if ($result) $userstatic->societe_id=$obj->fk_soc; $userstatic->firstname=$obj->firstname; $userstatic->lastname=$obj->lastname; + $userstatic->employee=$obj->employee; $userstatic->photo=$obj->photo; $li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login'); @@ -409,7 +441,17 @@ if ($result) { print ''; } - if (! empty($arrayfields['u.accountancy_code']['checked'])) + if (! empty($arrayfields['u.gender']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.employee']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.accountancy_code']['checked'])) { print ''; } diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index ae32a624175..fa54a128cac 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -331,9 +331,9 @@ if ($result) print ''; print ''; print ''; print ''."\n"; @@ -360,7 +360,7 @@ if ($result) { if ($caneditperms) { - print ''; + print ''; } print ''; + print ''; } print ''; } @@ -396,7 +396,7 @@ if ($result) // Do not own permission if ($caneditperms) { - print ''; + print ''; } print ''; } diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 9d26ce52fb2..2e3314fff12 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -946,9 +946,9 @@ function getListOfProductsOrServices($authentication,$filterproduct) $sql.=" WHERE entity=".$conf->entity; foreach($filterproduct as $key => $val) { - if ($key == 'type' && $val >= 0) $sql.=" AND fk_product_type = ".$db->escape($val); - if ($key == 'tosell') $sql.=" AND to_sell = ".$db->escape($val); - if ($key == 'tobuy') $sql.=" AND to_buy = ".$db->escape($val); + if ($key == 'type' && $val >= 0) $sql.=" AND fk_product_type = ".$db->escape($val); + if ($key == 'status_tosell') $sql.=" AND tosell = ".$db->escape($val); + if ($key == 'status_tobuy') $sql.=" AND tobuy = ".$db->escape($val); } $resql=$db->query($sql); if ($resql)
'; + $arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman")); + print $form->selectarray('search_gender', $arraygender, $search_gender, 1); + print ''; + print $form->selectyesno('search_employee', $search_employee, 1, false, 1); + print ''.$obj->firstname.''; + if ($obj->gender) print $langs->trans("Gender".$obj->gender); + print ''.yn($obj->employee).''.$obj->accountancy_code.''.img_object('',$picto).' '.$objMod->getName(); print ' '; - print ''.$langs->trans("All").""; + print ''.$langs->trans("All").""; print '/'; - print ''.$langs->trans("None").""; + print ''.$langs->trans("None").""; print ' 
'.img_edit_remove($langs->trans("Remove")).''.img_edit_remove($langs->trans("Remove")).''; print img_picto($langs->trans("Active"),'tick'); @@ -386,7 +386,7 @@ if ($result) // Do not own permission if ($caneditperms) { - print ''.img_edit_add($langs->trans("Add")).''.img_edit_add($langs->trans("Add")).' '.img_edit_add($langs->trans("Add")).''.img_edit_add($langs->trans("Add")).'